adjust specs to the new target mode handling

not strictly necessary, but nicer.

QMAKE_PLATFORM (and thus CONFIG) now also contains the name of the OS, and
its family (if applicable, e.g., bsd). this also adds more feature search
paths.

Change-Id: I3ab971e6e3b2b32cae53b95e4bc67a86688bc5cb
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf
index 14bfd8e..ae1821e 100644 (file)
--- a/mkspecs/aix-g++-64/qmake.conf
+++ b/mkspecs/aix-g++-64/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = aix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf
index cf3266f..ecc6b11 100644 (file)
--- a/mkspecs/aix-g++/qmake.conf
+++ b/mkspecs/aix-g++/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = aix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf
index 49c976e..41961dd 100644 (file)
--- a/mkspecs/aix-xlc-64/qmake.conf
+++ b/mkspecs/aix-xlc-64/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = aix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf
index 3897e61..f635826 100644 (file)
--- a/mkspecs/aix-xlc/qmake.conf
+++ b/mkspecs/aix-xlc/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = aix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/common/linux-android.conf b/mkspecs/common/linux-android.conf
index 71abc45..2522823 100644 (file)
--- a/mkspecs/common/linux-android.conf
+++ b/mkspecs/common/linux-android.conf
@@ -1,5 +1,4 @@
 MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
 TEMPLATE                = app
 QMAKE_INCREMENTAL_STYLE = sublib
 

diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
index bfb4b2b..107aeb7 100644 (file)
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -2,6 +2,8 @@
 # qmake configuration for common linux
 #
 
+QMAKE_PLATFORM += linux
+
 QMAKE_CFLAGS_THREAD    += -D_REENTRANT
 QMAKE_CXXFLAGS_THREAD  += $$QMAKE_CFLAGS_THREAD
 

diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index cb67462..9830110 100644 (file)
--- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf
@@ -2,6 +2,8 @@
 # qmake configuration for common Mac OS X
 #
 
+QMAKE_PLATFORM += macx mac
+
 QMAKE_RESOURCE         = /Developer/Tools/Rez
 
 QMAKE_EXTENSION_SHLIB  = dylib

diff --git a/mkspecs/common/nacl/nacl-base.conf b/mkspecs/common/nacl/nacl-base.conf
index 128ef23..20a0f75 100644 (file)
--- a/mkspecs/common/nacl/nacl-base.conf
+++ b/mkspecs/common/nacl/nacl-base.conf
@@ -1,3 +1,4 @@
+QMAKE_PLATFORM = nacl $$QMAKE_PLATFORM
 
 # Work around linker crash when using PIC. We are building
 # statically so this is safe.

diff --git a/mkspecs/common/qcc-base-qnx-armv7le.conf b/mkspecs/common/qcc-base-qnx-armv7le.conf
index b54eb3e..8172a77 100644 (file)
--- a/mkspecs/common/qcc-base-qnx-armv7le.conf
+++ b/mkspecs/common/qcc-base-qnx-armv7le.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
 TEMPLATE                = app
 CONFIG                  += qt warn_on release link_prl
 QT                      += core gui

diff --git a/mkspecs/common/qcc-base-qnx-x86.conf b/mkspecs/common/qcc-base-qnx-x86.conf
index 4983a98..53d02eb 100644 (file)
--- a/mkspecs/common/qcc-base-qnx-x86.conf
+++ b/mkspecs/common/qcc-base-qnx-x86.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
 TEMPLATE                = app
 CONFIG                  += qt warn_on release link_prl
 QT                      += core gui

diff --git a/mkspecs/common/unix.conf b/mkspecs/common/unix.conf
index 9ee6265..a8f8c57 100644 (file)
--- a/mkspecs/common/unix.conf
+++ b/mkspecs/common/unix.conf
@@ -2,6 +2,8 @@
 # qmake configuration for common unix
 #
 
