diff options
| author | Bill King <bill.king@nokia.com> | 2009-07-13 04:01:25 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-07-13 04:01:25 (GMT) |
| commit | b7d274c1fc818b347ff9256a00e4f667f0bd1556 (patch) | |
| tree | 2e8b9d6d920064b91a236aee1fd518f3c5b7c3ab /tests/auto/linguist/lupdate | |
| parent | c402f363d8502c688433eb4f21ba3528d9ac89e5 (diff) | |
| parent | de07df9001586cc18ae267591359541b7ea494a0 (diff) | |
| download | Qt-b7d274c1fc818b347ff9256a00e4f667f0bd1556.zip Qt-b7d274c1fc818b347ff9256a00e4f667f0bd1556.tar.gz Qt-b7d274c1fc818b347ff9256a00e4f667f0bd1556.tar.bz2 | |
Merge commit 'origin/4.5'
Conflicts:
src/plugins/kbddrivers/usb/main.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qwidget/tst_qwidget.cpp
Diffstat (limited to 'tests/auto/linguist/lupdate')
| -rw-r--r-- | tests/auto/linguist/lupdate/testlupdate.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/linguist/lupdate/testlupdate.cpp b/tests/auto/linguist/lupdate/testlupdate.cpp index 8abc2b0..04c03f1 100644 --- a/tests/auto/linguist/lupdate/testlupdate.cpp +++ b/tests/auto/linguist/lupdate/testlupdate.cpp @@ -56,8 +56,9 @@ TestLUpdate::TestLUpdate() { childProc = 0; - m_cmdLupdate = QLatin1String("lupdate"); - m_cmdQMake = QLatin1String("qmake"); + QString binPath = QLibraryInfo::location(QLibraryInfo::BinariesPath); + m_cmdLupdate = binPath + QLatin1String("/lupdate"); + m_cmdQMake = binPath + QLatin1String("/qmake"); } TestLUpdate::~TestLUpdate() |