diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:56:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:56:36 +0100 |
| commit | eccf02a09ee5866fc971b5ff9f36aef5874bd25c (patch) | |
| tree | 4b8c49abbd15c91ed483e44e6708eedb716c8202 /tools/qmake | |
| parent | ebc88886041fb1f38c22e2ef33b17ca1baff7bc8 (diff) | |
| parent | 35c38346e65fe26c75bbe08c7002f645ea53fec1 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Ic36a80502730d404ab96dfa11ff1eb0ac6eb302d
Diffstat (limited to 'tools/qmake')
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 9cd20d736..f3c2eb905 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -260,6 +260,11 @@ defineTest(isMinWinSDKVersion) { requested_minor = $$2 WIN_SDK_VERSION = $$(WindowsSDKVersion) + isEmpty(WIN_SDK_VERSION)|equals(WIN_SDK_VERSION, "\\") { + skipBuild("Could not detect Windows SDK version (\'WindowsSDKVersion\' environment variable is not set).") + return(false) + } + # major.0.minor major_version = $$section(WIN_SDK_VERSION, ., 0, 0) minor_version = $$section(WIN_SDK_VERSION, ., 2, 2) |