+QMAKE_PLATFORM += unix posix
+
 QMAKE_LEX              = flex
 QMAKE_LEXFLAGS         +=
 QMAKE_YACC             = yacc

diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf
index bda37c4..bf5324b 100644 (file)
--- a/mkspecs/common/wince/qmake.conf
+++ b/mkspecs/common/wince/qmake.conf
@@ -3,6 +3,7 @@
 #
 
 MAKEFILE_GENERATOR = MSVC.NET
+QMAKE_PLATFORM += wince win32
 TEMPLATE = app
 QT            += core gui
 CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source debug_and_release debug_and_release_target

diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf
index 35f504e..da8d143 100644 (file)
--- a/mkspecs/cygwin-g++/qmake.conf
+++ b/mkspecs/cygwin-g++/qmake.conf
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = cygwin unix posix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release incremental link_prl
 QT                     += core gui

diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf
index 5a6c6a9..075645d 100644 (file)
--- a/mkspecs/darwin-g++/qmake.conf
+++ b/mkspecs/darwin-g++/qmake.conf
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = macx
+QMAKE_PLATFORM = mac macx
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl native_precompiled_headers
 QT                     += core gui

diff --git a/mkspecs/devices/common/linux_device_pre.conf b/mkspecs/devices/common/linux_device_pre.conf
index 51f04d9..e503cbe 100644 (file)
--- a/mkspecs/devices/common/linux_device_pre.conf
+++ b/mkspecs/devices/common/linux_device_pre.conf
@@ -1,7 +1,6 @@
 QT_QPA_DEFAULT_PLATFORM = eglfs
 
 MAKEFILE_GENERATOR  = UNIX
-TARGET_PLATFORM     = unix
 TEMPLATE            = app
 CONFIG              += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                  += core gui

diff --git a/mkspecs/devices/linux-archos-gen8-g++/qmake.conf b/mkspecs/devices/linux-archos-gen8-g++/qmake.conf
index 2523d93..2f77f19 100644 (file)
--- a/mkspecs/devices/linux-archos-gen8-g++/qmake.conf
+++ b/mkspecs/devices/linux-archos-gen8-g++/qmake.conf
@@ -7,7 +7,6 @@
 # http://github.com/KDAB/OpenEmbedded-Archos
 
 MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
 TEMPLATE                = app
 CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                      += core gui

diff --git a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf
index 0a89a5d..f6a1487 100644 (file)
--- a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf
+++ b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR = UNIX
-TARGET_PLATFORM = unix
 TEMPLATE = app
 CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
 QT += core gui

diff --git a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
index 652d4f8..b8780b4 100644 (file)
--- a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
+++ b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
@@ -5,7 +5,6 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
 TEMPLATE                = app
 CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                      += core gui

diff --git a/mkspecs/devices/linux-beagleboard-g++/qmake.conf b/mkspecs/devices/linux-beagleboard-g++/qmake.conf
index ccdd412..93d26d7 100644 (file)
--- a/mkspecs/devices/linux-beagleboard-g++/qmake.conf
+++ b/mkspecs/devices/linux-beagleboard-g++/qmake.conf
@@ -3,7 +3,6 @@
 # http://beagleboard.org/
 
 MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
 TEMPLATE                = app
 CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                      += core gui

diff --git a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
index 1f88250..44f47b0 100644 (file)
--- a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
+++ b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
 TEMPLATE                = app
 CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                      += core gui

diff --git a/mkspecs/devices/linux-n9-g++/qmake.conf b/mkspecs/devices/linux-n9-g++/qmake.conf
index beacb86..93aa701 100644 (file)
--- a/mkspecs/devices/linux-n9-g++/qmake.conf
+++ b/mkspecs/devices/linux-n9-g++/qmake.conf
@@ -3,7 +3,6 @@
 # http://wiki.qt-project.org/Devices/N9
 
 MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
 TEMPLATE                = app
 CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                      += core gui

diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
index a6fe340..f0c8cc0 100644 (file)
--- a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
+++ b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
@@ -5,7 +5,6 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
 TEMPLATE                = app
 CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                      += core gui

diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
index febad65..caf7e7d 100644 (file)
--- a/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
+++ b/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
@@ -5,7 +5,6 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
 TEMPLATE                = app
 CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                      += core gui

diff --git a/mkspecs/devices/linux-snowball-g++/qmake.conf b/mkspecs/devices/linux-snowball-g++/qmake.conf
index f25b607..6ffcb81 100644 (file)
--- a/mkspecs/devices/linux-snowball-g++/qmake.conf
+++ b/mkspecs/devices/linux-snowball-g++/qmake.conf
@@ -3,7 +3,6 @@
 # http://qt-project.org/wiki/Snowball
 
 MAKEFILE_GENERATOR  = UNIX
-TARGET_PLATFORM     = unix
 TEMPLATE            = app
 CONFIG              += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                  += core gui

diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf
index a8c6bf6..c69faf3 100644 (file)
--- a/mkspecs/freebsd-g++/qmake.conf
+++ b/mkspecs/freebsd-g++/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = freebsd bsd
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl gdb_dwarf_index
 QT                     += core gui

diff --git a/mkspecs/freebsd-g++46/qmake.conf b/mkspecs/freebsd-g++46/qmake.conf
index 9d9213a..205dd4e 100644 (file)
--- a/mkspecs/freebsd-g++46/qmake.conf
+++ b/mkspecs/freebsd-g++46/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = freebsd bsd
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl gdb_dwarf_index
 QT                     += core gui

diff --git a/mkspecs/freebsd-icc/qmake.conf b/mkspecs/freebsd-icc/qmake.conf
index 5de842f..8437d80 100644 (file)
--- a/mkspecs/freebsd-icc/qmake.conf
+++ b/mkspecs/freebsd-icc/qmake.conf
@@ -28,7 +28,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = freebsd bsd
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf
index 0831df6..9d1fbf2 100644 (file)
--- a/mkspecs/hpux-acc-64/qmake.conf
+++ b/mkspecs/hpux-acc-64/qmake.conf
@@ -46,7 +46,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = hpux
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf
index d8d780e..0c81455 100644 (file)
--- a/mkspecs/hpux-acc-o64/qmake.conf
+++ b/mkspecs/hpux-acc-o64/qmake.conf
@@ -46,7 +46,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = hpux
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf
index 87b67f0..7410474 100644 (file)
--- a/mkspecs/hpux-acc/qmake.conf
+++ b/mkspecs/hpux-acc/qmake.conf
@@ -25,7 +25,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = hpux
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf
index 0323baa..6097df2 100644 (file)
--- a/mkspecs/hpux-g++-64/qmake.conf
+++ b/mkspecs/hpux-g++-64/qmake.conf
@@ -6,7 +6,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = hpux
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf
index b7040b7..267a90e 100644 (file)
--- a/mkspecs/hpux-g++/qmake.conf
+++ b/mkspecs/hpux-g++/qmake.conf
@@ -6,7 +6,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = hpux
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl plugin_no_soname
 QT                     += core gui

diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf
index c17bda1..daa6a02 100644 (file)
--- a/mkspecs/hpuxi-acc-32/qmake.conf
+++ b/mkspecs/hpuxi-acc-32/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = hpux
 TEMPLATE               = app
 CONFIG                 += qt warn_on release plugin_no_soname
 QT                     += core gui

diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf
index 7505cc7..bd875a4 100644 (file)
--- a/mkspecs/hpuxi-acc-64/qmake.conf
+++ b/mkspecs/hpuxi-acc-64/qmake.conf
@@ -46,7 +46,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = hpux
 TEMPLATE               = app
 CONFIG                 += qt warn_on release plugin_no_soname
 QT                     += core gui

