diff options
| -rw-r--r-- | examples/examples.pri | 18 | ||||
| -rw-r--r-- | src/datavisualization/datavisualization.pro | 9 |
2 files changed, 13 insertions, 14 deletions
diff --git a/examples/examples.pri b/examples/examples.pri index 82692204..dc4add12 100644 --- a/examples/examples.pri +++ b/examples/examples.pri @@ -27,11 +27,12 @@ contains(TARGET, qml.*) { make_qmldir_target = \"$$replace(make_qmldir_path, /, $$QMAKE_DIR_SEP)\" system($$QMAKE_MKDIR $$make_qmldir_target) } - copy_qmldir_examples.target = $$make_qmldir_path/qmldir - copy_qmldir_examples.depends = $$_PRO_FILE_PWD_/../../src/$$lib_name/qmldir - copy_qmldir_examples.commands = $(COPY_FILE) \"$$replace(copy_qmldir_examples.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir_examples.target, /, $$QMAKE_DIR_SEP)\" - QMAKE_EXTRA_TARGETS += copy_qmldir_examples - PRE_TARGETDEPS += $$copy_qmldir_examples.target + copy_qmldir.target = $$make_qmldir_path/qmldir + copy_qmldir.depends = $$_PRO_FILE_PWD_/../../src/$$lib_name/qmldir + copy_qmldir_formatted = \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\" + copy_qmldir.commands = $(COPY_FILE) $$copy_qmldir_formatted + QMAKE_EXTRA_TARGETS += copy_qmldir + PRE_TARGETDEPS += $$copy_qmldir.target win32 { CONFIG(debug, release|debug) { @@ -58,12 +59,15 @@ contains(TARGET, qml.*) { } copy_lib.target = $$make_qmldir_path/$$src_lib copy_lib.depends = $$OUT_PWD/../../src/$$lib_name/$$src_dir/$$src_lib - copy_lib.commands = $(COPY_FILE) \"$$replace(copy_lib.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_lib.target, /, $$QMAKE_DIR_SEP)\" + copy_lib_formatted = \"$$replace(copy_lib.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_lib.target, /, $$QMAKE_DIR_SEP)\" + copy_lib.commands = $(COPY_FILE) $$copy_lib_formatted QMAKE_EXTRA_TARGETS += copy_lib PRE_TARGETDEPS += $$copy_lib.target android { - android_qmldir.files = $$copy_qmldir_examples.target + system($$QMAKE_COPY $$copy_qmldir_formatted) + system($$QMAKE_COPY $$copy_lib_formatted) + android_qmldir.files = $$copy_qmldir.target android_qmldir.path = /assets/qml/$$uri_replaced android_qmlplugin.files = $$copy_lib.target android_qmlplugin.path = $$target.path diff --git a/src/datavisualization/datavisualization.pro b/src/datavisualization/datavisualization.pro index 58ec4b19..87857062 100644 --- a/src/datavisualization/datavisualization.pro +++ b/src/datavisualization/datavisualization.pro @@ -15,13 +15,8 @@ include($$PWD/axis/axis.pri) include($$PWD/data/data.pri) include($$PWD/input/input.pri) -wince* { - # The Microsoft MIPS compiler crashes if /Og is specified. - # -O2/1 expands to /Og plus additional arguments. - contains(DEFINES, MIPS) { - QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-Oi -Ot -Oy -Ob2/ - QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/ - } +android { + CONFIG += static } OTHER_FILES += doc/qtdatavisualization.qdocconf \ |