rely on the automatically defined QT_BUILD_*_LIB

Change-Id: Ib4667e1d11309e76f60150eb4e474dbc1b4191ce
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

14 files changed, 9 insertions, 21 deletions

diff --git a/src/core/core.pro b/src/core/core.pro
index a02f3df47..a32a6eaf3 100644
--- a/src/core/core.pro
+++ b/src/core/core.pro
@@ -1,8 +1,7 @@
 TARGET     = Qt3DCore
 MODULE     = 3dcore
-QT         = core-private gui-private
 
-DEFINES += QT3DCORE_LIBRARY
+QT         = core-private gui-private
 
 gcov {
     CONFIG += static
diff --git a/src/core/qt3dcore_global.h b/src/core/qt3dcore_global.h
index 68382ecf0..53297712d 100644
--- a/src/core/qt3dcore_global.h
+++ b/src/core/qt3dcore_global.h
@@ -42,7 +42,7 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(QT_SHARED) || !defined(QT_STATIC)
-#  if defined(QT3DCORE_LIBRARY)
+#  if defined(QT_BUILD_3DCORE_LIB)
 #    define QT3DCORESHARED_EXPORT Q_DECL_EXPORT
 #  else
 #    define QT3DCORESHARED_EXPORT Q_DECL_IMPORT
diff --git a/src/input/input.pro b/src/input/input.pro
index dbb77d87b..665860eaf 100644
--- a/src/input/input.pro
+++ b/src/input/input.pro
@@ -2,8 +2,6 @@ TARGET = Qt3DInput
 
 QT += core core-private 3dcore 3dcore-private 3drender
 
-DEFINES += QT3DINPUT_LIBRARY
-
 MODULE = 3dinput
 
 include(frontend/frontend.pri)
diff --git a/src/input/qt3dinput_global.h b/src/input/qt3dinput_global.h
index 87f54535e..33dd3dd54 100644
--- a/src/input/qt3dinput_global.h
+++ b/src/input/qt3dinput_global.h
@@ -42,7 +42,7 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(QT_SHARED) || !defined(QT_STATIC)
-#  if defined(QT3DINPUT_LIBRARY)
+#  if defined(QT_BUILD_3DINPUT_LIB)
 #    define QT3DINPUTSHARED_EXPORT Q_DECL_EXPORT
 #  else
 #    define QT3DINPUTSHARED_EXPORT Q_DECL_IMPORT
diff --git a/src/logic/logic.pro b/src/logic/logic.pro
index dd0d8bb36..4facdda3d 100644
--- a/src/logic/logic.pro
+++ b/src/logic/logic.pro
@@ -1,8 +1,7 @@
 TARGET     = Qt3DLogic
 MODULE     = 3dlogic
-QT         = core-private gui-private 3dcore 3dcore-private
 
-DEFINES += QT3DLOGIC_LIBRARY
+QT         = core-private gui-private 3dcore 3dcore-private
 
 gcov {
     CONFIG += static
diff --git a/src/logic/qt3dlogic_global.h b/src/logic/qt3dlogic_global.h
index 0b292e3b0..129e7f52c 100644
--- a/src/logic/qt3dlogic_global.h
+++ b/src/logic/qt3dlogic_global.h
@@ -42,7 +42,7 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(QT_SHARED) || !defined(QT_STATIC)
-#  if defined(QT3DLOGIC_LIBRARY)
+#  if defined(QT_BUILD_3DLOGIC_LIB)
 #    define QT3DLOGICSHARED_EXPORT Q_DECL_EXPORT
 #  else
 #    define QT3DLOGICSHARED_EXPORT Q_DECL_IMPORT
diff --git a/src/quick3d/quick3d/qt3dquick_global.h b/src/quick3d/quick3d/qt3dquick_global.h
index d2b197bb5..b723012e6 100644
--- a/src/quick3d/quick3d/qt3dquick_global.h
+++ b/src/quick3d/quick3d/qt3dquick_global.h
@@ -42,7 +42,7 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(QT_SHARED) || !defined(QT_STATIC)
-#  if defined(QT3DQUICK_LIBRARY)
+#  if defined(QT_BUILD_3DQUICK_LIB)
 #    define QT3DQUICKSHARED_EXPORT Q_DECL_EXPORT
 #  else
 #    define QT3DQUICKSHARED_EXPORT Q_DECL_IMPORT
diff --git a/src/quick3d/quick3d/quick3d.pro b/src/quick3d/quick3d/quick3d.pro
index 0a1c2e94b..8be945507 100644
--- a/src/quick3d/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d/quick3d.pro
@@ -2,8 +2,6 @@ TARGET   = Qt3DQuick
 
 QT      += core-private gui-private qml qml-private quick quick-private 3dcore 3dcore-private
 
-DEFINES += QT3DQUICK_LIBRARY
-
 MODULE   = 3dquick
 
 gcov {
diff --git a/src/quick3d/quick3dinput/qt3dquickinput_global.h b/src/quick3d/quick3dinput/qt3dquickinput_global.h
index be94836c4..599826c8b 100644
--- a/src/quick3d/quick3dinput/qt3dquickinput_global.h
+++ b/src/quick3d/quick3dinput/qt3dquickinput_global.h
@@ -42,7 +42,7 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(QT_SHARED) || !defined(QT_STATIC)
-#  if defined(QT3DQUICKINPUT_LIBRARY)
+#  if defined(QT_BUILD_3DQUICKINPUT_LIB)
 #    define QT3DQUICKINPUTSHARED_EXPORT Q_DECL_EXPORT
 #  else
 #    define QT3DQUICKINPUTSHARED_EXPORT Q_DECL_IMPORT
diff --git a/src/quick3d/quick3dinput/quick3dinput.pro b/src/quick3d/quick3dinput/quick3dinput.pro
index 276198d9c..66d87b0b4 100644
--- a/src/quick3d/quick3dinput/quick3dinput.pro
+++ b/src/quick3d/quick3dinput/quick3dinput.pro
@@ -3,8 +3,6 @@ TARGET   = Qt3DQuickInput
 QT      += core core-private qml qml-private 3dcore 3dinput 3dquick 3dquick-private 3dcore-private 3dinput-private
 CONFIG -= precompile_header
 
-DEFINES += QT3DQUICKINPUT_LIBRARY
-
 MODULE   = 3dquickinput
 
 gcov {
diff --git a/src/quick3d/quick3drender/qt3dquickrender_global.h b/src/quick3d/quick3drender/qt3dquickrender_global.h
index 2d0d77a6f..e92fbdbc9 100644
--- a/src/quick3d/quick3drender/qt3dquickrender_global.h
+++ b/src/quick3d/quick3drender/qt3dquickrender_global.h
@@ -42,7 +42,7 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(QT_SHARED) || !defined(QT_STATIC)
-#  if defined(QT3DQUICKRENDER_LIBRARY)
+#  if defined(QT_BUILD_3DQUICKRENDER_LIB)
 #    define QT3DQUICKRENDERSHARED_EXPORT Q_DECL_EXPORT
 #  else
 #    define QT3DQUICKRENDERSHARED_EXPORT Q_DECL_IMPORT
diff --git a/src/quick3d/quick3drender/quick3drender.pro b/src/quick3d/quick3drender/quick3drender.pro
index 85d839ad5..75da1dbdc 100644
--- a/src/quick3d/quick3drender/quick3drender.pro
+++ b/src/quick3d/quick3drender/quick3drender.pro
@@ -3,8 +3,6 @@ TARGET   = Qt3DQuickRender
 QT      += core core-private qml qml-private 3dcore 3drender 3dquick 3dquick-private 3dcore-private 3drender-private
 CONFIG -= precompile_header
 
-DEFINES += QT3DQUICKRENDER_LIBRARY
-
 MODULE   = 3dquickrender
 
 gcov {
diff --git a/src/render/qt3drender_global.h b/src/render/qt3drender_global.h
index 6f3f2453d..1da0d0dab 100644
--- a/src/render/qt3drender_global.h
+++ b/src/render/qt3drender_global.h
@@ -42,7 +42,7 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(QT_SHARED) || !defined(QT_STATIC)
-#  if defined(QT3DRENDER_LIBRARY)
+#  if defined(QT_BUILD_3DRENDER_LIB)
 #    define QT3DRENDERSHARED_EXPORT Q_DECL_EXPORT
 #  else
 #    define QT3DRENDERSHARED_EXPORT Q_DECL_IMPORT
diff --git a/src/render/render.pro b/src/render/render.pro
index 097016e45..c99eb6912 100644
--- a/src/render/render.pro
+++ b/src/render/render.pro
@@ -2,8 +2,6 @@ TARGET   = Qt3DRender
 
 QT      += core-private gui-private 3dcore 3dcore-private openglextensions concurrent
 
-DEFINES += QT3DRENDER_LIBRARY
-
 MODULE   = 3drender