diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /WebKit.pro | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'WebKit.pro')
| -rw-r--r-- | WebKit.pro | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/WebKit.pro b/WebKit.pro index 876d55412..f7167129f 100644 --- a/WebKit.pro +++ b/WebKit.pro @@ -44,8 +44,17 @@ QtWebKit.file = Source/QtWebKit.pro QtWebKit.makefile = Makefile.QtWebKit SUBDIRS += QtWebKit +!production_build { + # Only tested on Linux so far. + linux* { + gtest.file = Source/ThirdParty/gtest/gtest.pro + gtest.makefile = Makefile.gtest + SUBDIRS += gtest + } +} + Tools.file = Tools/Tools.pro Tools.makefile = Makefile.Tools SUBDIRS += Tools -# Number of times incremental builds have failed: 0 +# Number of times incremental builds have failed: 1 |