diff --git a/package/Config.in b/package/Config.in
index 3b3c372a1..28cf70323 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -223,8 +223,8 @@ endif
 comment "Other GUIs"
 	source "package/efl/Config.in"
 	source "package/qt/Config.in"
-
-if BR2_PACKAGE_QT
+	source "package/qt5/Config.in"
+if BR2_PACKAGE_QT || BR2_PACKAGE_QT5
 comment "QT libraries and helper libraries"
 	source "package/grantlee/Config.in"
 	source "package/qextserialport/Config.in"
@@ -232,8 +232,6 @@ comment "QT libraries and helper libraries"
 	source "package/qtuio/Config.in"
 	source "package/qwt/Config.in"
 endif
-
-	source "package/qt5/Config.in"
 	source "package/weston/Config.in"
 	source "package/x11r7/Config.in"
 
diff --git a/package/grantlee/Config.in b/package/grantlee/Config.in
index 09ec70c01..ce1342c1e 100644
--- a/package/grantlee/Config.in
+++ b/package/grantlee/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GRANTLEE
 	bool "grantlee"
 	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
+	depends on BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT_STL
 	select BR2_PACKAGE_QT_SCRIPT
 	select BR2_PACKAGE_QT_GUI_MODULE
diff --git a/package/qjson/Config.in b/package/qjson/Config.in
index c15b12fda..2dc2cc405 100644
--- a/package/qjson/Config.in
+++ b/package/qjson/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_QJSON
 	bool "qjson"
+	depends on BR2_PACKAGE_QT
 	help
 	  QJson is a Qt-based library that maps JSON data to
 	  QVariant objects and vice versa.
diff --git a/package/qtuio/Config.in b/package/qtuio/Config.in
index f3f5e3c39..f46f1dd40 100644
--- a/package/qtuio/Config.in
+++ b/package/qtuio/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_QTUIO
 	bool "qtuio"
+	depends on BR2_PACKAGE_QT
 	depends on BR2_PACKAGE_QT_GUI_MODULE
 	help
 	  Implementation of an interface connecting TUIO messages
@@ -17,4 +18,5 @@ config BR2_QTUIO_EXAMPLES
 endif
 
 comment "qtuio depends on QT gui module"
+	depends on BR2_PACKAGE_QT
 	depends on !BR2_PACKAGE_QT_GUI_MODULE
diff --git a/package/qwt/Config.in b/package/qwt/Config.in
index 7718b594a..8c7bc561d 100644
--- a/package/qwt/Config.in
+++ b/package/qwt/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_QWT
 	bool "qwt"
+	depends on BR2_PACKAGE_QT
 	depends on BR2_PACKAGE_QT_GUI_MODULE
 	help
 	  Qwt is a graphics extension to the Qt GUI application
@@ -25,4 +26,5 @@ config BR2_PACKAGE_QWT_OPENGL
 endif
 
 comment "qwt depends on QT gui module"
+	depends on BR2_PACKAGE_QT
 	depends on !BR2_PACKAGE_QT_GUI_MODULE