diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-12 12:33:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-12 12:33:20 (GMT) |
| commit | c72928c26118a3aa6491dba523da0594de8b48ba (patch) | |
| tree | 6f9c6ca5ebfde0711319e734d550c615ea8ca5c5 /mkspecs/features/win32/qaxserver.prf | |
| parent | b6f1dd4151c5bbcb7d4367ec972c9026ab9e68be (diff) | |
| parent | e22e36bc61b4af7c0a9113617df5a35ed315dede (diff) | |
| download | Qt-c72928c26118a3aa6491dba523da0594de8b48ba.zip Qt-c72928c26118a3aa6491dba523da0594de8b48ba.tar.gz Qt-c72928c26118a3aa6491dba523da0594de8b48ba.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
look for makespec in the build dir first
make collection of SUBDIRS in solution generator less bizarre
run depend_command in build dir in VS generators as well
fixify target source against build tree
fix fixifying of QMAKE_SUBSTITUTES
dist target: fixify OBJECTS_DIR against output dir
fix paths of vpath-resolved files
simplify: absolute fixification ignores the base dir arguments
simplify: fileFixify for all same paths is always "."
simplify: the input and output dirs are already normalized
stop fixifying after first success
create a pwd string with a trailing slash only on demand
make uic3-generated moc files depend on mocinclude.tmp
useful location reporting for errors from QMAKE_SUBSTITUTES
clean up visual studio identification code
prefix TEMPLATE_PREFIX to TEMPLATE even if it is "default-constructed"
fix detection of relative location information
Diffstat (limited to 'mkspecs/features/win32/qaxserver.prf')
| -rw-r--r-- | mkspecs/features/win32/qaxserver.prf | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/mkspecs/features/win32/qaxserver.prf b/mkspecs/features/win32/qaxserver.prf index 2899976..a6c0869 100644 --- a/mkspecs/features/win32/qaxserver.prf +++ b/mkspecs/features/win32/qaxserver.prf @@ -8,12 +8,7 @@ isEmpty(ACTIVEQT_VERSION):ACTIVEQT_VERSION = 1.0 DEFINES += QAXSERVER -ACTIVEQT_IDE = makefile -equals(TEMPLATE_PREFIX, "vc"):ACTIVEQT_IDE = VisualStudio -equals(TEMPLATE, "vcapp"):ACTIVEQT_IDE = VisualStudio -equals(TEMPLATE, "vclib"):ACTIVEQT_IDE = VisualStudio - -equals(ACTIVEQT_IDE, "VisualStudio") { +contains(TEMPLATE, "vc.*") { ACTIVEQT_IDC = $${QMAKE_IDC} ### Qt5: remove me qtPrepareTool(ACTIVEQT_IDC, idc) ACTIVEQT_IDL = $${QMAKE_IDL} @@ -27,8 +22,7 @@ equals(ACTIVEQT_IDE, "VisualStudio") { } ACTIVEQT_TLBOUT = "$(TargetDir)/$${TARGET}.tlb" GENERATED += $${OBJECTS_DIR}/$${TARGET}.idl $${ACTIVEQT_TLBOUT} -} -equals(ACTIVEQT_IDE, "makefile") { +} else { ACTIVEQT_IDC = -$(IDC) ACTIVEQT_IDL = -$(IDL) ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t) |