diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:48:23 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:48:23 +0200 |
| commit | b652bffea7a0a1bf209c21d9b73f509226f031bd (patch) | |
| tree | 0770567f64ad51b58f55726ae6eac276a4f71d0e /src/network/network.pro | |
| parent | a0cf2119a74b7f17d3c417bd7364376dd1e0652d (diff) | |
| parent | 00f9ac93c248b019e72757da9c5d8121a5fd1bf5 (diff) | |
Merge branch 'buildsystem'
This appears to be fully backwards-compatible with all tested modules,
as far as CI is concerned.
Change-Id: I53f979d06d0a264c5aab1193bab181a38ab837d6
Diffstat (limited to 'src/network/network.pro')
| -rw-r--r-- | src/network/network.pro | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/network/network.pro b/src/network/network.pro index 3e1bc6d4e5..fc901da072 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -1,13 +1,9 @@ -load(qt_module) +load(qt_build_config) -# Qt network module TARGET = QtNetwork -QPRO_PWD = $$PWD - -CONFIG += module -MODULE_PRI = ../modules/qt_network.pri +QT = core-private -DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE +DEFINES += QT_NO_USING_NAMESPACE #DEFINES += QLOCALSERVER_DEBUG QLOCALSOCKET_DEBUG #DEFINES += QNETWORKDISKCACHE_DEBUG #DEFINES += QSSLSOCKET_DEBUG @@ -15,15 +11,10 @@ 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-private win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000 -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore - load(qt_module_config) -HEADERS += $$QT_SOURCE_TREE/src/network/qtnetworkversion.h - QMAKE_DOCS = $$PWD/doc/qtnetwork.qdocconf QMAKE_DOCS_INDEX = ../../doc |