| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
This reverts commit b35310bba20f0c33a61b03ea4eec6108ec873a7c.
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit b5b6cbb477b50c582d545b0e5e3a04626834e7e2)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Remove the QT_CONFIG line from the qt_webkit_version.pri file in Qt,
because it is only meaningful for separate builds of WebKit.
(Real fix is in the import script that takes care of always
removing that line)
Task-number: QTBUG-12456
Discussed-with: axis
(cherry picked from commit 4cd413970b18125885ce60d82a4ad06bce6395a5)
|
|
|
|
| |
(cherry picked from commit a7bf97f437a8d4e44a9256a89d7d6ba239577949)
|
|
|
|
|
|
| |
Integrated fix:
|| <https://webkit.org/b/40487> || [Qt] The qt_webkit_version.pri file gets overwritten on install ||
|
|
Currently features/symbian/qt.prf defaults to the qt version for WebKit
when it comes with Qt from src/3rdparty.
Instead of defaulting to the Qt version, pick up the real version from
src/3rdparty by including the .pri file.
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
|