WebCore: [Qt] Let QtWebKit inject itself into the qt configuration
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 12 Sep 2010 20:50:22 +0000 (20:50 +0000)
committerSimon Hausmann <simon.hausmann@nokia.com>
Sun, 12 Sep 2010 20:50:37 +0000 (22:50 +0200)
commitbdd0e421b41c5287115f92cc77e6c403763f218a
treec1e961dfc6855901a2eccdb444a60b382fcb2223
parent5eb7da7ed9051e5d0d68d22f95d7f99228795a9a
WebCore: [Qt] Let QtWebKit inject itself into the qt configuration

Patch by Oswald Buddenhagen <oswald.buddenhagen@nokia.com> on 2010-09-12
Reviewed by Simon Hausmann.

i.e., don't explicitly deal with qt_webkit_version.pri outside of the
webkit source directory.

Task-number: QTBUG-12379

* WebCore.pro:

WebKit/qt: [Qt] let WebKit inject itself into the qt configuration

Patch by Oswald Buddenhagen <oswald.buddenhagen@nokia.com> on 2010-09-12
Reviewed by Simon Hausmann.

Task-number: QTBUG-12379

* qt_webkit_version.pri: Use the faster + instead of *
operator to add webkit to the config.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67343 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebCore/ChangeLog
WebCore/WebCore.pro
WebKit/qt/ChangeLog
WebKit/qt/qt_webkit_version.pri