qiurui
/
qtdatavis3d
mirror of https://github.com/qt/qtdatavis3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.6' into 5.7 

Conflicts:
	src/datavisualization/datavisualization.pro

Change-Id: Ie79d1c1e959bac9a674a9031c36e7914252805b9
This commit is contained in:
Liang Qi 2016-08-01 09:16:51 +02:00
parent 1533ffc6d8 4d4a9609fa
commit 2523056490
4 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.qmake.conf
View File

@ -1,5 +1,4 @@
load(qt_build_config) load(qt_build_config)
CONFIG += qt_example_installs
MODULE_VERSION = 5.7.1 MODULE_VERSION = 5.7.1

8
src/datavisualization/datavisualization.pro
View File

@ -2,17 +2,11 @@ TARGET = QtDataVisualization
QT += core gui QT += core gui
osx: QT += gui-private 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 MODULE_INCNAME = QtDataVisualization
QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf
load(qt_module)
QMAKE_TARGET_PRODUCT = "Qt Data Visualization (Qt $$QT_VERSION)" QMAKE_TARGET_PRODUCT = "Qt Data Visualization (Qt $$QT_VERSION)"
QMAKE_TARGET_DESCRIPTION = "3D Data Visualization component for Qt." QMAKE_TARGET_DESCRIPTION = "3D Data Visualization component for Qt."
@ -29,3 +23,5 @@ OTHER_FILES += doc/qtdatavis3d.qdocconf \
doc/images/* \ doc/images/* \
doc/snippets/* \ doc/snippets/* \
global/*.qdoc global/*.qdoc
load(qt_module)

23
src/datavisualization/global/qdatavisualizationglobal.h
View File

@ -42,25 +42,14 @@
*/ */
#define QT_DATAVISUALIZATION_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) #define QT_DATAVISUALIZATION_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
#if defined(QT_DATAVISUALIZATION_LIBRARY) #ifndef QT_STATIC
# define QT_DATAVISUALIZATION_EXPORT Q_DECL_EXPORT # if defined(QT_BUILD_DATAVISUALIZATION_LIB)
# define QT_DATAVISUALIZATION_EXPORT Q_DECL_EXPORT
# else
# define QT_DATAVISUALIZATION_EXPORT Q_DECL_IMPORT
# endif
#else #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_EXPORT
# define QT_DATAVISUALIZATION_AUTOTEST_EXPORT
#endif #endif
#define QT_BEGIN_NAMESPACE_DATAVISUALIZATION namespace QtDataVisualization { #define QT_BEGIN_NAMESPACE_DATAVISUALIZATION namespace QtDataVisualization {

14
src/datavisualizationqml2/datavisualizationqml2.pro
View File

@ -1,11 +1,8 @@
TARGET = datavisualizationqml2 TARGET = datavisualizationqml2
CXX_MODULE = datavisualization
QT += qml quick datavisualization QT += qml quick datavisualization
osx: QT += gui-private osx: QT += gui-private
TARGETPATH = QtDataVisualization 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) include($$PWD/designer/designer.pri)
@ -48,18 +45,9 @@ HEADERS += \
glstatestore_p.h \ glstatestore_p.h \
enumtostringmap_p.h enumtostringmap_p.h
OTHER_FILES = qmldir
CONFIG += no_cxx_module
load(qml_plugin) load(qml_plugin)
win32 { win32 {
CONFIG += skip_target_version_ext
VERSION = $$MODULE_VERSION
QMAKE_TARGET_PRODUCT = "Qt Data Visualization (Qt $$QT_VERSION)" QMAKE_TARGET_PRODUCT = "Qt Data Visualization (Qt $$QT_VERSION)"
QMAKE_TARGET_DESCRIPTION = "3D Data Visualization QML plugin for Qt." QMAKE_TARGET_DESCRIPTION = "3D Data Visualization QML plugin for Qt."
} }
QML_FILES += \
$$PWD/plugins.qmltypes