diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-12 10:30:57 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-12 10:30:57 (GMT) |
| commit | 47f86ea037c11e2890f331f88c05fcd8667118c2 (patch) | |
| tree | a6607be13d533b568e1454cdf2093ff44b2ee570 | |
| parent | 30880f6b5c4a22c1929146caaab2dc6ba39dc338 (diff) | |
| download | Qt-47f86ea037c11e2890f331f88c05fcd8667118c2.zip Qt-47f86ea037c11e2890f331f88c05fcd8667118c2.tar.gz Qt-47f86ea037c11e2890f331f88c05fcd8667118c2.tar.bz2 | |
Fixed QtGui autotest build breaks due to incorrect SRCDIR usage.
| -rw-r--r-- | tests/auto/qimagereader/qimagereader.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qimagereader/tst_qimagereader.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qsplitter/qsplitter.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qsplitter/tst_qsplitter.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qstyle/qstyle.pro | 2 |
5 files changed, 11 insertions, 3 deletions
diff --git a/tests/auto/qimagereader/qimagereader.pro b/tests/auto/qimagereader/qimagereader.pro index b4e1de1..31a9b0f 100644 --- a/tests/auto/qimagereader/qimagereader.pro +++ b/tests/auto/qimagereader/qimagereader.pro @@ -3,7 +3,7 @@ SOURCES += tst_qimagereader.cpp MOC_DIR=tmp QT += network RESOURCES += qimagereader.qrc -DEFINES += SRCDIR=\\\"$$PWD\\\" +!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\" !contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF !contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp index ea30b3c..291025d 100644 --- a/tests/auto/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/qimagereader/tst_qimagereader.cpp @@ -55,6 +55,10 @@ #include <QTcpServer> #include <QTimer> +#if defined(Q_OS_SYMBIAN) +# define SRCDIR "" +#endif + typedef QMap<QString, QString> QStringMap; typedef QList<int> QIntList; Q_DECLARE_METATYPE(QImage) diff --git a/tests/auto/qsplitter/qsplitter.pro b/tests/auto/qsplitter/qsplitter.pro index 8c3e40b..5ec2b9d 100644 --- a/tests/auto/qsplitter/qsplitter.pro +++ b/tests/auto/qsplitter/qsplitter.pro @@ -8,7 +8,7 @@ wince*|symbian*: { addFiles.sources = extradata.txt setSizes3.dat addFiles.path = . DEPLOYMENT += addFiles - DEFINES += SRCDIR=\\\"./\\\" + !symbian:DEFINES += SRCDIR=\\\"./\\\" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/qsplitter/tst_qsplitter.cpp b/tests/auto/qsplitter/tst_qsplitter.cpp index a44e25d..d76bf78 100644 --- a/tests/auto/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/qsplitter/tst_qsplitter.cpp @@ -57,6 +57,10 @@ #include <qdebug.h> // for file error messages #include "../../shared/util.h" +#if defined(Q_OS_SYMBIAN) +# define SRCDIR "" +#endif + //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/qstyle/qstyle.pro b/tests/auto/qstyle/qstyle.pro index 8163f26..1ffe369 100644 --- a/tests/auto/qstyle/qstyle.pro +++ b/tests/auto/qstyle/qstyle.pro @@ -3,7 +3,7 @@ TARGET.EPOCHEAPSIZE = 0x200000 0x800000 SOURCES += tst_qstyle.cpp wince*|symbian*: { - DEFINES += SRCDIR=\\\".\\\" + !symbian:DEFINES += SRCDIR=\\\".\\\" addPixmap.sources = task_25863.png addPixmap.path = . DEPLOYMENT += addPixmap |