diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
| commit | 88a04ac016f57c2d78e714682445dff2e7db4ade (patch) | |
| tree | a48ca81ee3b29953121308168db22532d5b57fe2 /Tools/QtTestBrowser | |
| parent | 284837daa07b29d6a63a748544a90b1f5842ac5c (diff) | |
| download | qtwebkit-88a04ac016f57c2d78e714682445dff2e7db4ade.tar.gz | |
Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206)
This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection
and allow for further simplifications in the future
Diffstat (limited to 'Tools/QtTestBrowser')
| -rw-r--r-- | Tools/QtTestBrowser/QtTestBrowser.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/QtTestBrowser/QtTestBrowser.pro b/Tools/QtTestBrowser/QtTestBrowser.pro index 4d64af9e8..60d1b4f3f 100644 --- a/Tools/QtTestBrowser/QtTestBrowser.pro +++ b/Tools/QtTestBrowser/QtTestBrowser.pro @@ -43,11 +43,11 @@ WEBKIT += wtf webcore DESTDIR = $$ROOT_BUILD_DIR/bin QT += network webkit widgets -contains(DEFINES, HAVE_QTPRINTSUPPORT=1): QT += printsupport +have?(QTPRINTSUPPORT): QT += printsupport macx:QT += xml -contains(DEFINES, HAVE_FONTCONFIG=1): PKGCONFIG += fontconfig +have?(FONTCONFIG): PKGCONFIG += fontconfig contains(QT_CONFIG, opengl) { QT += opengl |