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/qnetworkreply/test | |
| 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/qnetworkreply/test')
| -rw-r--r-- | tests/auto/qnetworkreply/test/test.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qnetworkreply/test/test.pro b/tests/auto/qnetworkreply/test/test.pro index b9ece38..6e1b1e3 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" |