diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-11 12:07:26 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-11 12:07:26 +0200 |
| commit | 68cf12a907c4fbc918019dad2c2a845466d15a30 (patch) | |
| tree | 0adafc6d8ec233683579a66097b38116722f9f4b /tests/auto/uic | |
| parent | dadb7b7ad36c43757d96b540b40cc3d81dca69d2 (diff) | |
| parent | c39436c722e778460366995877d66a8935d2d636 (diff) | |
| download | qt4-tools-68cf12a907c4fbc918019dad2c2a845466d15a30.tar.gz | |
Merge branch '4.5'
Conflicts:
configure
tests/auto/moc/tst_moc.cpp
Diffstat (limited to 'tests/auto/uic')
| -rw-r--r-- | tests/auto/uic/tst_uic.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/uic/tst_uic.cpp b/tests/auto/uic/tst_uic.cpp index 6f91ab35e2..827b3aa7b8 100644 --- a/tests/auto/uic/tst_uic.cpp +++ b/tests/auto/uic/tst_uic.cpp @@ -45,6 +45,7 @@ #include <QtTest/QtTest> #include <QtCore/QProcess> #include <QtCore/QByteArray> +#include <QtCore/QLibraryInfo> #ifndef Q_OS_WINCE @@ -77,7 +78,7 @@ private: tst_uic::tst_uic() : uicExists(true) - , command(QLatin1String("uic")) + , command(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/uic")) { } @@ -218,7 +219,7 @@ QString tst_uic::workingDir() const return QDir::cleanPath(SRCDIR); } -QTEST_MAIN(tst_uic) +QTEST_APPLESS_MAIN(tst_uic) #include "tst_uic.moc" #else QTEST_NOOP_MAIN |