Fixes for Quick3d to fix Symbian problems

There is a fix for Qt3d library header exporting and
library link statement to libraries and apps using it.

Change-Id: I39758ca874e9aee52b6594808bce23f3bb4887bf

21 files changed, 92 insertions, 68 deletions

diff --git a/features/qt3d.prf b/features/qt3d.prf
index 66e5b7f2c..f4b9d9579 100644
--- a/features/qt3d.prf
+++ b/features/qt3d.prf
@@ -17,6 +17,7 @@
     load(data_caging_paths)
 
     INCLUDEPATH+=$$MW_LAYER_PUBLIC_EXPORT_PATH(Qt3D)
+    LIBS += -lQt3D
 }
 
 QT += opengl network
diff --git a/features/qt3dquick.prf b/features/qt3dquick.prf
index 13d2629c2..9e42c5e4d 100644
--- a/features/qt3dquick.prf
+++ b/features/qt3dquick.prf
@@ -20,6 +20,7 @@ CONFIG += qt3d
     load(data_caging_paths)
 
     INCLUDEPATH+=$$MW_LAYER_PUBLIC_EXPORT_PATH(Qt3DQuick)
+    LIBS += -lQt3DQuick
 }
 
 QT += opengl network declarative
diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro
index 8ae1f0bde..de74f05f2 100644
--- a/src/imports/shapes/shapes.pro
+++ b/src/imports/shapes/shapes.pro
@@ -42,6 +42,7 @@ win32 {
 symbian {
     CONFIG += epocallowdlldata
     MMP_RULES += EXPORTUNFROZEN
+    LIBS += -lQt3D -lQt3DQuick
     contains(QT_EDITION, OpenSource) {
         TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData
     } else {
diff --git a/src/imports/threed/threed.pro b/src/imports/threed/threed.pro
index d20c7d351..43027c3d3 100644
--- a/src/imports/threed/threed.pro
+++ b/src/imports/threed/threed.pro
@@ -42,6 +42,7 @@ win32 {
 symbian {
     CONFIG += epocallowdlldata
     MMP_RULES += EXPORTUNFROZEN
+    LIBS += -lQt3D -lQt3DQuick
     contains(QT_EDITION, OpenSource) {
         TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData
     } else {
diff --git a/src/plugins/sceneformats/assimp/assimp.pro b/src/plugins/sceneformats/assimp/assimp.pro
index 3fb3fc5c9..03492f44d 100644
--- a/src/plugins/sceneformats/assimp/assimp.pro
+++ b/src/plugins/sceneformats/assimp/assimp.pro
@@ -39,6 +39,8 @@ package {
     DESTDIR = $$[QT_INSTALL_PLUGINS]/sceneformats
 }
 
+symbian: LIBS += -lQt3D
+
 # suppress warnings about std::copy using unsafe parameters
 win32: DEFINES +=_SCL_SECURE_NO_WARNINGS
 
diff --git a/src/plugins/sceneformats/bezier/bezier.pro b/src/plugins/sceneformats/bezier/bezier.pro
index bf01903e1..b3a192c1c 100644
--- a/src/plugins/sceneformats/bezier/bezier.pro
+++ b/src/plugins/sceneformats/bezier/bezier.pro
@@ -31,3 +31,4 @@ package {
     CONFIG += qt3d
     DESTDIR = $$[QT_INSTALL_PLUGINS]/sceneformats
 }
+symbian: LIBS += -lQt3D
diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro
index 53f49fd57..cf15187b9 100644
--- a/src/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d.pro
@@ -53,6 +53,7 @@ symbian {
     DEFINES += QT_MAKEDLL
     CONFIG += epocallowdlldata
     MMP_RULES += EXPORTUNFROZEN
+    LIBS += -lQt3D
     contains(QT_EDITION, OpenSource) {
         TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData
     } else {
diff --git a/src/threed/api/api.pri b/src/threed/api/api.pri
index 0499f0dc7..6b06b6509 100644
--- a/src/threed/api/api.pri
+++ b/src/threed/api/api.pri
@@ -1,4 +1,4 @@
 INCLUDEPATH += $$PWD
 VPATH += $$PWD
-HEADERS += qopenglfunctions.h
+HEADERS += api/qopenglfunctions.h
 SOURCES += qopenglfunctions.cpp
diff --git a/src/threed/arrays/arrays.pri b/src/threed/arrays/arrays.pri
index f9eb72d94..978f252d7 100644
--- a/src/threed/arrays/arrays.pri
+++ b/src/threed/arrays/arrays.pri
@@ -1,17 +1,17 @@
 INCLUDEPATH += $$PWD
 VPATH += $$PWD
 HEADERS += \
-    qglattributedescription.h \
-    qglattributeset.h \
-    qglattributevalue.h \
-    qglindexbuffer.h \
-    qglvertexbundle.h \
-    qarray.h \
-    qcolor4ub.h \
-    qcustomdataarray.h \
-    qvector2darray.h \
-    qvector3darray.h \
-    qvector4darray.h
+    arrays/qglattributedescription.h \
+    arrays/qglattributeset.h \
+    arrays/qglattributevalue.h \
+    arrays/qglindexbuffer.h \
+    arrays/qglvertexbundle.h \
+    arrays/qarray.h \
+    arrays/qcolor4ub.h \
+    arrays/qcustomdataarray.h \
+    arrays/qvector2darray.h \
+    arrays/qvector3darray.h \
+    arrays/qvector4darray.h
 SOURCES += \
     qglattributedescription.cpp \
     qglattributeset.cpp \
diff --git a/src/threed/effects/effects.pri b/src/threed/effects/effects.pri
index 19b0cae37..2afeca526 100644
--- a/src/threed/effects/effects.pri
+++ b/src/threed/effects/effects.pri
@@ -3,10 +3,10 @@ INCLUDEPATH += $$PWD
 VPATH += $$PWD
 
 HEADERS += \
-    qglshaderprogrameffect.h \
-    qglcolladafxeffectfactory.h \
-    qglcolladafxeffect.h \
-    qglcolladafxeffectloader.h
+    effects/qglshaderprogrameffect.h \
+    effects/qglcolladafxeffectfactory.h \
+    effects/qglcolladafxeffect.h \
+    effects/qglcolladafxeffectloader.h
 
 SOURCES += \
     qglflatcoloreffect.cpp \
diff --git a/src/threed/geometry/geometry.pri b/src/threed/geometry/geometry.pri
index 5623ac054..7f6be75c2 100644
--- a/src/threed/geometry/geometry.pri
+++ b/src/threed/geometry/geometry.pri
@@ -1,15 +1,15 @@
 INCLUDEPATH += $$PWD
 VPATH += $$PWD
-HEADERS += qglcube.h \
-    qglsphere.h \
-    qgeometrydata.h \
-    qlogicalvertex.h \
-    qglbuilder.h \
-    qglbezierpatches.h \
-    qglmaterialcollection.h \
-    qglteapot.h \
-    qglcylinder.h \
-    qgldome.h
+HEADERS += geometry/qglcube.h \
+    geometry/qglsphere.h \
+    geometry/qgeometrydata.h \
+    geometry/qlogicalvertex.h \
+    geometry/qglbuilder.h \
+    geometry/qglbezierpatches.h \
+    geometry/qglmaterialcollection.h \
+    geometry/qglteapot.h \
+    geometry/qglcylinder.h \
+    geometry/qgldome.h
 SOURCES += qglcube.cpp \
     qglsphere.cpp \
     qgeometrydata.cpp \
diff --git a/src/threed/global/global.pri b/src/threed/global/global.pri
index d911c784a..2fac10227 100644
--- a/src/threed/global/global.pri
+++ b/src/threed/global/global.pri
@@ -1,7 +1,7 @@
 INCLUDEPATH += $$PWD
 VPATH += $$PWD
 HEADERS += \
-    qt3dglobal.h \
-    qglnamespace.h
+    global/qt3dglobal.h \
+    global/qglnamespace.h
 SOURCES += \
     qglnamespace.cpp
diff --git a/src/threed/graphicsview/graphicsview.pri b/src/threed/graphicsview/graphicsview.pri
index 2c853f02a..b43dbe662 100644
--- a/src/threed/graphicsview/graphicsview.pri
+++ b/src/threed/graphicsview/graphicsview.pri
@@ -3,13 +3,13 @@ INCLUDEPATH += $$PWD
 VPATH += $$PWD
 
 HEADERS += \
-    qglgraphicsviewportitem.h \
-    qgraphicsbillboardtransform.h \
-    qgraphicsembedscene.h \
-    qgraphicsrotation3d.h \
-    qgraphicsscale3d.h \
-    qgraphicstransform3d.h \
-    qgraphicstranslation3d.h
+    graphicsview/qglgraphicsviewportitem.h \
+    graphicsview/qgraphicsbillboardtransform.h \
+    graphicsview/qgraphicsembedscene.h \
+    graphicsview/qgraphicsrotation3d.h \
+    graphicsview/qgraphicsscale3d.h \
+    graphicsview/qgraphicstransform3d.h \
+    graphicsview/qgraphicstranslation3d.h
 
 SOURCES += \
     qglgraphicsviewportitem.cpp \
diff --git a/src/threed/materials/materials.pri b/src/threed/materials/materials.pri
index 3eb8e0173..27ba1ffee 100644
--- a/src/threed/materials/materials.pri
+++ b/src/threed/materials/materials.pri
@@ -3,10 +3,10 @@ INCLUDEPATH += $$PWD
 VPATH += $$PWD
 
 HEADERS += \
-    qglabstractmaterial.h \
-    qglcolormaterial.h \
-    qglmaterial.h \
-    qgltwosidedmaterial.h
+    materials/qglabstractmaterial.h \
+    materials/qglcolormaterial.h \
+    materials/qglmaterial.h \
+    materials/qgltwosidedmaterial.h
 
 SOURCES += \
     qglabstractmaterial.cpp \
diff --git a/src/threed/math3d/math3d.pri b/src/threed/math3d/math3d.pri
index 25cd3e74f..0d36db905 100644
--- a/src/threed/math3d/math3d.pri
+++ b/src/threed/math3d/math3d.pri
@@ -1,10 +1,10 @@
 INCLUDEPATH += $$PWD
 VPATH += $$PWD
-HEADERS += qbox3d.h \
-    qplane3d.h \
-    qray3d.h \
-    qsphere3d.h \
-    qtriangle3d.h
+HEADERS += math3d/qbox3d.h \
+    math3d/qplane3d.h \
+    math3d/qray3d.h \
+    math3d/qsphere3d.h \
+    math3d/qtriangle3d.h
 SOURCES += qbox3d.cpp \
     qplane3d.cpp \
     qray3d.cpp \
diff --git a/src/threed/painting/painting.pri b/src/threed/painting/painting.pri
index 8f5b5951b..27763c09e 100644
--- a/src/threed/painting/painting.pri
+++ b/src/threed/painting/painting.pri
@@ -3,11 +3,11 @@ INCLUDEPATH += $$PWD
 VPATH += $$PWD
 
 HEADERS += \
-    qglabstracteffect.h \
-    qgllightmodel.h \
-    qgllightparameters.h \
-    qglpainter.h \
-    qmatrix4x4stack.h
+    painting/qglabstracteffect.h \
+    painting/qgllightmodel.h \
+    painting/qgllightparameters.h \
+    painting/qglpainter.h \
+    painting/qmatrix4x4stack.h
 
 SOURCES += \
     qglabstracteffect.cpp \
diff --git a/src/threed/scene/scene.pri b/src/threed/scene/scene.pri
index 14d5e989b..289f6b9c8 100644
--- a/src/threed/scene/scene.pri
+++ b/src/threed/scene/scene.pri
@@ -1,13 +1,13 @@
 INCLUDEPATH += $$PWD
 VPATH += $$PWD
-HEADERS += qglabstractscene.h \
-    qglsceneformatplugin.h \
-    qglscenenode.h \
-    qglpicknode.h \
-    qglrendersequencer.h \
-    qglrenderorder.h \
-    qglrenderordercomparator.h \
-    qglrenderstate.h
+HEADERS += scene/qglabstractscene.h \
+    scene/qglsceneformatplugin.h \
+    scene/qglscenenode.h \
+    scene/qglpicknode.h \
+    scene/qglrendersequencer.h \
+    scene/qglrenderorder.h \
+    scene/qglrenderordercomparator.h \
+    scene/qglrenderstate.h
 SOURCES += qglabstractscene.cpp \
     qglsceneformatplugin.cpp \
     qglscenenode.cpp \
diff --git a/src/threed/surfaces/surfaces.pri b/src/threed/surfaces/surfaces.pri
index 964f924a0..8ce35fb6a 100644
--- a/src/threed/surfaces/surfaces.pri
+++ b/src/threed/surfaces/surfaces.pri
@@ -1,11 +1,11 @@
 INCLUDEPATH += $$PWD
 VPATH += $$PWD
 HEADERS += \
-    qglabstractsurface.h \
-    qglframebufferobjectsurface.h \
-    qglpixelbuffersurface.h \
-    qglsubsurface.h \
-    qglwidgetsurface.h
+    surfaces/qglabstractsurface.h \
+    surfaces/qglframebufferobjectsurface.h \
+    surfaces/qglpixelbuffersurface.h \
+    surfaces/qglsubsurface.h \
+    surfaces/qglwidgetsurface.h
 SOURCES += \
     qglabstractsurface.cpp \
     qglcontextsurface.cpp \
diff --git a/src/threed/textures/textures.pri b/src/threed/textures/textures.pri
index c17c1531e..ce60c58ee 100644
--- a/src/threed/textures/textures.pri
+++ b/src/threed/textures/textures.pri
@@ -1,9 +1,9 @@
 INCLUDEPATH += $$PWD
 VPATH += $$PWD
 HEADERS += \
-    qgltexture2d.h \
-    qgltexturecube.h \
-    qareaallocator.h
+    textures/qgltexture2d.h \
+    textures/qgltexturecube.h \
+    textures/qareaallocator.h
 SOURCES += \
     qareaallocator.cpp \
     qglsharedresource.cpp \
diff --git a/src/threed/threed.pro b/src/threed/threed.pro
index cb16d7743..6939071ae 100644
--- a/src/threed/threed.pro
+++ b/src/threed/threed.pro
@@ -34,6 +34,7 @@ win32 {
 symbian {
     DEFINES += QT_MAKEDLL
     CONFIG += epocallowdlldata
+    MMP_RULES += EXPORTUNFROZEN
     contains(QT_EDITION, OpenSource) {
         TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData
     } else {
@@ -88,3 +89,18 @@ macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
     exportHeaders.variable_out = PRE_TARGETDEPS
     QMAKE_EXTRA_COMPILERS += exportHeaders
 }
+
+symbian {
+    export_headers.files = $$PUBLIC_HEADERS
+    exportPath=$${EPOCROOT}$${MW_LAYER_PUBLIC_EXPORT_PATH}/Qt3D/
+    nativePath=$$replace(exportPath,/,\\)
+    exists($$nativePath) {
+    } else {
+        system($$QMAKE_MKDIR $$nativePath)
+    }
+
+    message($$PUBLIC_HEADERS)
+    for(export_header, export_headers.files) {
+        BLD_INF_RULES.prj_exports += "$$export_header $$MW_LAYER_PUBLIC_EXPORT_PATH(Qt3D/$$basename(export_header))"
+    }
+}
diff --git a/src/threed/viewing/viewing.pri b/src/threed/viewing/viewing.pri
index 60125f491..a6d7f7fdc 100644
--- a/src/threed/viewing/viewing.pri
+++ b/src/threed/viewing/viewing.pri
@@ -2,9 +2,9 @@ INCLUDEPATH += $$PWD
 VPATH += $$PWD
 
 HEADERS += \
-    qglcamera.h \
-    qglcameraanimation.h \
-    qglview.h
+    viewing/qglcamera.h \
+    viewing/qglcameraanimation.h \
+    viewing/qglview.h
 
 SOURCES += \
     qglcamera.cpp \