Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit 1ea29c6

Browse files
Skycoder42Skycoder42
committed
fix qmldump
1 parent 8d35ee0 commit 1ea29c6

File tree

8 files changed

+68
-47
lines changed

8 files changed

+68
-47
lines changed

‎.qmake.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ DEFINES += QT_DEPRECATED_WARNINGS QT_ASCII_CAST_WARNINGS
99

1010
MODULE_VERSION_MAJOR = 1
1111
MODULE_VERSION_MINOR = 1
12-
MODULE_VERSION_PATCH = 4
12+
MODULE_VERSION_PATCH = 5
1313
MODULE_VERSION_IMPORT = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}
1414
MODULE_VERSION = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}.$${MODULE_VERSION_PATCH}

‎src/imports/mvvmcore/mvvmcore.pro‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,25 @@ SOURCES += \
2222

2323
OTHER_FILES += qmldir
2424

25-
generate_qmltypes {
26-
typeextra1.target = qmltypes
27-
typeextra1.depends += export LD_LIBRARY_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(LD_LIBRARY_PATH)"
28-
typeextra2.target = qmltypes
29-
typeextra2.depends += export QML2_IMPORT_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/qml/"
30-
QMAKE_EXTRA_TARGETS += typeextra1 typeextra2
31-
}
32-
3325
CONFIG += qmlcache
3426
load(qml_plugin)
3527

