diff --git a/make/qt-defs.mk b/make/qt-defs.mk
index 0b6907d1..dde2baa0 100644
--- a/make/qt-defs.mk
+++ b/make/qt-defs.mk
@@ -2,49 +2,105 @@ ifeq ($(USE_QT),true)
 
 USE_X                  = true
 CPPFLAGS              += -DQT_THREAD_SUPPORT
-ifeq ($(PKG_FORMAT),rpm)
-QT_VERSION            ?= $(shell rpm -q --queryformat='%{VERSION}' --whatprovides qt)
-else
-QT_VERSION             = $(shell dpkg -s libqtcore4 | sed '^CVersion:/ !d; s/Version: *//')
-endif
-QT_MAJOR_VERSION      ?= $(shell echo $(QT_VERSION) | cut -d\. -f1)
-CPPFLAGS              += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
 
-ifeq ($(QT_MAJOR_VERSION),2)
-	QT_PREFIX             ?= /usr/lib/qt2
-	INCLUDE               += -I$(QT_PREFIX)/include
-else
-	ifeq ($(QT_MAJOR_VERSION),3)
-		QT_PREFIX     ?= /usr/lib/qt3
-		INCLUDE       += -I$(QT_PREFIX)/include
-	else
-		ifeq ($(QT_MAJOR_VERSION),4)
-		#QT_PREFIX ?= $(HOME)/opt/qt4
-		QT_PREFIX  ?= /usr
-		INCLUDE += -I$(QT_PREFIX)/include \
-			$(addprefix -I$(QT_PREFIX)/include/, \
-			Qt Qt3Support QtAssistant QtCore QtDesigner \
-			QtGui QtNetwork QtOpenGL QtScript)
-		endif
-	endif
-endif
+#ifeq ($(PKG_FORMAT),rpm)
+#QT_VERSION            ?= $(shell rpm -q --queryformat='%{VERSION}' --whatprovides qt)
+#else
+#QT_VERSION             = $(shell dpkg -s libqtcore4 | sed '^CVersion:/ !d; s/Version: *//')
+#endif
+#QT_MAJOR_VERSION      ?= $(shell echo $(QT_VERSION) | cut -d\. -f1)
+#CPPFLAGS              += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
+#
+#ifeq ($(QT_MAJOR_VERSION),2)
+#	QT_PREFIX             ?= /usr/lib/qt2
+#	INCLUDE               += -I$(QT_PREFIX)/include
+#else
+#	ifeq ($(QT_MAJOR_VERSION),3)
+#		QT_PREFIX     ?= /usr/lib/qt3
+#		INCLUDE       += -I$(QT_PREFIX)/include
+#	else
+#		ifeq ($(QT_MAJOR_VERSION),4)
+#		#QT_PREFIX ?= $(HOME)/opt/qt4
+#		QT_PREFIX  ?= /usr
+#		INCLUDE += -I$(QT_PREFIX)/include \
+#			$(addprefix -I$(QT_PREFIX)/include/, \
+#			Qt Qt3Support QtAssistant QtCore QtDesigner \
+#			QtGui QtNetwork QtOpenGL QtScript)
+#		endif
+#	endif
+#endif
+#
+#ifeq ($(ARCH),x86)
+#	LD_LIB_PATH   += $(QT_PREFIX)/lib
+#	QT_LDFLAGS    += -L$(QT_PREFIX)/lib
+#else
+#	ifeq ($(QT_MAJOR_VERSION),4)
+#		LD_LIB_PATH   += $(QT_PREFIX)/lib
+#		QT_LDFLAGS    += -L$(QT_PREFIX)/lib
+#	else
+#		LD_LIB_PATH   += $(QT_PREFIX)/lib64
+#		QT_LDFLAGS    += -L$(QT_PREFIX)/lib64
+#	endif
+#endif
+#
+#MOC                   ?= $(QT_PREFIX)/bin/moc
+#UIC                   ?= $(QT_PREFIX)/bin/uic
+#RCC                   ?= $(QT_PREFIX)/bin/rcc
+#
+#ifdef REENTRANT
+#	ifneq ($(QT_MAJOR_VERSION),4)
+#	LPPFLAGS      += $(QT_LDFLAGS) -lqt-mt
+#	else
+#	# LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
+#	LPPFLAGS      += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
+#	endif
+#else
+#	ifneq ($(QT_MAJOR_VERSION),4)
+#	LPPFLAGS      += $(QT_LDFLAGS) -lqt
+#	else
+#	# LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
+#	LPPFLAGS      += $(QT_LDFLAGS) -lQtWebKit -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
+#	endif
+#endif
 
