diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-17 16:59:51 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-23 11:54:03 (GMT) |
| commit | b5b6cbb477b50c582d545b0e5e3a04626834e7e2 (patch) | |
| tree | 842f52d4b8ad03303ee56b2b1a24f5a765c03f3d /src/3rdparty/webkit/WebCore/WebCore.pro | |
| parent | 82d5f0ae622d2579b925a5f6a8054eeeccb9a233 (diff) | |
| download | Qt-b5b6cbb477b50c582d545b0e5e3a04626834e7e2.zip Qt-b5b6cbb477b50c582d545b0e5e3a04626834e7e2.tar.gz Qt-b5b6cbb477b50c582d545b0e5e3a04626834e7e2.tar.bz2 | |
let WebKit inject itself into the qt configuration
i.e., don't explicitly deal with qt_webkit_version.pri outside of the
webkit source directory.
Task-number: QTBUG-12379
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty/webkit/WebCore/WebCore.pro')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 2 |
1 files changed, 1 insertions, 1 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 { |