3628
generate_qmltypes {
37-
qmltypes.depends = ../../../qml/$$TARGETPATH/$(TARGET) #overwrite the target deps
29+
# run again to overwrite module env
30+
ldpath.name = LD_LIBRARY_PATH
31+
ldpath.value = "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$$(LD_LIBRARY_PATH)"
32+
qmlpath.name = QML2_IMPORT_PATH
33+
qmlpath.value = "$$shadowed($$dirname(_QMAKE_CONF_))/qml/:$$[QT_INSTALL_QML]:$$(QML2_IMPORT_PATH)"
34+
PLGDUMP_ENV = ldpath qmlpath
35+
QT_TOOL_ENV = ldpath qmlpath
36+
qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
37+
QT_TOOL_ENV =
38+
39+
#overwrite the target deps as make target is otherwise not detected
40+
qmltypes.depends = ../../../qml/$$TARGETPATH/$(TARGET)
41+
OLDDMP = $$take_first(qmltypes.commands)
42+
qmltypes.commands = $$QMLPLUGINDUMP $${qmltypes.commands}
43+
message("replaced $$OLDDMP with $$QMLPLUGINDUMP")
3844

3945
mfirst.target = all
4046
mfirst.depends += qmltypes

‎src/imports/mvvmdatasynccore/mvvmdatasynccore.pro‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,25 @@ SOURCES += \
1414

1515
OTHER_FILES += qmldir
1616

17-
generate_qmltypes {
18-
typeextra1.target = qmltypes
19-
typeextra1.depends += export LD_LIBRARY_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(LD_LIBRARY_PATH)"
20-
typeextra2.target = qmltypes
21-
typeextra2.depends += export QML2_IMPORT_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/qml/"
22-
QMAKE_EXTRA_TARGETS += typeextra1 typeextra2
23-
}
24-
2517
CONFIG += qmlcache
2618
load(qml_plugin)
2719

2820
generate_qmltypes {
29-
qmltypes.depends = ../../../qml/$$TARGETPATH/$(TARGET) #overwrite the target deps
21+
# run again to overwrite module env
22+
ldpath.name = LD_LIBRARY_PATH
23+
ldpath.value = "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$$(LD_LIBRARY_PATH)"
24+
qmlpath.name = QML2_IMPORT_PATH
25+
qmlpath.value = "$$shadowed($$dirname(_QMAKE_CONF_))/qml/:$$[QT_INSTALL_QML]:$$(QML2_IMPORT_PATH)"
26+
PLGDUMP_ENV = ldpath qmlpath
27+
QT_TOOL_ENV = ldpath qmlpath
28+
qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
29+
QT_TOOL_ENV =
30+
31+
#overwrite the target deps as make target is otherwise not detected
32+
qmltypes.depends = ../../../qml/$$TARGETPATH/$(TARGET)
33+
OLDDMP = $$take_first(qmltypes.commands)
34+
qmltypes.commands = $$QMLPLUGINDUMP $${qmltypes.commands}
35+
message("replaced $$OLDDMP with $$QMLPLUGINDUMP")
3036

3137
mfirst.target = all
3238
mfirst.depends += qmltypes

‎src/imports/mvvmdatasyncquick/mvvmdatasyncquick.pro‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,25 @@ RESOURCES += \
2424

2525
OTHER_FILES += qmldir
2626

27-
generate_qmltypes {
28-
typeextra1.target = qmltypes
29-
typeextra1.depends += export LD_LIBRARY_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(LD_LIBRARY_PATH)"
30-
typeextra2.target = qmltypes
31-
typeextra2.depends += export QML2_IMPORT_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/qml/"
32-
QMAKE_EXTRA_TARGETS += typeextra1 typeextra2
33-
}
34-
3527
CONFIG += qmlcache
3628
load(qml_plugin)
3729

3830
generate_qmltypes {
39-
qmltypes.depends = ../../../qml/$$TARGETPATH/$(TARGET) #overwrite the target deps
40-
qmltypes.commands += "2>/dev/null" # kill invalid qml warnings
31+
# run again to overwrite module env
32+
ldpath.name = LD_LIBRARY_PATH
33+
ldpath.value = "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$$(LD_LIBRARY_PATH)"
34+
qmlpath.name = QML2_IMPORT_PATH
35+
qmlpath.value = "$$shadowed($$dirname(_QMAKE_CONF_))/qml/:$$[QT_INSTALL_QML]:$$(QML2_IMPORT_PATH)"
36+
PLGDUMP_ENV = ldpath qmlpath
37+
QT_TOOL_ENV = ldpath qmlpath
38+
qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
39+
QT_TOOL_ENV =
40+
41+
#overwrite the target deps as make target is otherwise not detected
42+
qmltypes.depends = ../../../qml/$$TARGETPATH/$(TARGET)
43+
OLDDMP = $$take_first(qmltypes.commands)
44+
qmltypes.commands = $$QMLPLUGINDUMP $${qmltypes.commands}
45+
message("replaced $$OLDDMP with $$QMLPLUGINDUMP")
4146

4247
mfirst.target = all
4348
mfirst.depends += qmltypes

‎src/imports/mvvmdatasyncquick/plugins.qmltypes‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ Module {
1010
dependencies: [
1111
"Qt.labs.calendar 1.0",
1212
"Qt.labs.platform 1.0",
13-
"QtGraphicalEffects 1.0",
13+
"QtGraphicalEffects 1.12",
1414
"QtQml 2.2",
1515
"QtQml.Models 2.3",
16-
"QtQuick 2.8",
17-
"QtQuick.Window 2.1",
16+
"QtQuick 2.12",
17+
"QtQuick.Window 2.12",
1818
"de.skycoder42.QtMvvm.Core 1.0",
1919
"de.skycoder42.QtMvvm.DataSync.Core 1.0",
2020
"de.skycoder42.QtMvvm.Quick 1.0"

‎src/imports/mvvmquick/mvvmquick.pro‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,25 @@ android {
7171
SOURCES += androidfilechooser.cpp
7272
}
7373

74-
generate_qmltypes {
75-
typeextra1.target = qmltypes
76-
typeextra1.depends += export LD_LIBRARY_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(LD_LIBRARY_PATH)"
77-
typeextra2.target = qmltypes
78-
typeextra2.depends += export QML2_IMPORT_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/qml/"
79-
QMAKE_EXTRA_TARGETS += typeextra1 typeextra2
80-
}
81-
8274
CONFIG += qmlcache
8375
load(qml_plugin)
8476

8577
generate_qmltypes {
86-
qmltypes.depends = ../../../qml/$$TARGETPATH/$(TARGET) #overwrite the target deps
87-
qmltypes.commands += "2>/dev/null" # kill invalid qml warnings
78+
# run again to overwrite module env
79+
ldpath.name = LD_LIBRARY_PATH
80+
ldpath.value = "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$$(LD_LIBRARY_PATH)"
81+
qmlpath.name = QML2_IMPORT_PATH
82+
qmlpath.value = "$$shadowed($$dirname(_QMAKE_CONF_))/qml/:$$[QT_INSTALL_QML]:$$(QML2_IMPORT_PATH)"
83+
PLGDUMP_ENV = ldpath qmlpath
84+
QT_TOOL_ENV = ldpath qmlpath
85+
qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
86+
QT_TOOL_ENV =
87+
88+
#overwrite the target deps as make target is otherwise not detected
89+
qmltypes.depends = ../../../qml/$$TARGETPATH/$(TARGET)
90+
OLDDMP = $$take_first(qmltypes.commands)
91+
qmltypes.commands = $$QMLPLUGINDUMP $${qmltypes.commands}
92+
message("replaced $$OLDDMP with $$QMLPLUGINDUMP")
8893

8994
mfirst.target = all
9095
mfirst.depends += qmltypes

‎src/imports/mvvmquick/plugins.qmltypes‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Module {
1010
dependencies: [
1111
"Qt.labs.calendar 1.0",
1212
"Qt.labs.platform 1.0",
13-
"QtGraphicalEffects 1.0",
13+
"QtGraphicalEffects 1.12",
1414
"QtQml 2.2",
15-
"QtQuick 2.8",
16-
"QtQuick.Window 2.1",
15+
"QtQuick 2.12",
16+
"QtQuick.Window 2.12",
1717
"de.skycoder42.QtMvvm.Core 1.0"
1818
]
1919
Component {

‎src/mvvmcore/serviceregistry.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ QObject *ServiceRegistryPrivate::constructInjectedLocked(const QMetaObject *meta
134134

135135
void ServiceRegistryPrivate::injectLocked(QObject *object)
136136
{
137-
static QRegularExpression nameRegex(QStringLiteral(R"__(^__qtmvvm_inject_(.+)$)__"),
138-
QRegularExpression::OptimizeOnFirstUsageOption);
137+
static QRegularExpression nameRegex(QStringLiteral(R"__(^__qtmvvm_inject_(.+)$)__"));
139138

140139
auto metaObject = object->metaObject();
141140
for(auto i = 0; i < metaObject->propertyCount(); i++) {

0 commit comments

Comments
 (0)