diff options
author | Titta Heikkala <titta.heikkala@digia.com> | 2014-07-01 07:10:00 +0300 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-14 13:04:52 +0300 |
commit | c544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch) | |
tree | 7659625abb566dec55d3783ed820b928542d9b2b /demos/demos.pri | |
parent | 76339f714f088645e911cee65bdb66055fe029aa (diff) |
Qt Charts project file structure change
Charts repository structure is changed to follow the structure of a
Qt Add-On module. The task includes following changes:
- All macros and definitions named 'commercial' have been renamed.
- Compile errors related to QString and qSort usage have been fixed.
- Old demos are moved under examples. The QML examples now support only
Qt Quick 2.0, the support for Qt Quick 1 is removed.
- The QML examples with multiple views are updated so that they are
usable also with touch devices.
- Unnecessary version checks are removed from examples.
- The build stamp has been removed as it was only meant for Charts
development purposes and it's no longer needed. Also development
build related debug prints are removed as __DATE__ can't be used
for all OS thus it doesn't make much sense.
- Documentation structure has been updated based on the new module
structure. The raw HTML files have been removed. Demos are
combined to examples.
- Unnecessary .qdocinc files are no longer needed. The content is
moved to the corresponding .cpp files.
- The Charts widget designer plugin is updated according to the module
change.
- The test cases updated according to the project structure change.
Tests are added also for version 2.0.
- cmake modules generation is not needed with Qt 5.4 and Qt Charts
so it's disabled.
- The new module name and version are updated to the plugin.qmltypes
file.
Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228,
QTRD-2526, QTRD-3233, QTRD-3222
Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'demos/demos.pri')
-rw-r--r-- | demos/demos.pri | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/demos/demos.pri b/demos/demos.pri deleted file mode 100644 index e96d687c..00000000 --- a/demos/demos.pri +++ /dev/null @@ -1,39 +0,0 @@ -!include( ../config.pri ) { - error( "Couldn't find the config.pri file!" ) -} - -DESTDIR = $$CHART_BUILD_BIN_DIR -!ios { -OBJECTS_DIR = $$CHART_BUILD_DIR/demos/$$TARGET -MOC_DIR = $$CHART_BUILD_DIR/demos/$$TARGET -UI_DIR = $$CHART_BUILD_DIR/demos/$$TARGET -RCC_DIR = $$CHART_BUILD_DIR/demos/$$TARGET -} -TEMPLATE = app -QT += core gui -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -# staticlib config causes problems when building executables -staticlib: CONFIG-=staticlib - -android { - # Workaround to fix android deployment, which seems to always look for target in - # OUT_PWD instead of DESTDIR. - COPY_PARAMETERS = "$$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so" - contains(QMAKE_HOST.os, Windows): COPY_PARAMETERS = $$replace(COPY_PARAMETERS, "/","\\") - QMAKE_POST_LINK += $$QMAKE_COPY $$COPY_PARAMETERS - - contains(TARGET, qml.*) { - charts_qmldir.files = $$CHART_BUILD_QML_PLUGIN_DIR/qmldir - charts_qmldir.path = /assets/imports/QtCommercial/Chart - charts_qmlplugin.files = $$CHART_BUILD_QML_PLUGIN_DIR/libqtcommercialchartqml.so - charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH - INSTALLS += charts_qmldir charts_qmlplugin - } else:contains(TARGET, quick2.*) { - charts_qmldir.files = $$CHART_BUILD_QML2_PLUGIN_DIR/qmldir - charts_qmldir.path = /assets/qml/QtCommercial/Chart - charts_qmlplugin.files = $$CHART_BUILD_QML2_PLUGIN_DIR/libqtcommercialchartqml2.so - charts_qmlplugin.path = /libs/$$ANDROID_TARGET_ARCH - INSTALLS += charts_qmldir charts_qmlplugin - } -} |