diff options
| author | Ed Baak <ed.baak@nokia.com> | 2010-08-04 10:05:32 +1000 |
|---|---|---|
| committer | Ed Baak <ed.baak@nokia.com> | 2010-08-04 10:05:32 +1000 |
| commit | 0272193716552ab30c689cef54be634965d9fb7c (patch) | |
| tree | 546a13a419eeeaeca55ea7c43b303c415b42a861 | |
| parent | b52b0257ff61cf7792458a1a680ec697d5f1b200 (diff) | |
| parent | 9923f9b3d7442e8e654ddcd3142b01d98b6a1f13 (diff) | |
Merge commit 'origin/master' into research
| -rw-r--r-- | tests/qtuitest/testapps/fileDialogSaveApp/fileDialogSaveApp.pro | 3 | ||||
| -rw-r--r-- | tests/qtuitest/tst_qtuitestnamespace/tst_qtuitestnamespace.pro | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/qtuitest/testapps/fileDialogSaveApp/fileDialogSaveApp.pro b/tests/qtuitest/testapps/fileDialogSaveApp/fileDialogSaveApp.pro index cc8006e..a458154 100644 --- a/tests/qtuitest/testapps/fileDialogSaveApp/fileDialogSaveApp.pro +++ b/tests/qtuitest/testapps/fileDialogSaveApp/fileDialogSaveApp.pro @@ -6,6 +6,7 @@ TEMPLATE = app TARGET = DEPENDPATH += . INCLUDEPATH += . +INCLUDEPATH += $$SRCROOT/libqsystemtest unix:!maemo* { # avoid the need for make install on *nix DESTDIR=$$BUILDROOT/bin @@ -19,4 +20,4 @@ target.path += \ /usr/local/bin INSTALLS += \ - target
\ No newline at end of file + target diff --git a/tests/qtuitest/tst_qtuitestnamespace/tst_qtuitestnamespace.pro b/tests/qtuitest/tst_qtuitestnamespace/tst_qtuitestnamespace.pro index 79d38cf..6c5a505 100644 --- a/tests/qtuitest/tst_qtuitestnamespace/tst_qtuitestnamespace.pro +++ b/tests/qtuitest/tst_qtuitestnamespace/tst_qtuitestnamespace.pro @@ -6,6 +6,8 @@ CONFIG+=qtestlib CONFIG-=debug_and_release_target +include($$SRCROOT/libqtuitest/libqtuitest.pri) + SOURCES+= \ tst_qtuitestnamespace.cpp @@ -15,4 +17,4 @@ target.path += \ /usr/local/bin INSTALLS += \ - target
\ No newline at end of file + target |