diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-22 11:37:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-22 11:37:06 (GMT) |
| commit | 498189595db84d3ae780a365d444eda27d627dfe (patch) | |
| tree | f3ffeb9e4f6cf2d9f53920cd1808ce694cc4656d | |
| parent | f3b6b9ab6b068216c3656fd75f1b7e569495bed3 (diff) | |
| parent | 6b6778c7f0e56dc6128b8d6d986cb8874fdf30cd (diff) | |
| download | Qt-498189595db84d3ae780a365d444eda27d627dfe.zip Qt-498189595db84d3ae780a365d444eda27d627dfe.tar.gz Qt-498189595db84d3ae780a365d444eda27d627dfe.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
One more .pro fix for deprecated INCPATH
Fix Rhys' qmake warnings
| -rw-r--r-- | examples/network/torrent/torrent.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qnetworkreply/test/test.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qsocks5socketengine/qsocks5socketengine.pro | 2 | ||||
| -rw-r--r-- | tests/benchmarks/network/network.pro | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/network/torrent/torrent.pro b/examples/network/torrent/torrent.pro index 7665455..44716fd 100644 --- a/examples/network/torrent/torrent.pro +++ b/examples/network/torrent/torrent.pro @@ -5,7 +5,7 @@ HEADERS += addtorrentdialog.h \ metainfo.h \ peerwireclient.h \ ratecontroller.h \ - filemanager.h \ + filemanager.h \ torrentclient.h \ torrentserver.h \ trackerclient.h diff --git a/tests/auto/qnetworkreply/test/test.pro b/tests/auto/qnetworkreply/test/test.pro index 7bf3852..e63146c 100644 --- a/tests/auto/qnetworkreply/test/test.pro +++ b/tests/auto/qnetworkreply/test/test.pro @@ -31,7 +31,7 @@ symbian:{ DEPLOYMENT += certFiles # Symbian toolchain does not support correct include semantics - INCPATH+=..\..\..\..\include\QtNetwork\private + INCLUDEPATH+=..\..\..\..\include\QtNetwork\private # bigfile test case requires more heap TARGET.EPOCHEAPSIZE="0x100 0x1000000" TARGET.CAPABILITY="ALL -TCB" diff --git a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro index 4a32852..5e3c92c 100644 --- a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro +++ b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro @@ -10,7 +10,7 @@ MOC_DIR=tmp QT = core network # Symbian toolchain does not support correct include semantics -symbian:INCPATH+=..\..\..\include\QtNetwork\private +symbian:INCLUDEPATH+=..\..\..\include\QtNetwork\private requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/benchmarks/network/network.pro b/tests/benchmarks/network/network.pro index 4e83db2..ea0f821 100644 --- a/tests/benchmarks/network/network.pro +++ b/tests/benchmarks/network/network.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -SUBDIRS = \ +SUBDIRS = \ access \ kernel \ socket |