whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move IMPORT_VERSION fallback into the conditional of the consumer 

Change-Id: I01336903aaaff8bca5407aa3c50d330e8fd7910a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
bb10
Oswald Buddenhagen 2012-08-06 16:44:52 +02:00 committed by Qt by Nokia
parent 3d8fbaa866
commit 70aeeda608
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mkspecs/features/qml_plugin.prf
View File

@ -9,7 +9,6 @@ isEmpty(CXX_MODULE) {
}
isEmpty(TARGETPATH): TARGETPATH = $$eval(QT.$${CXX_MODULE}.name)
DESTDIR = $$eval(QT.$${CXX_MODULE}.imports)/$$TARGETPATH
isEmpty(IMPORT_VERSION): IMPORT_VERSION = $$eval(QT.$${CXX_MODULE}.MAJOR_VERSION).$$eval(QT.$${CXX_MODULE}.MINOR_VERSION)
QMLDIRFILE = $$_PRO_FILE_PWD_/qmldir
fq_qml_files = $$QMLDIRFILE
@ -58,6 +57,8 @@ load(qt_targets)
# directory. Then review and commit the changes made to plugins.qmltypes.
#
!cross_compile {
isEmpty(IMPORT_VERSION): IMPORT_VERSION = $$eval(QT.$${CXX_MODULE}.MAJOR_VERSION).$$eval(QT.$${CXX_MODULE}.MINOR_VERSION)
load(resolve_target)
qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
qmltypes.target = qmltypes