summaryrefslogtreecommitdiffstats
path: root/mkspecs/modules
Commit message (Collapse)AuthorAgeFilesLines
* Revert "let WebKit inject itself into the qt configuration"Jason McDonald2010-09-082-3/+4
| | | | This reverts commit b35310bba20f0c33a61b03ea4eec6108ec873a7c.
* let WebKit inject itself into the qt configurationOswald Buddenhagen2010-09-072-4/+3
| | | | | | | | | 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)
* Make it possible again to build Qt without webkitSimon Hausmann2010-08-231-1/+0
| | | | | | | | | | | | 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)
* Updated WebKit to 669858f9bbd4913fd16c642090375c81acbfdb04Simon Hausmann2010-08-021-0/+1
| | | | (cherry picked from commit a7bf97f437a8d4e44a9256a89d7d6ba239577949)
* Updated WebKit to 40c2d6907ef75288b4f15e7fad334b9138acdbbfSimon Hausmann2010-06-151-2/+4
| | | | | | Integrated fix: || <https://webkit.org/b/40487> || [Qt] The qt_webkit_version.pri file gets overwritten on install ||
* Fix versioning of pkg files on Symbian for apps linking against WebKitSimon Hausmann2010-06-011-0/+2
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>