diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-15 10:01:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-15 10:02:14 +0200 |
| commit | 98678e1ae981e2e7d52ac283028e352a1cba794a (patch) | |
| tree | 5035bb87666620ebdd66b758701ab4d862575862 /Source/WebKit2 | |
| parent | 01fa9be55572ddb3f69befc68475ed09241eabdf (diff) | |
| parent | 28077218067438fef5cdc746feb45ca6d4e755d9 (diff) | |
| download | qtwebkit-98678e1ae981e2e7d52ac283028e352a1cba794a.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Ic399cf8fef1f26f22338a67393066d69cd969579
Diffstat (limited to 'Source/WebKit2')
| -rw-r--r-- | Source/WebKit2/WebProcess.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit2/WebProcess.pro b/Source/WebKit2/WebProcess.pro index 3463b9431..d401dc23a 100644 --- a/Source/WebKit2/WebProcess.pro +++ b/Source/WebKit2/WebProcess.pro @@ -5,7 +5,7 @@ # ------------------------------------------------------------------- TEMPLATE = app -!build_pass:contains(QT_CONFIG, debug_and_release):contains(QT_CONFIG, build_all): CONFIG += release +!build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release TARGET = QtWebProcess DESTDIR = $${ROOT_BUILD_DIR}/bin |