Changeset 1053 for trunk/src


Ignore:
Timestamp:
Sep 5, 2011, 7:06:37 PM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

OS/2: Add support for short DLL names of QML plugins.

Location:
trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro

    r965 r1053  
    1111
    1212QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
    13 copy2build.input = QMLDIRFILE
     132build.input = QMLDIRFILE
    1414CONFIG(QTDIR_build) {
    15     copy2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
     15    2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
    1616} else {
    17     copy2build.output = $$OUTPUT_DIR/imports/$$TARGETPATH/qmldir
     17    2build.output = $$OUTPUT_DIR/imports/$$TARGETPATH/qmldir
    1818}
    19 !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
    20 copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
    21 copy2build.name = COPY ${QMAKE_FILE_IN}
    22 copy2build.CONFIG += no_link
    23 QMAKE_EXTRA_COMPILERS += copy2build
     19!contains(TEMPLATE_PREFIX, vc):qmldir2build.variable_out = PRE_TARGETDEPS
     20!isEmpty(TARGET_SHORT):qmldir2build.depends = $(MAKEFILE) # this adds dependency on this .pri
     21!isEmpty(TARGET_SHORT):qmldir2build.commands = $$QMAKE_COPY_QMLDIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} $$TARGET $$TARGET_SHORT
     22else:qmldir2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
     23qmldir2build.name = COPY ${QMAKE_FILE_IN}
     24qmldir2build.CONFIG += no_link
     25QMAKE_EXTRA_COMPILERS += qmldir2build
    2426
    2527TARGET = $$qtLibraryTarget($$TARGET)
    … …  
    6668
    6769
    68 qmldir.files += $$PWD/qmldir
     70!isEmpty(TARGET_SHORT):qmldir.files += $$qmldir2build.output
     71else:qmldir.files += $$PWD/qmldir
    6972qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    7073

  • trunk/src/imports/folderlistmodel/folderlistmodel.pro

    r890 r1053  
    1212target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    1313
    14 qmldir.files += $$PWD/qmldir
     14!isEmpty(TARGET_SHORT):qmldir.files += $$qmldir2build.output
     15else:qmldir.files += $$PWD/qmldir
    1516qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    1617

  • trunk/src/imports/gestures/gestures.pro

    r890 r1053  
    1212target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    1313
    14 qmldir.files += $$PWD/qmldir
     14!isEmpty(TARGET_SHORT):qmldir.files += $$qmldir2build.output
     15else:qmldir.files += $$PWD/qmldir
    1516qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    1617

  • trunk/src/imports/particles/particles.pro

    r890 r1053  
    1616target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    1717
    18 qmldir.files += $$PWD/qmldir
     18!isEmpty(TARGET_SHORT):qmldir.files += $$qmldir2build.output
     19else:qmldir.files += $$PWD/qmldir
    1920qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    2021

  • trunk/src/imports/qimportbase.pri

    r965 r1053  
    1313
    1414QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
    15 copy2build.input = QMLDIRFILE
    16 copy2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
    17 !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
    18 copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
    19 copy2build.name = COPY ${QMAKE_FILE_IN}
    20 copy2build.CONFIG += no_link
     15qmldir2build.input = QMLDIRFILE
     16qmldir2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
     17!contains(TEMPLATE_PREFIX, vc):qmldir2build.variable_out = PRE_TARGETDEPS
     18!isEmpty(TARGET_SHORT):qmldir2build.depends = $(MAKEFILE) # this adds dependency on this .pri
     19!isEmpty(TARGET_SHORT):qmldir2build.commands = $$QMAKE_COPY_QMLDIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} $$TARGET $$TARGET_SHORT
     20else:qmldir2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
     21qmldir2build.name = COPY ${QMAKE_FILE_IN}
     22qmldir2build.CONFIG += no_link
    2123# `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir
    22 copy2build.CONFIG += no_clean
    23 QMAKE_EXTRA_COMPILERS += copy2build
     242build.CONFIG += no_clean
     25QMAKE_EXTRA_COMPILERS += 2build
    2426
    2527TARGET = $$qtLibraryTarget($$TARGET)
Note: See TracChangeset for help on using the changeset viewer.