diff options
author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-04-20 13:57:51 -0500 |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-02 15:30:08 +0200 |
commit | 1287361f64c6d429535e65c8dd248a94dfc633d1 (patch) | |
tree | b53e7cc3d3efb44513c97f257316bba9e69abbef /src/plugins | |
parent | 2e8b6dcb4a6fa8ff42e967eb5dc27a461e721858 (diff) |
Move private headers into versioned subdirectory
This will allow us to expose private headers in a controlled manner,
and ensure that they are not used by accident. This also means that
we internally will have to enable the private headers for the
modules we wish to use in the project.
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/accessible/widgets/widgets.pro | 1 | ||||
-rw-r--r-- | src/plugins/bearer/connman/connman.pro | 2 | ||||
-rw-r--r-- | src/plugins/bearer/generic/generic.pro | 2 | ||||
-rw-r--r-- | src/plugins/bearer/nativewifi/nativewifi.pro | 2 | ||||
-rw-r--r-- | src/plugins/bearer/networkmanager/networkmanager.pro | 2 | ||||
-rw-r--r-- | src/plugins/graphicssystems/opengl/opengl.pro | 2 | ||||
-rw-r--r-- | src/plugins/graphicssystems/trace/trace.pro | 2 | ||||
-rw-r--r-- | src/plugins/imageformats/jpeg/jpeg.pro | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/qsqldriverbase.pri | 2 |
9 files changed, 10 insertions, 7 deletions
diff --git a/src/plugins/accessible/widgets/widgets.pro b/src/plugins/accessible/widgets/widgets.pro index 092f3ca32c..8329bce963 100644 --- a/src/plugins/accessible/widgets/widgets.pro +++ b/src/plugins/accessible/widgets/widgets.pro @@ -2,6 +2,7 @@ TARGET = qtaccessiblewidgets include(../../qpluginbase.pri) include (../qaccessiblebase.pri) +QT += core-private gui-private DESTDIR = $$QT.gui.plugins/accessible QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)" diff --git a/src/plugins/bearer/connman/connman.pro b/src/plugins/bearer/connman/connman.pro index 3ac54c3769..f57a0c930b 100644 --- a/src/plugins/bearer/connman/connman.pro +++ b/src/plugins/bearer/connman/connman.pro @@ -1,7 +1,7 @@ TARGET = qconnmanbearer include(../../qpluginbase.pri) -QT = core network dbus +QT = core network-private dbus HEADERS += qconnmanservice_linux_p.h \ qofonoservice_linux_p.h \ diff --git a/src/plugins/bearer/generic/generic.pro b/src/plugins/bearer/generic/generic.pro index 94ab36ce59..94fefaf6c2 100644 --- a/src/plugins/bearer/generic/generic.pro +++ b/src/plugins/bearer/generic/generic.pro @@ -1,7 +1,7 @@ TARGET = qgenericbearer include(../../qpluginbase.pri) -QT = core network +QT = core-private network-private HEADERS += qgenericengine.h \ ../qnetworksession_impl.h \ diff --git a/src/plugins/bearer/nativewifi/nativewifi.pro b/src/plugins/bearer/nativewifi/nativewifi.pro index 6df346cd46..ba02f37d23 100644 --- a/src/plugins/bearer/nativewifi/nativewifi.pro +++ b/src/plugins/bearer/nativewifi/nativewifi.pro @@ -1,7 +1,7 @@ TARGET = qnativewifibearer include(../../qpluginbase.pri) -QT = core network +QT = core-private network-private HEADERS += qnativewifiengine.h \ platformdefs.h \ diff --git a/src/plugins/bearer/networkmanager/networkmanager.pro b/src/plugins/bearer/networkmanager/networkmanager.pro index b3e088344d..a9de1561fd 100644 --- a/src/plugins/bearer/networkmanager/networkmanager.pro +++ b/src/plugins/bearer/networkmanager/networkmanager.pro @@ -1,7 +1,7 @@ TARGET = qnmbearer include(../../qpluginbase.pri) -QT = core network dbus +QT = core network-private dbus HEADERS += qnmdbushelper.h \ qnetworkmanagerservice.h \ diff --git a/src/plugins/graphicssystems/opengl/opengl.pro b/src/plugins/graphicssystems/opengl/opengl.pro index fb3cb5331a..30c88271b6 100644 --- a/src/plugins/graphicssystems/opengl/opengl.pro +++ b/src/plugins/graphicssystems/opengl/opengl.pro @@ -1,7 +1,7 @@ TARGET = qglgraphicssystem include(../../qpluginbase.pri) -QT += opengl +QT += core-private gui-private opengl-private DESTDIR = $$QT.gui.plugins/graphicssystems diff --git a/src/plugins/graphicssystems/trace/trace.pro b/src/plugins/graphicssystems/trace/trace.pro index 0958a86973..b31beb35f8 100644 --- a/src/plugins/graphicssystems/trace/trace.pro +++ b/src/plugins/graphicssystems/trace/trace.pro @@ -1,7 +1,7 @@ TARGET = qtracegraphicssystem include(../../qpluginbase.pri) -QT += network +QT += core-private gui-private network DESTDIR = $$QT.gui.plugins/graphicssystems symbian:TARGET.UID3 = 0x2002130E diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro index 3a0e8754c0..1e6c24d061 100644 --- a/src/plugins/imageformats/jpeg/jpeg.pro +++ b/src/plugins/imageformats/jpeg/jpeg.pro @@ -1,6 +1,8 @@ TARGET = qjpeg include(../../qpluginbase.pri) +QT += core-private + QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-jpeg)" include(../../../gui/image/qjpeghandler.pri) diff --git a/src/plugins/sqldrivers/qsqldriverbase.pri b/src/plugins/sqldrivers/qsqldriverbase.pri index 64f55fda78..7399c659da 100644 --- a/src/plugins/sqldrivers/qsqldriverbase.pri +++ b/src/plugins/sqldrivers/qsqldriverbase.pri @@ -1,5 +1,5 @@ include(../qpluginbase.pri) -QT = core sql +QT = core sql-private DESTDIR = $$QT.sql.plugins/sqldrivers target.path += $$[QT_INSTALL_PLUGINS]/sqldrivers |