From 396a01b4748decf4080add69471ee846a3d2dc46 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 12 Feb 2014 12:27:31 +0200
Subject: Take qml_plugin.prf into use
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enables us to lose a bunch of hacks.

Change-Id: Id7641012004428aa9782cfb5dbaf9fc9c4629706
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 src/datavisualization/engine/bars3drenderer.cpp    |  2 ++
 src/datavisualization/engine/scatter3drenderer.cpp |  1 +
 src/datavisualization/engine/surface3drenderer.cpp |  3 ++
 .../datavisualizationqml2.pro                      | 39 ++++++++--------------
 4 files changed, 19 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 2c2654e6..bb702119 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -1291,6 +1291,8 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
                         // Draw the object
                         m_drawer->drawObject(barShader, barObj, gradientTexture, m_depthTexture);
                     } else
+#else
+                    Q_UNUSED(shadowLightStrength);
 #endif
                     {
                         // Set shadowless shader bindings
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index bed3070b..d6f34a67 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -447,6 +447,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
 
     ShaderHelper *pointSelectionShader = m_selectionShader;
 #else
+    Q_UNUSED(havePointSeries);
     ShaderHelper *pointSelectionShader = m_pointShader;
 #endif
     ShaderHelper *selectionShader = m_selectionShader;
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index 194509f8..fbc0e914 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -896,6 +896,7 @@ void Surface3DRenderer::drawSlicedScene()
 void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
 {
     bool noShadows = true;
+
     GLfloat backgroundRotation = 0;
     QVector3D lightColor = Utils::vectorFromColor(m_cachedTheme->lightColor());
 
@@ -1279,6 +1280,8 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
             else
                 m_drawer->drawObject(m_backgroundShader, m_backgroundObj, 0, m_depthTexture);
         } else
+#else
+        Q_UNUSED(noShadows);
 #endif
         {
             // Set shadowless shader bindings
diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro
index 6396b86b..97f6c87e 100644
--- a/src/datavisualizationqml2/datavisualizationqml2.pro
+++ b/src/datavisualizationqml2/datavisualizationqml2.pro
@@ -1,19 +1,10 @@
-TEMPLATE = lib
 TARGET = datavisualizationqml2
 QT += qml quick datavisualization
-CONFIG += qt plugin
+TARGETPATH = QtDataVisualization
+IMPORT_VERSION = $$MODULE_VERSION
 
-TARGET = $$qtLibraryTarget($$TARGET)
-uri = QtDataVisualization
-
-static {
-    DEFINES += QT_DATAVISUALIZATION_STATICLIB
-    # Only build qml plugin static if Qt itself is also built static
-    !contains(QT_CONFIG, static): CONFIG -= static staticlib
-
-    # Insert the plugin URI into its meta data to enable static plugin usage
-    QMAKE_MOC_OPTIONS += -Muri=$$uri
-}
+# Only build qml plugin static if Qt itself is also built static
+!contains(QT_CONFIG, static): CONFIG -= static staticlib
 
 INCLUDEPATH += ../../include \
                ../../include/QtDataVisualization \
@@ -48,18 +39,14 @@ HEADERS += \
 
 OTHER_FILES = qmldir
 
-!equals(_PRO_FILE_PWD_, $$OUT_PWD) {
-    copy_qmldir.target = $$OUT_PWD/qmldir
-    copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
-    copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
-    QMAKE_EXTRA_TARGETS += copy_qmldir
-    PRE_TARGETDEPS += $$copy_qmldir.target
-}
-
-qmldir.files = qmldir
+CONFIG += no_cxx_module
 
-installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
-qmldir.path = $$installPath
-target.path = $$installPath
-INSTALLS += target qmldir
+load(qml_plugin)
 
+# Copy qmldir to DESTDIR so we can use the plugin directly from there in our examples
+# without having to do 'make install'.
+copy_qmldir.target = $$DESTDIR/qmldir
+copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
+copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
+QMAKE_EXTRA_TARGETS += copy_qmldir
+PRE_TARGETDEPS += $$copy_qmldir.target
-- 
cgit v1.2.3