Merge remote-tracking branch 'origin/2.7'

2013-03-28 12:19:45 +01:00
parent 5c36c594fe bcbd1eeb4c
commit d3c979dc0f
25 changed files with 218 additions and 70 deletions
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
@@ -1,6 +1,6 @@

 QT += core gui widgets qml quick network v8
-contains (QT_CONFIG, webkit) {
+!isEmpty(QT.webkit.name) {
    QT += webkit
 }