diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-04 13:17:47 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-04 13:17:47 +0200 |
| commit | be212bf108e71ba3b5b75802b1f4de6613ba315c (patch) | |
| tree | c541ad12e8698f04e8fe386c2e1b94e8baca6c1b /tests/auto/qtextcodec | |
| parent | 67ae1b0dac175f48875507f3187ed49276a29ddf (diff) | |
| parent | e6bb00250b321b149dd80259dc4f479088d5949b (diff) | |
Merge commit 'origin/master'
Conflicts:
src/corelib/global/qglobal.h
src/corelib/kernel/qmetatype.cpp
src/corelib/kernel/qobject.cpp
src/corelib/thread/qthread_unix.cpp
src/gui/graphicsview/qgraphicssceneevent.h
src/gui/itemviews/qheaderview.h
src/gui/kernel/qapplication_qws.cpp
src/gui/kernel/qgesture.h
src/gui/kernel/qgesturerecognizer.h
src/gui/painting/qpaintengine_raster.cpp
src/network/access/qhttpnetworkreply.cpp
src/network/access/qnetworkcookie.h
src/network/socket/qnativesocketengine_unix.cpp
Diffstat (limited to 'tests/auto/qtextcodec')
| -rw-r--r-- | tests/auto/qtextcodec/test/test.pro | 5 | ||||
| -rw-r--r-- | tests/auto/qtextcodec/tst_qtextcodec.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/qtextcodec/test/test.pro b/tests/auto/qtextcodec/test/test.pro index 7d4fdb3c47..7748ce4014 100644 --- a/tests/auto/qtextcodec/test/test.pro +++ b/tests/auto/qtextcodec/test/test.pro @@ -6,7 +6,12 @@ wince*|symbian { addFiles.path = . DEPLOYMENT += addFiles DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs +} + +wince*: { DEFINES += SRCDIR=\\\"\\\" +}else:symbian { + # Symbian can't define SRCDIR meaningfully here } else { DEFINES += SRCDIR=\\\"$$PWD/../\\\" } diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index 403a75111f..32d23bda58 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -48,6 +48,11 @@ #include <time.h> #include <qprocess.h> +#ifdef Q_OS_SYMBIAN +#define SRCDIR "" +#endif + + class tst_QTextCodec : public QObject { Q_OBJECT |