diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-23 14:01:35 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-23 14:45:03 +0200 |
| commit | 790aef362fd195adf97d8c780a7cbbbade27d51f (patch) | |
| tree | 8be464687ab21806cfe9f7ada27098b563aa41b2 /mkspecs/winrt-arm-msvc2013/qmake.conf | |
| parent | 9720efbd1035c2e939b0581163e6d804c713dd96 (diff) | |
| parent | 07475c662eb73c833da2d461b8ef2702ca1e2cfb (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.qmake.conf
configure
src/corelib/global/qglobal.h
src/tools/qdoc/node.cpp
src/tools/qdoc/qdocdatabase.cpp
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
tools/configure/configureapp.cpp
Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
Diffstat (limited to 'mkspecs/winrt-arm-msvc2013/qmake.conf')
| -rw-r--r-- | mkspecs/winrt-arm-msvc2013/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/winrt-arm-msvc2013/qmake.conf b/mkspecs/winrt-arm-msvc2013/qmake.conf index d1ab60723d..f8b48b0829 100644 --- a/mkspecs/winrt-arm-msvc2013/qmake.conf +++ b/mkspecs/winrt-arm-msvc2013/qmake.conf @@ -6,7 +6,7 @@ include(../common/winrt_winphone/qmake.conf) QMAKE_COMPILER_DEFINES += _MSC_VER=1800 -DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_APP ARM __ARM__ __arm__ +DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_PC_APP ARM __ARM__ __arm__ QMAKE_CFLAGS += -FS QMAKE_CXXFLAGS += -FS |