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(-) (limited to 'src/datavisualization/datavisualization.pro') 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 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 ---- 1 file changed, 4 deletions(-) (limited to 'src/datavisualization/datavisualization.pro') 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 -- cgit v1.2.3