Changeset 1057


Ignore:
Timestamp:
Sep 6, 2011, 1:03:39 PM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

Rename qmldir to qmldir.in and use qmake substitution for plugin name.

This makes sure that the plugin filename always matches the TARGET
specification. This also makes the copy2build hassle unneeded.

This commit supersedes r1053.

Suggested by Rudi Ihle.

Location:
trunk
Files:
1 deleted
6 edited
4 moved

Legend:

Unmodified
Added
Removed

  • trunk/mkspecs/os2-g++/qmake.conf

    r1053 r1057  
    179179QMAKE_ENDIF     = endif
    180180
    181 QMAKE_COPY_QMLDIR   = $(QMAKESPECDIR)\\cp_qmldir.cmd
    182 
    183181load(qt_config)

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

    r1054 r1057  
    1010isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
    1111
    12 QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
    13 qmldir2build.input = QMLDIRFILE
     12!isEmpty(TARGET_SHORT):PLUGINFILENAME = $$TARGET_SHORT
     13else:PLUGINFILENAME = $$TARGET
     14
     15QMLDIRFILE.input = $${_PRO_FILE_PWD_}/qmldir.in
    1416CONFIG(QTDIR_build) {
    15     qmldir2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
     17    .output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
    1618} else {
    17     qmldir2build.output = $$OUTPUT_DIR/imports/$$TARGETPATH/qmldir
     19    .output = $$OUTPUT_DIR/imports/$$TARGETPATH/qmldir
    1820}
    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
    22 else:qmldir2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
    23 qmldir2build.name = COPY ${QMAKE_FILE_IN}
    24 qmldir2build.CONFIG += no_link
    25 QMAKE_EXTRA_COMPILERS += qmldir2build
     21QMAKE_SUBSTITUTES += QMLDIRFILE
    2622
    2723TARGET = $$qtLibraryTarget($$TARGET)
    … …  
    6763target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    6864
    69 
    70 !isEmpty(TARGET_SHORT):qmldir.files += $$qmldir2build.output
    71 else:qmldir.files += $$PWD/qmldir
     65qmldir.files += $$QMLDIRFILE.output
    7266qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    7367

  • trunk/src/3rdparty/webkit/WebKit/qt/declarative/qmldir.in

    r1035 r1057  
    1 plugin qmlwebkitplugin
     1plugin

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

    r1053 r1057  
    99HEADERS += qdeclarativefolderlistmodel.h
    1010
    11 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
    12 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    13 
    14 !isEmpty(TARGET_SHORT):qmldir.files += $$qmldir2build.output
    15 else:qmldir.files += $$PWD/qmldir
    16 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    17 
    1811symbian:{
    1912    TARGET.UID3 = 0x20021320
    … …  
    2518    DEPLOYMENT = importFiles
    2619}
    27 
    28 INSTALLS += target qmldir

  • trunk/src/imports/folderlistmodel/qmldir.in

    r1035 r1057  
    1 plugin qmlfolderlistmodelplugin
     1plugin

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

    r1053 r1057  
    99HEADERS += qdeclarativegesturearea_p.h
    1010
    11 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
    12 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    13 
    14 !isEmpty(TARGET_SHORT):qmldir.files += $$qmldir2build.output
    15 else:qmldir.files += $$PWD/qmldir
    16 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    17 
    1811symbian:{
    1912    TARGET.UID3 = 0x2002131F
    … …  
    2518    DEPLOYMENT = importFiles
    2619}
    27 
    28 INSTALLS += target qmldir

  • trunk/src/imports/gestures/qmldir.in

    r1035 r1057  
    1 plugin qmlgesturesplugin
     1plugin

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

    r1053 r1057  
    1313    qdeclarativeparticles_p.h
    1414
    15 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
    16 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    17 
    18 !isEmpty(TARGET_SHORT):qmldir.files += $$qmldir2build.output
    19 else:qmldir.files += $$PWD/qmldir
    20 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
    21 
    2215symbian:{
    2316    TARGET.UID3 = 0x2002131E
    … …  
    3023}
    3124
    32 INSTALLS += target qmldir

  • trunk/src/imports/particles/qmldir.in

    r1035 r1057  
    1 plugin qmlparticlesplugin
     1plugin

  • trunk/src/imports/qimportbase.pri

    r1053 r1057  
    1212}
    1313
    14 QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
    15 qmldir2build.input = QMLDIRFILE
    16 qmldir2build.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
    20 else:qmldir2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
    21 qmldir2build.name = COPY ${QMAKE_FILE_IN}
    22 qmldir2build.CONFIG += no_link
    23 # `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir
    24 qmldir2build.CONFIG += no_clean
    25 QMAKE_EXTRA_COMPILERS += qmldir2build
     14!isEmpty(TARGET_SHORT):PLUGINFILENAME = $$TARGET_SHORT
     15else:PLUGINFILENAME = $$TARGET
     16
     17QMLDIRFILE.input = $${_PRO_FILE_PWD_}/qmldir.in
     18QMLDIRFILE.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir
     19QMAKE_SUBSTITUTES += QMLDIRFILE
    2620
    2721TARGET = $$qtLibraryTarget($$TARGET)
    … …  
    3832    load(armcc_warnings)
    3933}
     34
     35
     36
     37
     38
     39
     40
     41
Note: See TracChangeset for help on using the changeset viewer.