hatam
/
QtMvvm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

try to fix QTBUG-70688 regression

master 1.1.4-2
Skycoder42 6 years ago
parent
b79c4429b0
commit
b1514e2b74
No known key found for this signature in database GPG Key ID: 8E01AD9EF0578D2B
4 changed files with 21 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      examples/mvvmcore/SampleCore/samplecore_de.ts
  2. 8
      tests/auto/mvvmcore/settingsgenerator/test_de.ts
  3. BIN
      tests/auto/qml/qmlsettingsgenerator/tst_qmlsettingsgenerator.qmlc
  4. 47
      tests/auto/testrun.pri

2
examples/mvvmcore/SampleCore/samplecore_de.ts
View File

@ -106,7 +106,7 @@
<context>
<name>settings.xml</name>
<message>
<location filename="../../../../build-qtmvvm-Desktop_Qt_5_11_1_GCC_64bit-Debug/examples/mvvmcore/SampleCore/.tr-dummies/settings.tsdummy.cpp" line="+7"/>
<location filename="../../../../build-qtmvvm-Desktop_Qt_5_11_2_GCC_64bit-Debug/examples/mvvmcore/SampleCore/.tr-dummies/settings.tsdummy.cpp" line="+7"/>
<source>&amp;Check me</source>
<translation type="unfinished"></translation>
</message>

8
tests/auto/mvvmcore/settingsgenerator/test_de.ts
View File

@ -12,7 +12,7 @@
<context>
<name>generatortest.xml</name>
<message>
<location filename="../../../../../build-qtmvvm-Desktop_Qt_5_11_1_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/generatortest.cpp" line="+34"/>
<location filename="../../../../../build-qtmvvm-Desktop_Qt_5_11_2_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/generatortest.cpp" line="+34"/>
<source>translate me</source>
<translation type="unfinished"></translation>
</message>
@ -20,7 +20,7 @@
<context>
<name>import_config.xml</name>
<message>
<location filename="../../../../../build-qtmvvm-Desktop_Qt_5_11_1_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/importtest.cpp" line="+29"/>
<location filename="../../../../../build-qtmvvm-Desktop_Qt_5_11_2_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/importtest.cpp" line="+29"/>
<source>42</source>
<translation type="unfinished"></translation>
</message>
@ -36,7 +36,7 @@
<context>
<name>some_context</name>
<message>
<location filename="../../../../../build-qtmvvm-Desktop_Qt_5_11_1_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/generatortest.cpp" line="-5"/>
<location filename="../../../../../build-qtmvvm-Desktop_Qt_5_11_2_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/generatortest.cpp" line="-5"/>
<source>Hello World</source>
<translation type="unfinished"></translation>
</message>
@ -44,7 +44,7 @@
<context>
<name>translatortest.xml</name>
<message>
<location filename="../../../../../build-qtmvvm-Desktop_Qt_5_11_1_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/.tr-dummies/translatortest.tsdummy.cpp" line="+7"/>
<location filename="../../../../../build-qtmvvm-Desktop_Qt_5_11_2_GCC_64bit-Debug/tests/auto/mvvmcore/settingsgenerator/.tr-dummies/translatortest.tsdummy.cpp" line="+7"/>
<source>dummy</source>
<translation type="unfinished"></translation>
</message>

BIN
tests/auto/qml/qmlsettingsgenerator/tst_qmlsettingsgenerator.qmlc
View File

Binary file not shown.

47
tests/auto/testrun.pri
View File