diff --git a/mkspecs/hpuxi-g++-64/qmake.conf b/mkspecs/hpuxi-g++-64/qmake.conf
index 01d39fa..9d2ae8a 100644 (file)
--- a/mkspecs/hpuxi-g++-64/qmake.conf
+++ b/mkspecs/hpuxi-g++-64/qmake.conf
@@ -11,7 +11,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = hpux
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
index aeeac65..7e40e0b 100644 (file)
--- a/mkspecs/hurd-g++/qmake.conf
+++ b/mkspecs/hurd-g++/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = hurd
 TEMPLATE               = app
 CONFIG                 += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                     += core gui

diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf
index af102a0..16e03ba 100644 (file)
--- a/mkspecs/irix-cc-64/qmake.conf
+++ b/mkspecs/irix-cc-64/qmake.conf
@@ -35,7 +35,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = irix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf
index 684e2cf..b370379 100644 (file)
--- a/mkspecs/irix-cc/qmake.conf
+++ b/mkspecs/irix-cc/qmake.conf
@@ -35,7 +35,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = irix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/irix-g++-64/qmake.conf b/mkspecs/irix-g++-64/qmake.conf
index 915e3f6..6013503 100644 (file)
--- a/mkspecs/irix-g++-64/qmake.conf
+++ b/mkspecs/irix-g++-64/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = irix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf
index 2a7d964..1d37ca9 100644 (file)
--- a/mkspecs/irix-g++/qmake.conf
+++ b/mkspecs/irix-g++/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = irix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/linux-arm-gnueabi-g++/qmake.conf b/mkspecs/linux-arm-gnueabi-g++/qmake.conf
index 13b497e..4bd26a6 100644 (file)
--- a/mkspecs/linux-arm-gnueabi-g++/qmake.conf
+++ b/mkspecs/linux-arm-gnueabi-g++/qmake.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
 TEMPLATE                = app
 CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                      += core gui

diff --git a/mkspecs/linux-clang/qmake.conf b/mkspecs/linux-clang/qmake.conf
index 34045f4..8e6466a 100644 (file)
--- a/mkspecs/linux-clang/qmake.conf
+++ b/mkspecs/linux-clang/qmake.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR = UNIX
-TARGET_PLATFORM = unix
 TEMPLATE = app
 CONFIG += qt warn_on release incremental link_prl
 QT += core gui

diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
index 2c0eb68..bb29c62 100644 (file)
--- a/mkspecs/linux-cxx/qmake.conf
+++ b/mkspecs/linux-cxx/qmake.conf
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = linux
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf
index 01c11cc..8cc46a7 100644 (file)
--- a/mkspecs/linux-ecc-64/qmake.conf
+++ b/mkspecs/linux-ecc-64/qmake.conf
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = linux
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf
index cdf8914..afff4ab 100644 (file)
--- a/mkspecs/linux-g++-32/qmake.conf
+++ b/mkspecs/linux-g++-32/qmake.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                     += core gui

diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
index 222f6b7..ded0268 100644 (file)
--- a/mkspecs/linux-g++-64/qmake.conf
+++ b/mkspecs/linux-g++-64/qmake.conf
@@ -6,7 +6,6 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                     += core gui

diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf
index d5828ab..4e8b28f 100644 (file)
--- a/mkspecs/linux-g++-maemo/qmake.conf
+++ b/mkspecs/linux-g++-maemo/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
+QMAKE_PLATFORM          = maemo
 TEMPLATE                = app
 CONFIG                 += qt warn_on release incremental link_prl gdb_dwarf_index
 CONFIG                 += nostrip

diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf
index 00df894..f01e3b4 100644 (file)
--- a/mkspecs/linux-g++/qmake.conf
+++ b/mkspecs/linux-g++/qmake.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                     += core gui

diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index d29d4a5..fbea1a4 100644 (file)
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl gdb_dwarf_index
 QT                     += core gui

diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index 5a48435..48e44c1 100644 (file)
--- a/mkspecs/linux-kcc/qmake.conf
+++ b/mkspecs/linux-kcc/qmake.conf
@@ -14,7 +14,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = linux
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/linux-llvm/qmake.conf b/mkspecs/linux-llvm/qmake.conf
index 46ea2aa..dda8898 100644 (file)
--- a/mkspecs/linux-llvm/qmake.conf
+++ b/mkspecs/linux-llvm/qmake.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                     += core gui

diff --git a/mkspecs/linux-lsb-g++/qmake.conf b/mkspecs/linux-lsb-g++/qmake.conf
index c486534..c622027 100644 (file)
--- a/mkspecs/linux-lsb-g++/qmake.conf
+++ b/mkspecs/linux-lsb-g++/qmake.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
 TEMPLATE                = app
 CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
 QT                      += core gui

diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
index dfe7f19..053c60a 100644 (file)
--- a/mkspecs/linux-pgcc/qmake.conf
+++ b/mkspecs/linux-pgcc/qmake.conf
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = linux
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf
index 1b29b09..6d8512e 100644 (file)
--- a/mkspecs/lynxos-g++/qmake.conf
+++ b/mkspecs/lynxos-g++/qmake.conf
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = lynxos
 TEMPLATE               = app
 CONFIG                 += qt warn_on release incremental link_prl
 QT                     += core gui

diff --git a/mkspecs/macx-clang-32/qmake.conf b/mkspecs/macx-clang-32/qmake.conf
index ad0c566..9825a47 100644 (file)
--- a/mkspecs/macx-clang-32/qmake.conf
+++ b/mkspecs/macx-clang-32/qmake.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR = UNIX
-TARGET_PLATFORM = macx
 TEMPLATE = app
 CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
 QT += core gui

diff --git a/mkspecs/macx-clang-libc++-32/qmake.conf b/mkspecs/macx-clang-libc++-32/qmake.conf
index 0d8f6a9..aeaa517 100644 (file)
--- a/mkspecs/macx-clang-libc++-32/qmake.conf
+++ b/mkspecs/macx-clang-libc++-32/qmake.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR = UNIX
-TARGET_PLATFORM = macx
 TEMPLATE = app
 CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
 QT += core gui

diff --git a/mkspecs/macx-clang-libc++/qmake.conf b/mkspecs/macx-clang-libc++/qmake.conf
index aeb0e3b..5ae7cdd 100644 (file)
--- a/mkspecs/macx-clang-libc++/qmake.conf
+++ b/mkspecs/macx-clang-libc++/qmake.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR = UNIX
-TARGET_PLATFORM = macx
 TEMPLATE = app
 CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
 QT += core gui

diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf
index 5077392..6890327 100644 (file)
--- a/mkspecs/macx-clang/qmake.conf
+++ b/mkspecs/macx-clang/qmake.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR = UNIX
-TARGET_PLATFORM = macx
 TEMPLATE = app
 CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
 QT += core gui

diff --git a/mkspecs/macx-g++-32/qmake.conf b/mkspecs/macx-g++-32/qmake.conf
index 30e36d5..8b7eeb4 100644 (file)
--- a/mkspecs/macx-g++-32/qmake.conf
+++ b/mkspecs/macx-g++-32/qmake.conf
@@ -7,7 +7,6 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = macx
 TEMPLATE               = app
 CONFIG                 += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
 QT                     += core gui

diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf
index e402e54..95e328a 100644 (file)
--- a/mkspecs/macx-g++/qmake.conf
+++ b/mkspecs/macx-g++/qmake.conf
@@ -7,7 +7,6 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = macx
 TEMPLATE               = app
 CONFIG                 += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
 QT                     += core gui

