diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2017-05-02 13:27:47 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-05-02 13:12:27 +0000 |
| commit | 07ebe565913f8cdc531c862fed62d0398c83ecc4 (patch) | |
| tree | a1d643d687fc347afcb397c74a75b213fbc81b7f | |
| parent | 256bbc4f139036a780a63b80af8bb461a77d333a (diff) | |
| download | qttools-07ebe565913f8cdc531c862fed62d0398c83ecc4.tar.gz | |
Fix winrtrunner for VS 2017
As we only support VS 2015+ the conditions can be dropped.
Change-Id: Idd1763265d63e65dddbec810ee7984fcfa7b75cc
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| -rw-r--r-- | src/shared/corecon/corecon.pri | 8 | ||||
| -rw-r--r-- | src/winrtrunner/winrtrunner.pro | 28 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/shared/corecon/corecon.pri b/src/shared/corecon/corecon.pri index 3445b796a..7ff7c7c70 100644 --- a/src/shared/corecon/corecon.pri +++ b/src/shared/corecon/corecon.pri @@ -1,5 +1,3 @@ -win32-msvc2013|win32-msvc2015 { - INCLUDEPATH += $$PWD - HEADERS += $$PWD/ccapi.h $$PWD/ccapi_11.h $$PWD/ccapi_12.h $$PWD/corecon.h - SOURCES += $$PWD/corecon.cpp -} +INCLUDEPATH += $$PWD +HEADERS += $$PWD/ccapi.h $$PWD/ccapi_11.h $$PWD/ccapi_12.h $$PWD/corecon.h +SOURCES += $$PWD/corecon.cpp diff --git a/src/winrtrunner/winrtrunner.pro b/src/winrtrunner/winrtrunner.pro index 73ca2cdd4..21f2c8310 100644 --- a/src/winrtrunner/winrtrunner.pro +++ b/src/winrtrunner/winrtrunner.pro @@ -3,21 +3,23 @@ CONFIG += force_bootstrap DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII WINRT_LIBRARY -SOURCES += main.cpp runner.cpp -HEADERS += runner.h runnerengine.h +SOURCES += \ + main.cpp \ + runner.cpp \ + appxengine.cpp \ + appxlocalengine.cpp \ + appxphoneengine.cpp -DEFINES += RTRUNNER_NO_APPXLOCAL RTRUNNER_NO_APPXPHONE +HEADERS += \ + runner.h \ + runnerengine.h \ + appxengine.h \ + appxengine_p.h \ + appxlocalengine.h \ + appxphoneengine.h -win32-msvc2013|win32-msvc2015 { - SOURCES += appxengine.cpp appxlocalengine.cpp appxphoneengine.cpp - HEADERS += appxengine.h appxengine_p.h appxlocalengine.h appxphoneengine.h - LIBS += -lruntimeobject -lwsclient -lShlwapi -lurlmon -lxmllite - DEFINES -= RTRUNNER_NO_APPXLOCAL RTRUNNER_NO_APPXPHONE +LIBS += -lruntimeobject -lwsclient -lShlwapi -lurlmon -lxmllite -lcrypt32 - include(../shared/corecon/corecon.pri) -} - -# Windows 10 requires signing -*msvc2015: LIBS += -lcrypt32 +include(../shared/corecon/corecon.pri) load(qt_tool) |