diff options
author | David Boddie <dboddie@trolltech.com> | 2010-08-27 16:32:49 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-08-27 16:32:49 (GMT) |
commit | 3ca305cf25033477b73121aa6622f8c9115285ec (patch) | |
tree | 59edd09384ffca0b5e68a777a032a9aa3f65a9df /src/3rdparty | |
parent | 2cac8ca88c9b5b2f9d3040b1543d88ecee52da99 (diff) | |
parent | d3b898e973662707f9644b4fe5f8d18849929723 (diff) | |
download | Qt-3ca305cf25033477b73121aa6622f8c9115285ec.zip Qt-3ca305cf25033477b73121aa6622f8c9115285ec.tar.gz Qt-3ca305cf25033477b73121aa6622f8c9115285ec.tar.bz2 |
Merge branch '4.7' into qmldocs
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 2 | ||||
-rw-r--r-- | src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 2047143..ac0c47c 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -82,7 +82,7 @@ CONFIG(QTDIR_build) { symbian: TARGET =$$TARGET$${QT_LIBINFIX} } moduleFile=$$PWD/../WebKit/qt/qt_webkit_version.pri -include($$moduleFile) +isEmpty(QT_BUILD_TREE):include($$moduleFile) VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION} unix { diff --git a/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri b/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri index d8cf06c..4594d1e 100644 --- a/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri +++ b/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri @@ -2,4 +2,4 @@ QT_WEBKIT_VERSION = 4.7.0 QT_WEBKIT_MAJOR_VERSION = 4 QT_WEBKIT_MINOR_VERSION = 7 QT_WEBKIT_PATCH_VERSION = 0 -QT_CONFIG *= webkit +QT_CONFIG += webkit |