Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Turned on private headers for some plugins.
2011-05-10 01:16:35 +10:00 · 2011-05-10 01:16:35 +10:00 · 4bcd4c08fe
commit 4bcd4c08fe
parent e8aceff195 7eef0de091
2 changed files with 4 additions and 0 deletions
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@ -1,6 +1,8 @@
 TARGET = qwayland
 include(../../qpluginbase.pri)

+QT+=gui-private core-private opengl-private
+
 DESTDIR = $$QT.gui.plugins/platforms

 DEFINES += Q_PLATFORM_WAYLAND
--- a/src/plugins/platforms/xcb/xcb.pro
+++ b/src/plugins/platforms/xcb/xcb.pro
@ -5,6 +5,8 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms

 QT += core-private gui-private

+QT+=gui-private core-private
+
 SOURCES = \
        qxcbconnection.cpp \
        qxcbintegration.cpp \