@ -4,9 +4,10 @@ win32:!ReleaseBuild:!DebugBuild {
runtarget.recurse_target = run-tests
QMAKE_EXTRA_TARGETS += runtarget
} else {
win32:!win32-g++ {
oneshell.target = .ONESHELL
oneshell.target = .ONESHELL
QMAKE_EXTRA_TARGETS += oneshell
win32:!win32-g++ {
CONFIG(debug, debug|release): outdir_helper = debug
CONFIG(release, debug|release): outdir_helper = release
runtarget.target = run-tests
@ -18,45 +19,29 @@ win32:!ReleaseBuild:!DebugBuild {
runtarget.commands += $$escape_expand(\\n\\t)start /w call $(DESTDIR_TARGET) ^> $${outdir_helper}\\test.log ^|^| echo FAIL ^> $${outdir_helper}\\fail ^& exit 0
runtarget.commands += $$escape_expand(\\n\\t)type $${outdir_helper}\\test.log
runtarget.commands += $$escape_expand(\\n\\t)@if exist $${outdir_helper}\\fail exit 42
QMAKE_EXTRA_TARGETS += oneshell runtarget
QMAKE_EXTRA_TARGETS += runtarget
} else {
win32-g++: QMAKE_DIRLIST_SEP = ";"
runtarget.commands += export PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/bin/:$$[QT_INSTALL_BINS]:$(PATH)\"
runtarget.commands += $$escape_expand(\\n\\t)export QT_PLUGIN_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/plugins/$${QMAKE_DIRLIST_SEP}$(QT_PLUGIN_PATH)\"
runtarget.commands += $$escape_expand(\\n\\t)export QML2_IMPORT_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/qml/$${QMAKE_DIRLIST_SEP}$(QML2_IMPORT_PATH)\"
win32-g++: QMAKE_DIRLIST_SEP = ":"
linux|win32-g++ {
runtarget_env_lib.target = run-tests
runtarget_env_lib.depends = export LD_LIBRARY_PATH := $$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(LD_LIBRARY_PATH)
runtarget_env_qpa.target = run-tests
runtarget_env_qpa.depends += export QT_QPA_PLATFORM := minimal
QMAKE_EXTRA_TARGETS += runtarget_env_lib
!win32-g++: QMAKE_EXTRA_TARGETS += runtarget_env_qpa
runtarget.commands += $$escape_expand(\\n\\t)export LD_LIBRARY_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(LD_LIBRARY_PATH)\"
runtarget.commands += $$escape_expand(\\n\\t)export QT_QPA_PLATFORM=minimal
} else:mac {
runtarget_env_lib.target = run-tests
runtarget_env_lib.depends = export DYLD_LIBRARY_PATH := $$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_LIBRARY_PATH)
runtarget_env_framework.target = run-tests
runtarget_env_framework.depends = export DYLD_FRAMEWORK_PATH := $$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_FRAMEWORK_PATH)
QMAKE_EXTRA_TARGETS += \
runtarget_env_lib \
runtarget_env_framework
runtarget.commands += $$escape_expand(\\n\\t)export DYLD_LIBRARY_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_LIBRARY_PATH)\"
runtarget.commands += $$escape_expand(\\n\\t)export DYLD_FRAMEWORK_PATH=\"$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_FRAMEWORK_PATH)\"
}
win32-g++: QMAKE_DIRLIST_SEP = ";"
runtarget_env_bin.target = run-tests
runtarget_env_bin.depends = export PATH := $$shadowed($$dirname(_QMAKE_CONF_))/bin/:$$[QT_INSTALL_BINS]:$(PATH)
runtarget_env_plugins.target = run-tests
runtarget_env_plugins.depends = export QT_PLUGIN_PATH := $$shadowed($$dirname(_QMAKE_CONF_))/plugins/$${QMAKE_DIRLIST_SEP}$(QT_PLUGIN_PATH)
runtarget_env_qml.target = run-tests
runtarget_env_qml.depends += export QML2_IMPORT_PATH := $$shadowed($$dirname(_QMAKE_CONF_))/qml/$${QMAKE_DIRLIST_SEP}$(QML2_IMPORT_PATH)
QMAKE_EXTRA_TARGETS += \
runtarget_env_bin \
runtarget_env_plugins \
runtarget_env_qml
win32-g++: QMAKE_DIRLIST_SEP = ":"
runtarget.target = run-tests
win32-g++ {
runtarget.depends += $(DESTDIR_TARGET)
runtarget.commands = ./$(DESTDIR_TARGET)
runtarget.commands += $$escape_expand(\\n\\t)./$(DESTDIR_TARGET)
} else {
runtarget.depends += $(TARGET)
runtarget.commands = ./$(TARGET)
runtarget.commands += $$escape_expand(\\n\\t)./$(TARGET)
}
QMAKE_EXTRA_TARGETS += runtarget
}

Write Preview
Loading…
Cancel
Save