diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro | |
parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro')
-rw-r--r-- | tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro b/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro index a15393b214..8d5af0ea79 100644 --- a/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro +++ b/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro @@ -15,13 +15,20 @@ win32-borland: DEFINES += WIN32_BORLAND # We want to test if we can load a shared library with *any* filename... win32 { + CONFIG(debug, debug|release) { + BUILD_FOLDER = debug + } else { + BUILD_FOLDER = release + } + DESTDIR = ../$$BUILD_FOLDER/ + # vcproj and Makefile generators refer to target differently contains(TEMPLATE,vc.*) { src = $(TargetPath) } else { src = $(DESTDIR_TARGET) } - files = mylib.dl2 system.qt.test.mylib.dll + files = $$BUILD_FOLDER$${QMAKE_DIR_SEP}mylib.dl2 $$BUILD_FOLDER$${QMAKE_DIR_SEP}system.qt.test.mylib.dll } else { src = $(DESTDIR)$(TARGET) files = libmylib.so2 system.qt.test.mylib.so @@ -34,7 +41,7 @@ renamed_target.path = $$target.path for(file, files) { QMAKE_POST_LINK += $$QMAKE_COPY $$src ..$$QMAKE_DIR_SEP$$file && renamed_target.extra += $$QMAKE_COPY $$src $(INSTALL_ROOT)$${target.path}$$QMAKE_DIR_SEP$$file && - CLEAN_FILES += ../$$file + CLEAN_FILES += ..$$QMAKE_DIR_SEP$$file } renamed_target.extra = $$member(renamed_target.extra, 0, -2) QMAKE_POST_LINK = $$member(QMAKE_POST_LINK, 0, -2) |