diff options
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/config/desktop_linux.pri | 5 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject eb1b4618b21cb1f71a18a62183ddf36b72361f1 +Subproject 8a2ae40fde77efb717668abedc5f0c9e28cd86b diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 257ac42f0..5c61a8b7b 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -13,10 +13,11 @@ GYP_CONFIG += \ use_gnome_keyring=0 \ use_kerberos=0 \ use_pango=0 \ - host_clang=0 \ - clang=0 \ enable_plugins=1 \ +linux-clang: GYP_CONFIG += clang=1 host_clang=1 clang_use_chrome_plugins=0 make_clang_dir=/usr +else: GYP_CONFIG += clang=0 host_clang=0 + contains(QT_CONFIG, system-zlib): config_system_minizip: GYP_CONFIG += use_system_zlib=1 contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1 contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1 diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index ef0320da1..417f81925 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -14,7 +14,7 @@ defineTest(isPlatformSupported) { linux-g++*:!isGCCVersionSupported(): return(false) !isPythonVersionSupported(): return(false) - linux-g++*|win32-msvc2013|macx-clang: return(true) + linux-g++*|linux-clang|win32-msvc2013|macx-clang: return(true) boot2qt: return(true) skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") |