-ifeq ($(ARCH),x86)
-	LD_LIB_PATH   += $(QT_PREFIX)/lib
-	QT_LDFLAGS    += -L$(QT_PREFIX)/lib
-else
-	ifeq ($(QT_MAJOR_VERSION),4)
-		LD_LIB_PATH   += $(QT_PREFIX)/lib
-		QT_LDFLAGS    += -L$(QT_PREFIX)/lib
-	else
-		LD_LIB_PATH   += $(QT_PREFIX)/lib64
-		QT_LDFLAGS    += -L$(QT_PREFIX)/lib64
-	endif
-endif
+# ------------------------------- Qt defs
+	
+	#Qt5Designer  \
 
-MOC                   ?= $(QT_PREFIX)/bin/moc
-UIC                   ?= $(QT_PREFIX)/bin/uic
-RCC                   ?= $(QT_PREFIX)/bin/rcc
+QT_MODULES = \
+	Qt5Concurrent  \
+	Qt5Core  \
+	Qt5DBus  \
+	Qt5Gui  \
+	Qt5Help  \
+	Qt5Network  \
+	Qt5OpenGLExtensions  \
+	Qt5OpenGL  \
+	Qt5PrintSupport  \
+	Qt5Qml  \
+	Qt5Quick  \
+	Qt5QuickTest  \
+	Qt5QuickWidgets  \
+	Qt5Sensors  \
+	Qt5Sql  \
+	Qt5Svg  \
+	Qt5Test  \
+	Qt5UiTools  \
+	Qt5WebKit  \
+	Qt5WebKitWidgets  \
+	Qt5Widgets  \
+	Qt5X11Extras  \
+	Qt5XmlPatterns  \
+	Qt5Xml
+
+QT_BIN_PREFIX         ?= $(shell pkg-config --variable=host_bins $(QT_MODULES))
+MOC                   ?= $(QT_BIN_PREFIX)/bin/moc
+UIC                   ?= $(QT_BIN_PREFIX)/bin/uic
+RCC                   ?= $(QT_BIN_PREFIX)/bin/rcc
+LPPFLAGS              += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES))
+INCLUDE               += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
+
+# ------------------------------- ytools defs
 
 UIFILES               += $(wildcard *.ui)
 RCCFILES              += $(wildcard *.qrc)
@@ -68,21 +124,5 @@ OBJ                   += $(patsubst %.cpp,%.o,$(MOC_CPP))
 OBJ                   += $(patsubst %.cpp,%.o,$(UIC_CPP))
 OBJ                   += $(patsubst %.cpp,%.o,$(RCC_CPP))
 
-ifdef REENTRANT
-	ifneq ($(QT_MAJOR_VERSION),4)
-	LPPFLAGS      += $(QT_LDFLAGS) -lqt-mt
-	else
-	# LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
-	LPPFLAGS      += $(QT_LDFLAGS) -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
-	endif
-else
-	ifneq ($(QT_MAJOR_VERSION),4)
-	LPPFLAGS      += $(QT_LDFLAGS) -lqt
-	else
-	# LPPFLAGS      += $(QT_LDFLAGS) -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner_debug -lQtGui_debug -lQtCore_debug
-	LPPFLAGS      += $(QT_LDFLAGS) -lQt3Support -lQtSql -lQtNetwork -lQtOpenGL -lQtDesigner -lQtGui -lQtCore
-	endif
-endif
-
 endif # USE_QT