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 <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]>
philipp-michelfeit · Sep 8, 2012 · 2041764 · 2041764
1 parent 1503d99
commit 2041764
Show file tree

Hide file tree

Showing 92 changed files with 67 additions and 85 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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