From aec04a870d83ff9e2a5a8d00d0298803001b5d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 19 May 2016 10:00:15 +0300 Subject: Place load(qt_module) at the end of the project file Change-Id: I612e0334d72c0405b7c180c1e90381eb5641dcaa Reviewed-by: Miikka Heikkinen Reviewed-by: Oswald Buddenhagen --- src/datavisualization/datavisualization.pro | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/datavisualization/datavisualization.pro b/src/datavisualization/datavisualization.pro index 75608955..a32f1591 100644 --- a/src/datavisualization/datavisualization.pro +++ b/src/datavisualization/datavisualization.pro @@ -17,8 +17,6 @@ MODULE_INCNAME = QtDataVisualization QMAKE_DOCS = $$PWD/doc/qtdatavisualization.qdocconf -load(qt_module) - QMAKE_TARGET_PRODUCT = "Qt Data Visualization (Qt $$QT_VERSION)" QMAKE_TARGET_DESCRIPTION = "3D Data Visualization component for Qt." @@ -36,3 +34,4 @@ OTHER_FILES += doc/qtdatavisualization.qdocconf \ doc/snippets/* \ global/*.qdoc +load(qt_module) -- cgit v1.2.3 From 1217b9d8bd66ff504e8c213e35209dcb6c979d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 19 May 2016 12:03:14 +0300 Subject: Remove redundant handling of static builds Change-Id: I7f504bcd21045d6eaf2534d3ab2416b402e88b87 Reviewed-by: Miikka Heikkinen Reviewed-by: Oswald Buddenhagen --- src/datavisualizationqml2/datavisualizationqml2.pro | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro index 3f855a27..a635011c 100644 --- a/src/datavisualizationqml2/datavisualizationqml2.pro +++ b/src/datavisualizationqml2/datavisualizationqml2.pro @@ -4,9 +4,6 @@ osx: QT += gui-private TARGETPATH = QtDataVisualization IMPORT_VERSION = $$MODULE_VERSION -# Only build qml plugin static if Qt itself is also built static -!contains(QT_CONFIG, static): CONFIG -= static staticlib - include($$PWD/designer/designer.pri) INCLUDEPATH += ../../include \ -- cgit v1.2.3 From f7faf946d5f05052712dfcf554d2d839432ed561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Fri, 20 May 2016 06:27:39 +0300 Subject: Use standardized module export macros Change-Id: Id6122641b63d8e1435314c1ae8492a7ee96b25a8 Reviewed-by: Miikka Heikkinen Reviewed-by: Oswald Buddenhagen --- src/datavisualization/datavisualization.pro | 4 ---- .../global/qdatavisualizationglobal.h | 21 +++++++++------------ 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/datavisualization/datavisualization.pro b/src/datavisualization/datavisualization.pro index a32f1591..21bd83ab 100644 --- a/src/datavisualization/datavisualization.pro +++ b/src/datavisualization/datavisualization.pro @@ -8,10 +8,6 @@ mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) { QT += core gui osx: QT += gui-private -DEFINES += QT_DATAVISUALIZATION_LIBRARY - -# Fix exports in static builds for applications linking datavisualization module -static: MODULE_DEFINES += QT_DATAVISUALIZATION_STATICLIB MODULE_INCNAME = QtDataVisualization diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index 3eec54b4..cda15d0c 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -34,27 +34,24 @@ */ #define QT_DATAVISUALIZATION_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) -#if defined(QT_DATAVISUALIZATION_LIBRARY) -# define QT_DATAVISUALIZATION_EXPORT Q_DECL_EXPORT +#ifndef QT_STATIC +# if defined(QT_BUILD_DATAVISUALIZATION_LIB) +# define QT_DATAVISUALIZATION_EXPORT Q_DECL_EXPORT +# else +# define QT_DATAVISUALIZATION_EXPORT Q_DECL_IMPORT +# endif #else -# define QT_DATAVISUALIZATION_EXPORT Q_DECL_IMPORT +# define QT_DATAVISUALIZATION_EXPORT #endif -#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_DATAVISUALIZATION_LIBRARY) +#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_BUILD_DATAVISUALIZATION_LIB) # define QT_DATAVISUALIZATION_AUTOTEST_EXPORT Q_DECL_EXPORT -#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_DATAVISUALIZATION_LIBRARY) +#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_BUILD_DATAVISUALIZATION_LIB) # define QT_DATAVISUALIZATION_AUTOTEST_EXPORT Q_DECL_IMPORT #else # define QT_DATAVISUALIZATION_AUTOTEST_EXPORT #endif -#ifdef QT_DATAVISUALIZATION_STATICLIB -# undef QT_DATAVISUALIZATION_EXPORT -# undef QT_DATAVISUALIZATION_AUTOTEST_EXPORT -# define QT_DATAVISUALIZATION_EXPORT -# define QT_DATAVISUALIZATION_AUTOTEST_EXPORT -#endif - #define QT_BEGIN_NAMESPACE_DATAVISUALIZATION namespace QtDataVisualization { #define QT_END_NAMESPACE_DATAVISUALIZATION } -- cgit v1.2.3 From d8ad287b81523871af4b737ae91cda7334bd6f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Mon, 23 May 2016 11:36:47 +0300 Subject: Remove unused non-standard test export macros MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifcfb6eaddfd5e54820bb3f5af235833b7f906b3c Reviewed-by: Tomi Korpipää --- src/datavisualization/global/qdatavisualizationglobal.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index cda15d0c..d2ce2e0a 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -44,14 +44,6 @@ # define QT_DATAVISUALIZATION_EXPORT #endif -#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_BUILD_DATAVISUALIZATION_LIB) -# define QT_DATAVISUALIZATION_AUTOTEST_EXPORT Q_DECL_EXPORT -#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_BUILD_DATAVISUALIZATION_LIB) -# define QT_DATAVISUALIZATION_AUTOTEST_EXPORT Q_DECL_IMPORT -#else -# define QT_DATAVISUALIZATION_AUTOTEST_EXPORT -#endif - #define QT_BEGIN_NAMESPACE_DATAVISUALIZATION namespace QtDataVisualization { #define QT_END_NAMESPACE_DATAVISUALIZATION } -- cgit v1.2.3 From 81d6939b8b4757ec0875a523fa293235c9f52e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 19 May 2016 10:28:45 +0300 Subject: Don't duplicate functionality from various .prf files Change-Id: Ibaf10cb5806dae0287888a20d26e34d4dfefff75 Reviewed-by: Miikka Heikkinen Reviewed-by: Oswald Buddenhagen --- src/datavisualizationqml2/datavisualizationqml2.pro | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro index a635011c..a17b7e3a 100644 --- a/src/datavisualizationqml2/datavisualizationqml2.pro +++ b/src/datavisualizationqml2/datavisualizationqml2.pro @@ -45,18 +45,11 @@ HEADERS += \ glstatestore_p.h \ enumtostringmap_p.h -OTHER_FILES = qmldir - CONFIG += no_cxx_module load(qml_plugin) win32 { - CONFIG += skip_target_version_ext - VERSION = $$MODULE_VERSION QMAKE_TARGET_PRODUCT = "Qt Data Visualization (Qt $$QT_VERSION)" QMAKE_TARGET_DESCRIPTION = "3D Data Visualization QML plugin for Qt." } - -QML_FILES += \ - $$PWD/plugins.qmltypes -- cgit v1.2.3 From f39c154be488df454bb245aa04e7969e5762112f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Tue, 24 May 2016 11:22:31 +0300 Subject: Set up relation with c++ module correctly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TARGETPATH to be removed in 5.7 Change-Id: I5f2b7c6c82e10bed6b7a2358d8269bc0aef26542 Reviewed-by: Tomi Korpipää --- src/datavisualizationqml2/datavisualizationqml2.pro | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro index a17b7e3a..301ac439 100644 --- a/src/datavisualizationqml2/datavisualizationqml2.pro +++ b/src/datavisualizationqml2/datavisualizationqml2.pro @@ -1,8 +1,8 @@ TARGET = datavisualizationqml2 +CXX_MODULE = datavisualization QT += qml quick datavisualization osx: QT += gui-private TARGETPATH = QtDataVisualization -IMPORT_VERSION = $$MODULE_VERSION include($$PWD/designer/designer.pri) @@ -45,8 +45,6 @@ HEADERS += \ glstatestore_p.h \ enumtostringmap_p.h -CONFIG += no_cxx_module - load(qml_plugin) win32 { -- cgit v1.2.3 From 4d4a9609fab58da304e4c13b9a37531116a4fadb Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 21:23:01 +0200 Subject: do not enable example installs explicitly any more it's done centrally now. Change-Id: I70d8aeb77388aa3895007b7aa03f84dad085bc2a Reviewed-by: Joerg Bornemann --- .qmake.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 41298804..6c1f7368 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,4 @@ load(qt_build_config) -CONFIG += qt_example_installs MODULE_VERSION=1.2.2 -- cgit v1.2.3 From 57832c490a6f34f6ede7caa864dde20abda94358 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 1 Jun 2016 15:17:33 +0200 Subject: Doc: Fix examples install path for Qt Creator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this fix, Qt Creator does not find the example files for opening them and tags the examples as "broken". Task-number: QTBUG-53752 Change-Id: I8bc88c79626d1a0f2f6319b3283c9541d6ddd965 Reviewed-by: Topi Reiniö --- src/datavisualization/doc/qtdatavis3d.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datavisualization/doc/qtdatavis3d.qdocconf b/src/datavisualization/doc/qtdatavis3d.qdocconf index f95ecacf..62421ac9 100644 --- a/src/datavisualization/doc/qtdatavis3d.qdocconf +++ b/src/datavisualization/doc/qtdatavis3d.qdocconf @@ -12,7 +12,7 @@ imagedirs += ../images \ images sourcedirs += .. -examplesinstallpath = qtdatavisualization/datavisualization +examplesinstallpath = datavisualization depends = qtcore qtgui qtqml qtquick qtmultimedia qtdoc -- cgit v1.2.3 From 643a6ad1872e87a3a54e12cca8b365475f0d1eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 9 Jun 2016 09:23:24 +0300 Subject: Change file updated Change-Id: I49e6779be815a30e39b72b8701caa679ed1aee2a Reviewed-by: Jani Heikkinen --- dist/changes-5.7.0 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 dist/changes-5.7.0 diff --git a/dist/changes-5.7.0 b/dist/changes-5.7.0 new file mode 100644 index 00000000..f896079a --- /dev/null +++ b/dist/changes-5.7.0 @@ -0,0 +1,3 @@ +Qt Data Visualization 5.7.0 + +No relevant changes -- cgit v1.2.3 From 1533ffc6d8afe46df72a05ecd571fd7dcb1bd397 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 28 Jul 2016 13:51:54 +0200 Subject: Bump version Change-Id: I4193c5b7e08a40a9dc76bc0deaa77593984fe178 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 16c6edc3..89028e77 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,6 +1,6 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION=5.7.0 +MODULE_VERSION = 5.7.1 CMAKE_MODULE_TESTS=- -- cgit v1.2.3