summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@digia.com>2013-09-19 13:04:49 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-02 12:36:03 +0200
commitc097670bf8f9c3871ca12bf9a257702f8dc4e947 (patch)
tree7e6d5c15e03e18b035438bc5b2dbaeef50745cb8 /mkspecs
parent3e1c3a051dc12b222fcf3efa185ebd13f823bc8d (diff)
WinRT: Added missing WIN32 define to qmake.conf
Without that define here moc cannot handle qsystemdetection properly. While having to touch the mkspecs I also removed the no longer needed WINRT define. Change-Id: I0609bd173c7bc14ccdd862afc777d7793dda02b8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/common/winrt_winphone/qmake.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf
index dd4b7f1b94..b5d724eef6 100644
--- a/mkspecs/common/winrt_winphone/qmake.conf
+++ b/mkspecs/common/winrt_winphone/qmake.conf
@@ -8,9 +8,9 @@ MAKEFILE_GENERATOR = MSBUILD
QMAKE_COMPILER = msvc
QMAKE_PLATFORM = winrt win32
CONFIG += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target no_generated_target_info autogen_wmappmanifest rtti
-DEFINES += UNICODE WINRT QT_LARGEFILE_SUPPORT Q_BYTE_ORDER=Q_LITTLE_ENDIAN \
+DEFINES += UNICODE WIN32 QT_LARGEFILE_SUPPORT Q_BYTE_ORDER=Q_LITTLE_ENDIAN \
QT_NO_PRINTER QT_NO_PRINTDIALOG # TODO: Remove when printing is re-enabled
-QMAKE_COMPILER_DEFINES += _MSC_VER=1700 WINRT
+QMAKE_COMPILER_DEFINES += _MSC_VER=1700
DEPLOYMENT_PLUGIN += qwinrt