summaryrefslogtreecommitdiffstats
path: root/tests/auto/auto.pri
diff options
context:
space:
mode:
authorTitta Heikkala <titta.heikkala@digia.com>2014-07-01 07:10:00 +0300
committerTitta Heikkala <titta.heikkala@theqtcompany.com>2014-10-14 13:04:52 +0300
commitc544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch)
tree7659625abb566dec55d3783ed820b928542d9b2b /tests/auto/auto.pri
parent76339f714f088645e911cee65bdb66055fe029aa (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 'tests/auto/auto.pri')
-rw-r--r--tests/auto/auto.pri22
1 files changed, 5 insertions, 17 deletions
diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri
index c528b34a..a0915009 100644
--- a/tests/auto/auto.pri
+++ b/tests/auto/auto.pri
@@ -2,26 +2,14 @@
error( "Couldn't find the tests.pri file!" )
}
-greaterThan(QT_MAJOR_VERSION, 4) {
QT += testlib widgets
-} else {
- CONFIG += qtestlib
-}
-!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
-android {
- # Workaround to fix android deployment, which seems to always look for target in
- # OUT_PWD instead of DESTDIR. Need to override the QMAKE_POST_LINK setting done
- # in tests.pri, as "tst_" was prepended to the target.
- 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, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
INCLUDEPATH += ../inc
HEADERS += ../inc/tst_definitions.h
-OBJECTS_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
-MOC_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
-UI_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
-RCC_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
+#Define for unit tests
+CONFIG(debug, debug|release) {
+ DEFINES += BUILD_PRIVATE_UNIT_TESTS
+}