From 6319779bedcc590af165e2ed7d3f1ab74d4b2329 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Fri, 1 Apr 2011 05:47:28 -0500 Subject: Add module.prf, and install MODULE_PRI for each module Output warning if not present --- src/network/network.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/network/network.pro') diff --git a/src/network/network.pro b/src/network/network.pro index 948922b8c1..153961762a 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -1,7 +1,10 @@ # Qt network module - TARGET = QtNetwork QPRO_PWD = $$PWD + +CONFIG += module +MODULE_PRI = ../modules/qt_network.pri + DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE #DEFINES += QLOCALSERVER_DEBUG QLOCALSOCKET_DEBUG #DEFINES += QNETWORKDISKCACHE_DEBUG -- cgit v1.2.3 From 1287361f64c6d429535e65c8dd248a94dfc633d1 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Wed, 20 Apr 2011 13:57:51 -0500 Subject: 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. --- src/network/network.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/network/network.pro') diff --git a/src/network/network.pro b/src/network/network.pro index 153961762a..fc5d08d936 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -13,7 +13,7 @@ DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE #DEFINES += QABSTRACTSOCKET_DEBUG QNATIVESOCKETENGINE_DEBUG #DEFINES += QTCPSOCKETENGINE_DEBUG QTCPSOCKET_DEBUG QTCPSERVER_DEBUG QSSLSOCKET_DEBUG #DEFINES += QUDPSOCKET_DEBUG QUDPSERVER_DEBUG -QT = core +QT = core-private win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore -- cgit v1.2.3