summaryrefslogtreecommitdiffstats
path: root/mkspecs/common/winrt_winphone
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@theqtcompany.com>2015-09-02 12:54:21 +0200
committerMaurice Kalinowski <maurice.kalinowski@theqtcompany.com>2015-11-30 14:29:44 +0000
commit7733a5fccc39aa5141e5968eef3fa47bc62917d9 (patch)
tree58f113eb65016a921c3824b9565a9ceb1ac5c16c /mkspecs/common/winrt_winphone
parenteb16f853529e4e0c10816054d2c28030963097ce (diff)
msvc: Introduce base config file for all targets
Visual Studio version specific changes have been added to msvc- desktop.conf which is not used in WinRT or Windows Phone related builds. Hence take a similar approach to gcc and introduce msvc-base to be used by all configurations for common settings. For WinRT this will only be applied to msvc2015 and later on to not introduce any regressions or behavior changes for previous versions. Change-Id: Ib1a4d539d46d788470c00cb5969fee74a803bd67 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Diffstat (limited to 'mkspecs/common/winrt_winphone')
-rw-r--r--mkspecs/common/winrt_winphone/qmake.conf5
1 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf
index 288043da88..e94b4b72fa 100644
--- a/mkspecs/common/winrt_winphone/qmake.conf
+++ b/mkspecs/common/winrt_winphone/qmake.conf
@@ -92,4 +92,9 @@ VCPROJ_EXTENSION = .vcxproj
VCSOLUTION_EXTENSION = .sln
VCPROJ_KEYWORD = Qt4VSv1.0
WINRT_ASSETS_PATH = $$PWD/assets
+
+include(../msvc-base.conf)
+
+unset(MSC_VER)
+
load(qt_config)