diff options
| author | Daniel Pope <daniel.pope@nokia.com> | 2010-12-10 11:52:58 +1000 |
|---|---|---|
| committer | Daniel Pope <daniel.pope@nokia.com> | 2010-12-10 11:52:58 +1000 |
| commit | 0959997cfa97b21d19c0ba806ece14f649fd4789 (patch) | |
| tree | 04060297bcc67012a6eafd8c4bdeec7700f1b820 | |
| parent | 200a8ac92afa0d8c5ff54c929a345dd3e05d3dd7 (diff) | |
Windows-ification of the QML test framework... In summary:
- added QtScript dependency
- fix a dllimport related typo
- remove automatic building of debug AND release for one of the projects (I don't want a release build in debug mode, and vice-versa).
Happy testing one and all.
| -rw-r--r-- | src/imports/testlib/testlib.pro | 2 | ||||
| -rw-r--r-- | src/quicktestlib/quicktestlib.pro | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro index f1ae659..3605ebf 100644 --- a/src/imports/testlib/testlib.pro +++ b/src/imports/testlib/testlib.pro @@ -11,7 +11,7 @@ symbian { } } -QT += declarative +QT += declarative script SOURCES += main.cpp HEADERS += diff --git a/src/quicktestlib/quicktestlib.pro b/src/quicktestlib/quicktestlib.pro index 52a249e..2ee77c4 100644 --- a/src/quicktestlib/quicktestlib.pro +++ b/src/quicktestlib/quicktestlib.pro @@ -1,11 +1,10 @@ TEMPLATE = lib TARGET = QtQuickTest$${QT_LIBINFIX} CONFIG += dll warn_on -QT += declarative +QT += declarative script DESTDIR = ../../lib win32 { - CONFIG += debug_and_release debug_and_release_config build_all DLLDESTDIR = ../../bin !static:DEFINES += QT_MAKEDLL @@ -40,7 +39,7 @@ HEADERS += $$PRIVATE_HEADERS include(testlib/testlib.pri) -DEFINES += QT_BUILD_QUCIK_TEST_LIB +DEFINES += QT_BUILD_QUICK_TEST_LIB !symbian { target.path += $$[QT_INSTALL_LIBS] |