diff options
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/linux-android.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/linux.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/mac.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/nacl/nacl-base.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base-qnx-armv7le.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base-qnx-x86.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/unix.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/wince/qmake.conf | 1 |
8 files changed, 8 insertions, 3 deletions
diff --git a/mkspecs/common/linux-android.conf b/mkspecs/common/linux-android.conf index 71abc4533c..2522823914 100644 --- 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 bfb4b2b154..107aeb74eb 100644 --- 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 cb67462b53..9830110347 100644 --- 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 128ef23131..20a0f7507e 100644 --- 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 b54eb3efb6..8172a777dd 100644 --- 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 4983a98122..53d02ebf79 100644 --- 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 9ee626562b..a8f8c57323 100644 --- 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 bda37c40bc..bf5324bdb6 100644 --- 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 |