diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2013-09-13 12:22:45 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 13:53:59 +0200 |
| commit | d959c37eaa66298579ca55440aff5fdb8b3126b2 (patch) | |
| tree | 6c61938d1046fd2e469f63b49f3e58c4da449f88 /mkspecs | |
| parent | 7e2b238c507ee2fdea26f2b57512f337de2c5f85 (diff) | |
WinRT: Basic global support
Various global changes, primarily preprocessor flow, to support the
WinRT platform.
Change-Id: I3fa9cf91d5fb24019362e88fcf205e31b4f810b5
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/simd.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 8de038c5f8..dc80f8d9e1 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -123,7 +123,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) { # if the plugin is linked statically there is no need to deploy it DEPLOYMENT_PLUGIN -= $$QT_CURRENT_VERIFY } - isEqual(QT_CURRENT_VERIFY, DEPLOYMENT_PLUGIN):shared:wince*: { + isEqual(QT_CURRENT_VERIFY, DEPLOYMENT_PLUGIN):shared:if(wince*|winrt): { QT_ITEM = debug: QT_ITEM = $${QTPLUG}d4.dll else: QT_ITEM = $${QTPLUG}4.dll diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf index e0cd5a3a58..a98683d929 100644 --- a/mkspecs/features/simd.prf +++ b/mkspecs/features/simd.prf @@ -188,7 +188,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH) silent:mips_dspr2_assembler.commands = @echo assembling[mips_dspr2] ${QMAKE_FILE_IN} && $$mips_dspr2_assembler.commands QMAKE_EXTRA_COMPILERS += mips_dspr2_assembler } -} else:win32-msvc* { +} else:win32-msvc*|winrt { sse2 { HEADERS += $$SSE2_HEADERS |