diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-07-29 07:46:48 (GMT) |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-07-29 07:46:48 (GMT) |
commit | 940b5b23268193d58d7e229bf97a22276098790b (patch) | |
tree | af532e70e2646012b6a856bab48a105389bc2098 /tests/auto/qsocks5socketengine | |
parent | d1e1f49ea0b742fd655112fdb30f5751e142a766 (diff) | |
parent | 0041606aefae5da0ff6c8187540f3eff33cbb643 (diff) | |
download | Qt-940b5b23268193d58d7e229bf97a22276098790b.zip Qt-940b5b23268193d58d7e229bf97a22276098790b.tar.gz Qt-940b5b23268193d58d7e229bf97a22276098790b.tar.bz2 |
Merge remote branch 'origin/4.6' into 4.7-from-4.6
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/itemviews/qlistview.cpp
tests/auto/qlistview/tst_qlistview.cpp
tests/auto/qnetworkreply/test/test.pro
tests/auto/qsocks5socketengine/qsocks5socketengine.pro
Diffstat (limited to 'tests/auto/qsocks5socketengine')
-rw-r--r-- | tests/auto/qsocks5socketengine/qsocks5socketengine.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro index 62c0c87..171d428 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 symbian: TARGET.CAPABILITY = NetworkServices |