diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2018-01-07 19:43:21 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2018-01-07 17:08:48 +0000 |
| commit | cb895f50d5c08976c0f5ecbb82e6bd19d9ea090d (patch) | |
| tree | fd8632d48c2ee72747feaa0e2b458d591e254288 /Tools | |
| parent | 8cab1238d6ea14fa6a61ed4e0c5d39ccd0736ec2 (diff) | |
| download | qtwebkit-cb895f50d5c08976c0f5ecbb82e6bd19d9ea090d.tar.gz | |
Import WebKit commit 69d327017a8d700cbfc7e1120270db4d55416f41
Change-Id: I38406c67ba681f7693a45b0fa2d8c2e44a6d9a0e
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/qmake/projects/run_cmake.pro | 4 | ||||
| -rwxr-xr-x | Tools/qt/make-snapshot.pl | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro index 74579c57e..fadfda059 100644 --- a/Tools/qmake/projects/run_cmake.pro +++ b/Tools/qmake/projects/run_cmake.pro @@ -62,10 +62,6 @@ build_pass|!debug_and_release { else: CMAKE_CONFIG += ZLIB_INCLUDE_DIRS=$$QTBASE_DIR/src/3rdparty/zlib } - qtConfig(opengles2):!qtConfig(dynamicgl) { - CMAKE_CONFIG += QT_USES_GLES2_ONLY=1 - } - exists($$ROOT_BUILD_DIR/conanbuildinfo.cmake):exists($$ROOT_BUILD_DIR/conanfile.txt) { CMAKE_CONFIG += QT_CONAN_DIR=$$ROOT_BUILD_DIR } diff --git a/Tools/qt/make-snapshot.pl b/Tools/qt/make-snapshot.pl index 667890de0..2c2af1a9f 100755 --- a/Tools/qt/make-snapshot.pl +++ b/Tools/qt/make-snapshot.pl @@ -36,7 +36,7 @@ scalar @ARGV == 0 || usage(); -f "ChangeLog" && die "This script must be run in snapshots repository"; -d ".git" || usage(); -`git status` =~ "nothing to commit, working tree clean" or die "Target working tree is dirty"; +`LC_ALL=C LANG=C git status` =~ "nothing to commit, working tree clean" or die "Target working tree is dirty"; my $src_repo = dirname(dirname(dirname(__FILE__))); my $target_repo = getcwd(); |