summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-01 09:16:51 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-01 09:16:51 +0200
commit2523056490c3f7a35d176deb583ba46899fe260b (patch)
tree0a38f955248b467227e4fca5aa6e161472cec2b2
parent1533ffc6d8afe46df72a05ecd571fd7dcb1bd397 (diff)
parent4d4a9609fab58da304e4c13b9a37531116a4fadb (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1
Conflicts: src/datavisualization/datavisualization.pro Change-Id: Ie79d1c1e959bac9a674a9031c36e7914252805b9
-rw-r--r--.qmake.conf1
-rw-r--r--src/datavisualization/datavisualization.pro8
-rw-r--r--src/datavisualization/global/qdatavisualizationglobal.h23
-rw-r--r--src/datavisualizationqml2/datavisualizationqml2.pro14
4 files changed, 9 insertions, 37 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 89028e77..45d6a30c 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,5 +1,4 @@
load(qt_build_config)
-CONFIG += qt_example_installs
MODULE_VERSION = 5.7.1
diff --git a/src/datavisualization/datavisualization.pro b/src/datavisualization/datavisualization.pro
index 9ee9ae72..e85a1e47 100644
--- a/src/datavisualization/datavisualization.pro
+++ b/src/datavisualization/datavisualization.pro
@@ -2,17 +2,11 @@ TARGET = QtDataVisualization
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
QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf
-load(qt_module)
-
QMAKE_TARGET_PRODUCT = "Qt Data Visualization (Qt $$QT_VERSION)"
QMAKE_TARGET_DESCRIPTION = "3D Data Visualization component for Qt."
@@ -29,3 +23,5 @@ OTHER_FILES += doc/qtdatavis3d.qdocconf \
doc/images/* \
doc/snippets/* \
global/*.qdoc
+
+load(qt_module)
diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h
index da80d908..a1c31a93 100644
--- a/src/datavisualization/global/qdatavisualizationglobal.h
+++ b/src/datavisualization/global/qdatavisualizationglobal.h
@@ -42,25 +42,14 @@
*/
#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
-#endif
-
-#if defined(BUILD_PRIVATE_UNIT_TESTS) && defined(QT_DATAVISUALIZATION_LIBRARY)
-# define QT_DATAVISUALIZATION_AUTOTEST_EXPORT Q_DECL_EXPORT
-#elif defined(BUILD_PRIVATE_UNIT_TESTS) && !defined(QT_DATAVISUALIZATION_LIBRARY)
-# 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 {
diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro
index 3f855a27..301ac439 100644
--- a/src/datavisualizationqml2/datavisualizationqml2.pro
+++ b/src/datavisualizationqml2/datavisualizationqml2.pro
@@ -1,11 +1,8 @@
TARGET = datavisualizationqml2
+CXX_MODULE = datavisualization
QT += qml quick datavisualization
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)
@@ -48,18 +45,9 @@ 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