diff --git a/mkspecs/macx-g++40/qmake.conf b/mkspecs/macx-g++40/qmake.conf
index 07663c6..014ee66 100644 (file)
--- a/mkspecs/macx-g++40/qmake.conf
+++ b/mkspecs/macx-g++40/qmake.conf
@@ -7,7 +7,6 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = macx
 TEMPLATE               = app
 CONFIG                 += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
 QT                     += core gui

diff --git a/mkspecs/macx-g++42/qmake.conf b/mkspecs/macx-g++42/qmake.conf
index 3d31305..d740e62 100644 (file)
--- a/mkspecs/macx-g++42/qmake.conf
+++ b/mkspecs/macx-g++42/qmake.conf
@@ -7,7 +7,6 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = macx
 TEMPLATE               = app
 CONFIG                 += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
 QT                     += core gui

diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf
index 77713c5..a17d292 100644 (file)
--- a/mkspecs/macx-icc/qmake.conf
+++ b/mkspecs/macx-icc/qmake.conf
@@ -13,7 +13,6 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = macx
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl app_bundle
 QT                     += core gui

diff --git a/mkspecs/macx-llvm/qmake.conf b/mkspecs/macx-llvm/qmake.conf
index d794701..fbd66b9 100644 (file)
--- a/mkspecs/macx-llvm/qmake.conf
+++ b/mkspecs/macx-llvm/qmake.conf
@@ -7,7 +7,6 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = macx
 TEMPLATE               = app
 CONFIG                 += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
 QT                     += core gui

diff --git a/mkspecs/macx-xlc/qmake.conf b/mkspecs/macx-xlc/qmake.conf
index 6e3639c..1789d19 100644 (file)
--- a/mkspecs/macx-xlc/qmake.conf
+++ b/mkspecs/macx-xlc/qmake.conf
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = macx
+QMAKE_PLATFORM = mac macx
 TEMPLATE               = app
 CONFIG                 += qt warn_on release app_bundle global_init_link_order lib_version_first plugin_no_soname link_prl
 QT                     += core gui

diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf
index 9ca9f16..d82a358 100644 (file)
--- a/mkspecs/netbsd-g++/qmake.conf
+++ b/mkspecs/netbsd-g++/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = netbsd bsd
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl gdb_dwarf_index
 QT                     += core gui

diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf
index 8bb5515..54f6945 100644 (file)
--- a/mkspecs/openbsd-g++/qmake.conf
+++ b/mkspecs/openbsd-g++/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = openbsd bsd
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl gdb_dwarf_index
 QT                     += core gui

diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf
index afa5781..1f5b34b 100644 (file)
--- a/mkspecs/sco-cc/qmake.conf
+++ b/mkspecs/sco-cc/qmake.conf
@@ -8,7 +8,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = sco
 TEMPLATE               = app
 QT                     += core gui
 CONFIG                 += qt warn_on release link_prl

diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf
index a9b6713..03b2ffb 100644 (file)
--- a/mkspecs/sco-g++/qmake.conf
+++ b/mkspecs/sco-g++/qmake.conf
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = sco
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf
index a3a12e6..625885c 100644 (file)
--- a/mkspecs/solaris-cc-64/qmake.conf
+++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -22,7 +22,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = solaris
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf
index aef2647..aae2a45 100644 (file)
--- a/mkspecs/solaris-cc/qmake.conf
+++ b/mkspecs/solaris-cc/qmake.conf
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = solaris
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf
index 59b0eeb..3f07c51 100644 (file)
--- a/mkspecs/solaris-g++-64/qmake.conf
+++ b/mkspecs/solaris-g++-64/qmake.conf
@@ -26,7 +26,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = solaris
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf
index a080111..a14dcb8 100644 (file)
--- a/mkspecs/solaris-g++/qmake.conf
+++ b/mkspecs/solaris-g++/qmake.conf
@@ -9,7 +9,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = solaris
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf
index f2f5403..206c31b 100644 (file)
--- a/mkspecs/tru64-cxx/qmake.conf
+++ b/mkspecs/tru64-cxx/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = tru64
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl plugin_no_soname
 QT                     += core gui

diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf
index ff53757..82092d9 100644 (file)
--- a/mkspecs/tru64-g++/qmake.conf
+++ b/mkspecs/tru64-g++/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = tru64
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl plugin_no_soname
 QT                     += core gui

diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf
index 8300a04..0e3000c 100644 (file)
--- a/mkspecs/unixware-cc/qmake.conf
+++ b/mkspecs/unixware-cc/qmake.conf
@@ -8,7 +8,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = unixware
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf
index f827be0..6fe4939 100644 (file)
--- a/mkspecs/unixware-g++/qmake.conf
+++ b/mkspecs/unixware-g++/qmake.conf
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = unixware
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/unsupported/integrity-ghs/qmake.conf b/mkspecs/unsupported/integrity-ghs/qmake.conf
index 12891d5..a079298 100644 (file)
--- a/mkspecs/unsupported/integrity-ghs/qmake.conf
+++ b/mkspecs/unsupported/integrity-ghs/qmake.conf
@@ -3,9 +3,9 @@
 #
 
 MAKEFILE_GENERATOR     = GBUILD
-#MAKEFILE_GENERATOR    = UNIX
+QMAKE_PLATFORM = integrity unix posix
 TEMPLATE               = app
-CONFIG                 += qt warn_on release integrity unix
+CONFIG                 += qt warn_on release
 QT                      += core gui network
 
 QMAKE_CFLAGS           = -bsp $$INTEGRITY_BSP -os_dir $__OS_DIR

diff --git a/mkspecs/unsupported/linux-armcc/qmake.conf b/mkspecs/unsupported/linux-armcc/qmake.conf
index 77891c3..1dc37fb 100644 (file)
--- a/mkspecs/unsupported/linux-armcc/qmake.conf
+++ b/mkspecs/unsupported/linux-armcc/qmake.conf
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
 TEMPLATE                = app
 CONFIG                  += qt warn_on release incremental link_prl armcc_linker
 QT                      += core gui

diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
index e791291..e929dae 100644 (file)
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -13,6 +13,7 @@
 #       for QMake variables (I.e. "QMAKE_foo = bar" is broken).
 
 MAKEFILE_GENERATOR     = UNIX
+QMAKE_PLATFORM = linux
 TEMPLATE               = app
 CONFIG                 += qt warn_on release incremental link_prl
 QT                     += core gui

diff --git a/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf b/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
index c362634..c0326b0 100644 (file)
--- a/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
@@ -12,7 +12,6 @@
 # $staging/usr/lib/pkgconfig)
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
 TEMPLATE               = app
 CONFIG                 += qt warn_on release incremental link_prl
 QT                     += core gui

diff --git a/mkspecs/unsupported/qnx-X11-g++/qmake.conf b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
index 6c87839..4e82c16 100644 (file)
--- a/mkspecs/unsupported/qnx-X11-g++/qmake.conf
+++ b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
+QMAKE_PLATFORM = qnx
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui

diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
index 41bdfb0..524a23b 100644 (file)
--- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
@@ -3,9 +3,9 @@
 #
 
 MAKEFILE_GENERATOR  = UNIX
-TARGET_PLATFORM     = unix
+QMAKE_PLATFORM      = vxworks
 TEMPLATE            = app
-CONFIG             += qt warn_on release incremental link_prl vxworks
+CONFIG             += qt warn_on release incremental link_prl
 QT                 += core gui network
 QMAKE_INCREMENTAL_STYLE = sublib
 

diff --git a/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf b/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
index 7a77c81..dd23372 100644 (file)
--- a/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
@@ -3,9 +3,9 @@
 #
 
 MAKEFILE_GENERATOR  = UNIX
