diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-08-11 23:42:51 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2011-08-11 23:42:51 (GMT) |
| commit | 72c58996a5fc7c7a1a82fefa5a0034f57383e788 (patch) | |
| tree | cde90f301afe3783f95a683dc0a54d31aafb673e /tools/configure | |
| parent | eb5fae761ff2aaf3d35245ac1f9d1ea10c4e84bb (diff) | |
| parent | c7b8fdf5d866b5202dada00ba175606807f69fca (diff) | |
| download | Qt-72c58996a5fc7c7a1a82fefa5a0034f57383e788.zip Qt-72c58996a5fc7c7a1a82fefa5a0034f57383e788.tar.gz Qt-72c58996a5fc7c7a1a82fefa5a0034f57383e788.tar.bz2 | |
Merge branch 'master' of ../qt-qml-staging
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index b9868e6..31c359e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2760,7 +2760,7 @@ void Configure::generateOutputVars() QFile::remove(dst); if (dictionary["WEBKIT"] != "no") { // This include takes care of adding "webkit" to QT_CONFIG. - QString src = sourcePath + "/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri"; + QString src = sourcePath + "/src/3rdparty/webkit/Source/WebKit/qt/qt_webkit_version.pri"; QFile::copy(src, dst); if (dictionary["WEBKIT"] == "debug") qtConfig += "webkit-debug"; |