diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:29:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:29:06 +0100 |
| commit | 7a318602581fac0d4ad414ee62437554e9c9e959 (patch) | |
| tree | a529e1cdee56947fd6194eee7f38987c06ca9a1a /src/webengine/webengine.pro | |
| parent | 54e05945b0ec4328b9d56b3b6a9886fc24ad3e6a (diff) | |
| parent | f8bdc6c7de5ace3ff4b0335cf425e0ebb21ed75d (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
src/3rdparty
src/core/content_browser_client_qt.h
src/core/core_module.pro
Change-Id: Ia05a6564a4d17ca14ff9b76ae018c3f4ef33d535
Diffstat (limited to 'src/webengine/webengine.pro')
| -rw-r--r-- | src/webengine/webengine.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro index 11ec95c05..303370365 100644 --- a/src/webengine/webengine.pro +++ b/src/webengine/webengine.pro @@ -1,7 +1,5 @@ TARGET = QtWebEngine -CMAKE_MODULE_TESTS = "-" - # For our export macros DEFINES += QT_BUILD_WEBENGINE_LIB |