-TARGET_PLATFORM     = unix
+QMAKE_PLATFORM      = vxworks
 TEMPLATE            = app
-CONFIG             += qt warn_on release incremental link_prl vxworks
+CONFIG             += qt warn_on release incremental link_prl
 QT                 += core gui network
 QMAKE_INCREMENTAL_STYLE = sublib
 DEFINES            += VXWORKS

diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
index 6914642..f33b8ee 100644 (file)
--- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
@@ -3,9 +3,9 @@
 #
 
 MAKEFILE_GENERATOR  = UNIX
-TARGET_PLATFORM     = unix
+QMAKE_PLATFORM      = vxworks
 TEMPLATE            = app
-CONFIG             += qt warn_on release incremental link_prl vxworks
+CONFIG             += qt warn_on release incremental link_prl
 QT                 += core gui network
 QMAKE_INCREMENTAL_STYLE = sublib
 

diff --git a/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
index 2a96a1a..7a0d506 100644 (file)
--- a/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
@@ -3,9 +3,9 @@
 #
 
 MAKEFILE_GENERATOR  = UNIX
-TARGET_PLATFORM     = unix
+QMAKE_PLATFORM      = vxworks
 TEMPLATE            = app
-CONFIG             += qt warn_on release incremental link_prl vxworks
+CONFIG             += qt warn_on release incremental link_prl
 QT                 += core gui network
 QMAKE_INCREMENTAL_STYLE = sublib
 DEFINES            += VXWORKS

diff --git a/mkspecs/unsupported/win32-msvc2003/qmake.conf b/mkspecs/unsupported/win32-msvc2003/qmake.conf
index 59ae7d5..d5c71a3 100644 (file)
--- a/mkspecs/unsupported/win32-msvc2003/qmake.conf
+++ b/mkspecs/unsupported/win32-msvc2003/qmake.conf
@@ -5,6 +5,7 @@
 #
 
 MAKEFILE_GENERATOR      = MSVC.NET
+QMAKE_PLATFORM          = win32
 TEMPLATE                = app
 CONFIG                  += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source debug_and_release debug_and_release_target
 QT                      += core gui

diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 5176f36..e507c7b 100644 (file)
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -10,6 +10,7 @@
 load(device_config)
 
 MAKEFILE_GENERATOR     = MINGW
+QMAKE_PLATFORM = win32
 TEMPLATE               = app
 CONFIG                 += qt warn_on release link_prl debug_and_release debug_and_release_target precompile_header
 QT                     += core gui

diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index 3a741f2..8cc9cf1 100644 (file)
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -5,6 +5,7 @@
 #
 
 MAKEFILE_GENERATOR     = MSVC.NET
+QMAKE_PLATFORM = win32
 TEMPLATE               = app
 CONFIG                 += qt warn_on release incremental flat link_prl debug_and_release debug_and_release_target
 QT                     += core gui

diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
index 0fadaf8..eb56f7c 100644 (file)
--- a/mkspecs/win32-msvc2005/qmake.conf
+++ b/mkspecs/win32-msvc2005/qmake.conf
@@ -5,6 +5,7 @@
 #
 
 MAKEFILE_GENERATOR      = MSVC.NET
+QMAKE_PLATFORM          = win32
 TEMPLATE                = app
 CONFIG                  += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
 QT                      += core gui

diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index 677659c..6ee74e2 100644 (file)
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -5,6 +5,7 @@
 #
 
 MAKEFILE_GENERATOR      = MSVC.NET
+QMAKE_PLATFORM          = win32
 TEMPLATE                = app
 CONFIG                  += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
 QT                      += core gui

diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index 9f26ab6..4594bee 100644 (file)
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -5,6 +5,7 @@
 #
 
 MAKEFILE_GENERATOR      = MSBUILD
+QMAKE_PLATFORM          = win32
 TEMPLATE                = app
 CONFIG                  += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
 QT                      += core gui