diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 12:49:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 12:49:06 +0100 |
| commit | d75f99832922079640818fae49a92bb0cf45dfb8 (patch) | |
| tree | 7368ae8bbb9b597f4d68250ed123a07eca5eaa5b /Tools | |
| parent | 39226f9b4a387fcc74c55eeea9cd99ffa11247e3 (diff) | |
| parent | 400872d024cee95d1cfc1253d009c0c6777ea5a3 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ia01d6aa4899b183f41084ffcb245ef0184c0d826
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/qmake/mkspecs/features/configure.prf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf index e69b132ea..b139c3d4e 100644 --- a/Tools/qmake/mkspecs/features/configure.prf +++ b/Tools/qmake/mkspecs/features/configure.prf @@ -129,6 +129,7 @@ defineTest(finalizeConfigure) { !gnu_thin_archives:contains(QT_CONFIG, static) { addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.") } + winrt: addReasonForSkippingBuild("QtWebKit is not supported on Windows Phone/Windows RT") requiredPrograms = gperf python perl bison ruby flex for(program, requiredPrograms): \ !programExistsInPath($$program): \ |