diff --git a/mkspecs/unsupported/qnx-g++/qmake.conf b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
similarity index 97%
rename from mkspecs/unsupported/qnx-g++/qmake.conf
rename to mkspecs/unsupported/qnx-X11-g++/qmake.conf
index bc96c21e9ff..94f207aff63 100644
--- a/mkspecs/unsupported/qnx-g++/qmake.conf
+++ b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
@@ -1,5 +1,5 @@
 #
-# qmake configuration for qnx-g++
+# qmake configuration for qnx-x11-g++
 #
 # Written for QNX RTOS v6 with X11
 #
diff --git a/mkspecs/unsupported/qnx-g++/qplatformdefs.h b/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h
similarity index 100%
rename from mkspecs/unsupported/qnx-g++/qplatformdefs.h
rename to mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h
diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
similarity index 92%
rename from mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
rename to mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
index f2407a6c13a..ea206e28ec3 100644
--- a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
+++ b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
@@ -1,5 +1,5 @@
 #
-# qmake configuration for blackberry-qcc
+# qmake configuration for qnx-qcc armv7 targets
 #
 
 MAKEFILE_GENERATOR      = UNIX
diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h b/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h
similarity index 100%
rename from mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h
rename to mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h
diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
similarity index 92%
rename from mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
rename to mkspecs/unsupported/qnx-x86-qcc/qmake.conf
index 93f1df2e072..fef8d443c1f 100644
--- a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
+++ b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
@@ -1,5 +1,5 @@
 #
-# qmake configuration for blackberry-qcc
+# qmake configuration for qnx-qcc x86 targets
 #
 
 MAKEFILE_GENERATOR      = UNIX
diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h b/mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h
similarity index 100%
rename from mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h
rename to mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h