summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2011-05-04 11:38:59 +0200
committerGunnar Sletta <gunnar.sletta@nokia.com>2011-05-04 11:38:59 +0200
commit01285af37aafa00a1bf3fbd7654b1ec5e057775d (patch)
treeb3c421716c3bc6892b565a096a8ec5be837cd267 /tools
parent16f58282bc5a1f81f7346ac6560df68761ad277d (diff)
parentdbbcc4dff099d5cf41a3253f922b785889e17545 (diff)
Merge branch 'master' into qtquick2
Conflicts: src/imports/particles/particles.pro
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 cfc74af89d..9ac5adc50e 100644
--- a/tools/qmlviewer/qml.pri
+++ b/tools/qmlviewer/qml.pri
@@ -1,4 +1,4 @@
-QT += declarative script network sql
+QT += core-private gui-private declarative-private script network sql
contains(QT_CONFIG, opengl) {
QT += opengl
DEFINES += GL_SUPPORTED