summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2011-08-11 16:03:12 +0200
committerGunnar Sletta <gunnar.sletta@nokia.com>2011-08-11 16:03:12 +0200
commitf9949f501890a7f8289fcbda85d3a4085bdbb21a (patch)
tree759e57bb3ed156e46a98c3a4223951c3edc55d43 /tools
parent1ddef09c351f2899b1662ddd1de190c0d0a8b7bf (diff)
parent3e0c19d5ba0e4826c3f036c3172d8ea0e30530a6 (diff)
Merge branch 'master' into refactor
Conflicts: src/declarative/declarative.pro src/imports/gestures/gestures.pro src/imports/inputcontext/inputcontext.pro src/qtquick1/graphicsitems/qdeclarativeitem.cpp src/qtquick1/qtquick1.pro Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlviewer/qml.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmlviewer/qml.pri b/tools/qmlviewer/qml.pri
index 9ac5adc50e..f5d3f80feb 100644
--- a/tools/qmlviewer/qml.pri
+++ b/tools/qmlviewer/qml.pri
@@ -1,4 +1,4 @@
-QT += core-private gui-private declarative-private script network sql
+QT += core-private gui-private declarative-private network sql
contains(QT_CONFIG, opengl) {
QT += opengl
DEFINES += GL_SUPPORTED