diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-16 06:57:27 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-17 06:14:49 (GMT) |
| commit | cc583fef7b9839be7173e039a1162541449e18c2 (patch) | |
| tree | f522cf6fb1128fcb16056175afaedeee8ed5b609 | |
| parent | 2d67f6efc47986e8f6d69943f0986d18ae2ced96 (diff) | |
| download | Qt-cc583fef7b9839be7173e039a1162541449e18c2.zip Qt-cc583fef7b9839be7173e039a1162541449e18c2.tar.gz Qt-cc583fef7b9839be7173e039a1162541449e18c2.tar.bz2 | |
Fixed compile of qlibrary test with vcproj generator.
COPY and DESTDIR_TARGET are defined by qmake when generating makefiles,
but not when generating vcproj files. We need to do something different
for the vcproj generator.
| -rw-r--r-- | tests/auto/qlibrary/lib2/lib2.pro | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/qlibrary/lib2/lib2.pro b/tests/auto/qlibrary/lib2/lib2.pro index da30a2d..4654f4d 100644 --- a/tests/auto/qlibrary/lib2/lib2.pro +++ b/tests/auto/qlibrary/lib2/lib2.pro @@ -16,14 +16,19 @@ win32-borland: DEFINES += WIN32_BORLAND !symbian { win32 { - src = $(DESTDIR_TARGET) + # vcproj and Makefile generators refer to target differently + contains(TEMPLATE,vc.*) { + src = $(TargetPath) + } else { + src = $(DESTDIR_TARGET) + } files = mylib.dl2 system.trolltech.test.mylib.dll } else { src = $(DESTDIR)$(TARGET) files = libmylib.so2 system.trolltech.test.mylib.so } for(file, files) { - QMAKE_POST_LINK += $(COPY) $$src ..$$QMAKE_DIR_SEP$$file && + QMAKE_POST_LINK += $$QMAKE_COPY $$src ..$$QMAKE_DIR_SEP$$file && CLEAN_FILES += ../$$file } QMAKE_POST_LINK = $$member(QMAKE_POST_LINK, 0, -2) |