80 files changed, 22 insertions, 24 deletions
diff --git a/src/datavis3d/Doxyfile b/src/Doxyfile
index e5d78895..e5d78895 100644
--- a/src/datavis3d/Doxyfile
+++ b/src/Doxyfile
diff --git a/src/datavis3d/Mainpage.dox b/src/Mainpage.dox
index 973bc46f..973bc46f 100644
--- a/src/datavis3d/Mainpage.dox
+++ b/src/Mainpage.dox
diff --git a/src/datavis3d/common.pri b/src/common.pri
index 8532fc77..8532fc77 100644
--- a/src/datavis3d/common.pri
+++ b/src/common.pri
diff --git a/src/datavis3d/datavis3d.pro b/src/datavis3d/datavis3d.pro
deleted file mode 100644
index b4169c4e..00000000
--- a/src/datavis3d/datavis3d.pro
+++ /dev/null
@@ -1,22 +0,0 @@
-TARGET = QtDataVis3D
-QT = core gui opengl #qml
-
-DEFINES += QTCOMMERCIALDATAVIS3D_LIBRARY
-
-QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf
-
-load(qt_module)
-
-include($$PWD/common.pri)
-include($$PWD/engine/engine.pri)
-include($$PWD/global/global.pri)
-include($$PWD/utils/utils.pri)
-
-wince* {
-    # The Microsoft MIPS compiler crashes if /Og is specified.
-    # -O2/1 expands to /Og plus additional arguments.
-    contains(DEFINES, MIPS) {
-        QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-Oi -Ot -Oy -Ob2/
-        QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/
-    }
-}
diff --git a/src/datavis3d/doc/qtdatavis3d.qdocconf b/src/doc/qtdatavis3d.qdocconf
index c2c084b3..c2c084b3 100644
--- a/src/datavis3d/doc/qtdatavis3d.qdocconf
+++ b/src/doc/qtdatavis3d.qdocconf
diff --git a/src/datavis3d/documentationGroups.dox b/src/documentationGroups.dox
index ed9c3f1c..ed9c3f1c 100644
--- a/src/datavis3d/documentationGroups.dox
+++ b/src/documentationGroups.dox
diff --git a/src/datavis3d/engine/drawer.cpp b/src/engine/drawer.cpp
index 722a54b8..722a54b8 100644
--- a/src/datavis3d/engine/drawer.cpp
+++ b/src/engine/drawer.cpp
diff --git a/src/datavis3d/engine/drawer_p.h b/src/engine/drawer_p.h
index 3b6a2c49..3b6a2c49 100644
--- a/src/datavis3d/engine/drawer_p.h
+++ b/src/engine/drawer_p.h
diff --git a/src/datavis3d/engine/engine.pri b/src/engine/engine.pri
index ba063186..ba063186 100644
--- a/src/datavis3d/engine/engine.pri
+++ b/src/engine/engine.pri
diff --git a/src/datavis3d/engine/engine.qrc b/src/engine/engine.qrc
index ca260915..ca260915 100644
--- a/src/datavis3d/engine/engine.qrc
+++ b/src/engine/engine.qrc
diff --git a/src/datavis3d/engine/labelitem.cpp b/src/engine/labelitem.cpp
index 6ce0663c..6ce0663c 100644
--- a/src/datavis3d/engine/labelitem.cpp
+++ b/src/engine/labelitem.cpp
diff --git a/src/datavis3d/engine/labelitem_p.h b/src/engine/labelitem_p.h
index 49693631..49693631 100644
--- a/src/datavis3d/engine/labelitem_p.h
+++ b/src/engine/labelitem_p.h
diff --git a/src/datavis3d/engine/meshes/backgroudFlat.obj b/src/engine/meshes/backgroudFlat.obj
index cf4d10a5..cf4d10a5 100644
--- a/src/datavis3d/engine/meshes/backgroudFlat.obj
+++ b/src/engine/meshes/backgroudFlat.obj
diff --git a/src/datavis3d/engine/meshes/backgroudSmooth.obj b/src/engine/meshes/backgroudSmooth.obj
index ad16d904..ad16d904 100644
--- a/src/datavis3d/engine/meshes/backgroudSmooth.obj
+++ b/src/engine/meshes/backgroudSmooth.obj
diff --git a/src/datavis3d/engine/meshes/coneFlat.obj b/src/engine/meshes/coneFlat.obj
index 51c3821e..51c3821e 100644
--- a/src/datavis3d/engine/meshes/coneFlat.obj
+++ b/src/engine/meshes/coneFlat.obj
diff --git a/src/datavis3d/engine/meshes/coneSmooth.obj b/src/engine/meshes/coneSmooth.obj
index 48c48ba8..48c48ba8 100644
--- a/src/datavis3d/engine/meshes/coneSmooth.obj
+++ b/src/engine/meshes/coneSmooth.obj
diff --git a/src/datavis3d/engine/meshes/cubeFlat.obj b/src/engine/meshes/cubeFlat.obj
index 3c8d6d0a..3c8d6d0a 100644
--- a/src/datavis3d/engine/meshes/cubeFlat.obj
+++ b/src/engine/meshes/cubeFlat.obj
diff --git a/src/datavis3d/engine/meshes/cubeSmooth.obj b/src/engine/meshes/cubeSmooth.obj
index 9d147bfd..9d147bfd 100644
--- a/src/datavis3d/engine/meshes/cubeSmooth.obj
+++ b/src/engine/meshes/cubeSmooth.obj
diff --git a/src/datavis3d/engine/meshes/cylinderFlat.obj b/src/engine/meshes/cylinderFlat.obj
index 2b7e3e5e..2b7e3e5e 100644
--- a/src/datavis3d/engine/meshes/cylinderFlat.obj
+++ b/src/engine/meshes/cylinderFlat.obj
diff --git a/src/datavis3d/engine/meshes/cylinderSmooth.obj b/src/engine/meshes/cylinderSmooth.obj
index 6ccbb286..6ccbb286 100644
--- a/src/datavis3d/engine/meshes/cylinderSmooth.obj
+++ b/src/engine/meshes/cylinderSmooth.obj
diff --git a/src/datavis3d/engine/meshes/plane.obj b/src/engine/meshes/plane.obj
index 96ac0dd7..96ac0dd7 100644
--- a/src/datavis3d/engine/meshes/plane.obj
+++ b/src/engine/meshes/plane.obj
diff --git a/src/datavis3d/engine/meshes/pyramidFlat.obj b/src/engine/meshes/pyramidFlat.obj
index 35edb477..35edb477 100644
--- a/src/datavis3d/engine/meshes/pyramidFlat.obj
+++ b/src/engine/meshes/pyramidFlat.obj
diff --git a/src/datavis3d/engine/meshes/pyramidSmooth.obj b/src/engine/meshes/pyramidSmooth.obj
index b11c8750..b11c8750 100644
--- a/src/datavis3d/engine/meshes/pyramidSmooth.obj
+++ b/src/engine/meshes/pyramidSmooth.obj
diff --git a/src/datavis3d/engine/meshes/sphere.obj b/src/engine/meshes/sphere.obj
index 671a7bcc..671a7bcc 100644
--- a/src/datavis3d/engine/meshes/sphere.obj
+++ b/src/engine/meshes/sphere.obj
diff --git a/src/datavis3d/engine/meshes/sphereSmooth.obj b/src/engine/meshes/sphereSmooth.obj
index 3c5b1299..3c5b1299 100644
--- a/src/datavis3d/engine/meshes/sphereSmooth.obj
+++ b/src/engine/meshes/sphereSmooth.obj
diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/engine/q3dbars.cpp
index dc20a8c6..dc20a8c6 100644
--- a/src/datavis3d/engine/q3dbars.cpp
+++ b/src/engine/q3dbars.cpp
diff --git a/src/datavis3d/engine/q3dbars.h b/src/engine/q3dbars.h
index 5a97f111..5a97f111 100644
--- a/src/datavis3d/engine/q3dbars.h
+++ b/src/engine/q3dbars.h
diff --git a/src/datavis3d/engine/q3dbars_p.h b/src/engine/q3dbars_p.h
index 472fe8d6..472fe8d6 100644
--- a/src/datavis3d/engine/q3dbars_p.h
+++ b/src/engine/q3dbars_p.h
diff --git a/src/datavis3d/engine/q3dmaps.cpp b/src/engine/q3dmaps.cpp
index 78789bcd..78789bcd 100644
--- a/src/datavis3d/engine/q3dmaps.cpp
+++ b/src/engine/q3dmaps.cpp
diff --git a/src/datavis3d/engine/q3dmaps.h b/src/engine/q3dmaps.h
index ed9f75d7..ed9f75d7 100644
--- a/src/datavis3d/engine/q3dmaps.h
+++ b/src/engine/q3dmaps.h
diff --git a/src/datavis3d/engine/q3dmaps_p.h b/src/engine/q3dmaps_p.h
index 3896bb39..3896bb39 100644
--- a/src/datavis3d/engine/q3dmaps_p.h
+++ b/src/engine/q3dmaps_p.h
diff --git a/src/datavis3d/engine/q3dwindow.cpp b/src/engine/q3dwindow.cpp
index a172e7b6..a172e7b6 100644
--- a/src/datavis3d/engine/q3dwindow.cpp
+++ b/src/engine/q3dwindow.cpp
diff --git a/src/datavis3d/engine/q3dwindow.h b/src/engine/q3dwindow.h
index 9958f7d9..9958f7d9 100644
--- a/src/datavis3d/engine/q3dwindow.h
+++ b/src/engine/q3dwindow.h
diff --git a/src/datavis3d/engine/q3dwindow_p.h b/src/engine/q3dwindow_p.h
index ef786fb3..ef786fb3 100644
--- a/src/datavis3d/engine/q3dwindow_p.h
+++ b/src/engine/q3dwindow_p.h
diff --git a/src/datavis3d/engine/qdataitem.cpp b/src/engine/qdataitem.cpp
index 14d6c85f..14d6c85f 100644
--- a/src/datavis3d/engine/qdataitem.cpp
+++ b/src/engine/qdataitem.cpp
diff --git a/src/datavis3d/engine/qdataitem.h b/src/engine/qdataitem.h
index 88d54faf..88d54faf 100644
--- a/src/datavis3d/engine/qdataitem.h
+++ b/src/engine/qdataitem.h
diff --git a/src/datavis3d/engine/qdataitem_p.h b/src/engine/qdataitem_p.h
index f14fe175..f14fe175 100644
--- a/src/datavis3d/engine/qdataitem_p.h
+++ b/src/engine/qdataitem_p.h
diff --git a/src/datavis3d/engine/qdatarow.cpp b/src/engine/qdatarow.cpp
index f4a9e984..f4a9e984 100644
--- a/src/datavis3d/engine/qdatarow.cpp
+++ b/src/engine/qdatarow.cpp
diff --git a/src/datavis3d/engine/qdatarow.h b/src/engine/qdatarow.h
index 766ae541..766ae541 100644
--- a/src/datavis3d/engine/qdatarow.h
+++ b/src/engine/qdatarow.h
diff --git a/src/datavis3d/engine/qdatarow_p.h b/src/engine/qdatarow_p.h
index 3a1adeee..3a1adeee 100644
--- a/src/datavis3d/engine/qdatarow_p.h
+++ b/src/engine/qdatarow_p.h
diff --git a/src/datavis3d/engine/qdataset.cpp b/src/engine/qdataset.cpp
index 5af920d2..5af920d2 100644
--- a/src/datavis3d/engine/qdataset.cpp
+++ b/src/engine/qdataset.cpp
diff --git a/src/datavis3d/engine/qdataset.h b/src/engine/qdataset.h
index 118d3df9..118d3df9 100644
--- a/src/datavis3d/engine/qdataset.h
+++ b/src/engine/qdataset.h
diff --git a/src/datavis3d/engine/qdataset_p.h b/src/engine/qdataset_p.h
index 90dc5329..90dc5329 100644
--- a/src/datavis3d/engine/qdataset_p.h
+++ b/src/engine/qdataset_p.h
diff --git a/src/datavis3d/engine/shaders/fragmentDepthTest b/src/engine/shaders/fragmentDepthTest
index d6c502e1..d6c502e1 100644
--- a/src/datavis3d/engine/shaders/fragmentDepthTest
+++ b/src/engine/shaders/fragmentDepthTest
diff --git a/src/datavis3d/engine/shaders/fragmentShader b/src/engine/shaders/fragmentShader
index 45d8642f..45d8642f 100644
--- a/src/datavis3d/engine/shaders/fragmentShader
+++ b/src/engine/shaders/fragmentShader
diff --git a/src/datavis3d/engine/shaders/fragmentShaderAmbient b/src/engine/shaders/fragmentShaderAmbient
index ccaa07e4..ccaa07e4 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderAmbient
+++ b/src/engine/shaders/fragmentShaderAmbient
diff --git a/src/datavis3d/engine/shaders/fragmentShaderColorOnY b/src/engine/shaders/fragmentShaderColorOnY
index a7a30155..a7a30155 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderColorOnY
+++ b/src/engine/shaders/fragmentShaderColorOnY
diff --git a/src/datavis3d/engine/shaders/fragmentShaderDepth b/src/engine/shaders/fragmentShaderDepth
index 5cfd4b10..5cfd4b10 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderDepth
+++ b/src/engine/shaders/fragmentShaderDepth
diff --git a/src/datavis3d/engine/shaders/fragmentShaderLabel b/src/engine/shaders/fragmentShaderLabel
index ed3f91b1..ed3f91b1 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderLabel
+++ b/src/engine/shaders/fragmentShaderLabel
diff --git a/src/datavis3d/engine/shaders/fragmentShaderSelection b/src/engine/shaders/fragmentShaderSelection
index 66370224..66370224 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderSelection
+++ b/src/engine/shaders/fragmentShaderSelection
diff --git a/src/datavis3d/engine/shaders/fragmentShaderTexture b/src/engine/shaders/fragmentShaderTexture
index 95c4f1a1..95c4f1a1 100644
--- a/src/datavis3d/engine/shaders/fragmentShaderTexture
+++ b/src/engine/shaders/fragmentShaderTexture
diff --git a/src/datavis3d/engine/shaders/fragmentShadow b/src/engine/shaders/fragmentShadow
index 2c3c2ded..2c3c2ded 100644
--- a/src/datavis3d/engine/shaders/fragmentShadow
+++ b/src/engine/shaders/fragmentShadow
diff --git a/src/datavis3d/engine/shaders/vertexDepthTest b/src/engine/shaders/vertexDepthTest
index d62f1aa7..d62f1aa7 100644
--- a/src/datavis3d/engine/shaders/vertexDepthTest
+++ b/src/engine/shaders/vertexDepthTest
diff --git a/src/datavis3d/engine/shaders/vertexShader b/src/engine/shaders/vertexShader
index de03714b..de03714b 100644
--- a/src/datavis3d/engine/shaders/vertexShader
+++ b/src/engine/shaders/vertexShader
diff --git a/src/datavis3d/engine/shaders/vertexShaderDepth b/src/engine/shaders/vertexShaderDepth
index 69521267..69521267 100644
--- a/src/datavis3d/engine/shaders/vertexShaderDepth
+++ b/src/engine/shaders/vertexShaderDepth
diff --git a/src/datavis3d/engine/shaders/vertexShaderLabel b/src/engine/shaders/vertexShaderLabel
index 5959b47b..5959b47b 100644
--- a/src/datavis3d/engine/shaders/vertexShaderLabel
+++ b/src/engine/shaders/vertexShaderLabel
diff --git a/src/datavis3d/engine/shaders/vertexShaderSelection b/src/engine/shaders/vertexShaderSelection
index 70082663..70082663 100644
--- a/src/datavis3d/engine/shaders/vertexShaderSelection
+++ b/src/engine/shaders/vertexShaderSelection
diff --git a/src/datavis3d/engine/shaders/vertexShaderTexture b/src/engine/shaders/vertexShaderTexture
index fb23b252..fb23b252 100644
--- a/src/datavis3d/engine/shaders/vertexShaderTexture
+++ b/src/engine/shaders/vertexShaderTexture
diff --git a/src/datavis3d/engine/shaders/vertexShadow b/src/engine/shaders/vertexShadow
index 24184376..24184376 100644
--- a/src/datavis3d/engine/shaders/vertexShadow
+++ b/src/engine/shaders/vertexShadow
diff --git a/src/datavis3d/engine/theme.cpp b/src/engine/theme.cpp
index 5e3d0540..5e3d0540 100644
--- a/src/datavis3d/engine/theme.cpp
+++ b/src/engine/theme.cpp
diff --git a/src/datavis3d/engine/theme_p.h b/src/engine/theme_p.h
index 614c79d5..614c79d5 100644
--- a/src/datavis3d/engine/theme_p.h
+++ b/src/engine/theme_p.h
diff --git a/src/datavis3d/global/global.pri b/src/global/global.pri
index 56cb9f8f..56cb9f8f 100644
--- a/src/datavis3d/global/global.pri
+++ b/src/global/global.pri
diff --git a/src/datavis3d/global/qdatavis3dglobal.h b/src/global/qdatavis3dglobal.h
index 528180b3..528180b3 100644
--- a/src/datavis3d/global/qdatavis3dglobal.h
+++ b/src/global/qdatavis3dglobal.h
diff --git a/src/datavis3d/global/qdatavis3namespace.h b/src/global/qdatavis3namespace.h
index a4ca7c42..a4ca7c42 100644
--- a/src/datavis3d/global/qdatavis3namespace.h
+++ b/src/global/qdatavis3namespace.h
diff --git a/src/src.pro b/src/src.pro
index b9b7be46..b4169c4e 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,2 +1,22 @@
-TEMPLATE = subdirs
-SUBDIRS += datavis3d
+TARGET = QtDataVis3D
+QT = core gui opengl #qml
+
+DEFINES += QTCOMMERCIALDATAVIS3D_LIBRARY
+
+QMAKE_DOCS = $$PWD/doc/qtdatavis3d.qdocconf
+
+load(qt_module)
+
+include($$PWD/common.pri)
+include($$PWD/engine/engine.pri)
+include($$PWD/global/global.pri)
+include($$PWD/utils/utils.pri)
+
+wince* {
+    # The Microsoft MIPS compiler crashes if /Og is specified.
+    # -O2/1 expands to /Og plus additional arguments.
+    contains(DEFINES, MIPS) {
+        QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-Oi -Ot -Oy -Ob2/
+        QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/
+    }
+}
diff --git a/src/datavis3d/utils/camerahelper.cpp b/src/utils/camerahelper.cpp
index 2e868cac..2e868cac 100644
--- a/src/datavis3d/utils/camerahelper.cpp
+++ b/src/utils/camerahelper.cpp
diff --git a/src/datavis3d/utils/camerahelper_p.h b/src/utils/camerahelper_p.h
index 68e7e5a2..68e7e5a2 100644
--- a/src/datavis3d/utils/camerahelper_p.h
+++ b/src/utils/camerahelper_p.h
diff --git a/src/datavis3d/utils/meshloader.cpp b/src/utils/meshloader.cpp
index 0e818a92..0e818a92 100644
--- a/src/datavis3d/utils/meshloader.cpp
+++ b/src/utils/meshloader.cpp
diff --git a/src/datavis3d/utils/meshloader_p.h b/src/utils/meshloader_p.h
index 514ae5c6..514ae5c6 100644
--- a/src/datavis3d/utils/meshloader_p.h
+++ b/src/utils/meshloader_p.h
diff --git a/src/datavis3d/utils/objecthelper.cpp b/src/utils/objecthelper.cpp
index 6659a187..6659a187 100644
--- a/src/datavis3d/utils/objecthelper.cpp
+++ b/src/utils/objecthelper.cpp
diff --git a/src/datavis3d/utils/objecthelper_p.h b/src/utils/objecthelper_p.h
index f3e342ba..f3e342ba 100644
--- a/src/datavis3d/utils/objecthelper_p.h
+++ b/src/utils/objecthelper_p.h
diff --git a/src/datavis3d/utils/shaderhelper.cpp b/src/utils/shaderhelper.cpp
index f08daff0..f08daff0 100644
--- a/src/datavis3d/utils/shaderhelper.cpp
+++ b/src/utils/shaderhelper.cpp
diff --git a/src/datavis3d/utils/shaderhelper_p.h b/src/utils/shaderhelper_p.h
index d1c72ba5..d1c72ba5 100644
--- a/src/datavis3d/utils/shaderhelper_p.h
+++ b/src/utils/shaderhelper_p.h
diff --git a/src/datavis3d/utils/texturehelper.cpp b/src/utils/texturehelper.cpp
index 808ac309..808ac309 100644
--- a/src/datavis3d/utils/texturehelper.cpp
+++ b/src/utils/texturehelper.cpp
diff --git a/src/datavis3d/utils/texturehelper_p.h b/src/utils/texturehelper_p.h
index ea9ef03b..ea9ef03b 100644
--- a/src/datavis3d/utils/texturehelper_p.h
+++ b/src/utils/texturehelper_p.h
diff --git a/src/datavis3d/utils/utils.cpp b/src/utils/utils.cpp
index 7b4cb6f6..7b4cb6f6 100644
--- a/src/datavis3d/utils/utils.cpp
+++ b/src/utils/utils.cpp
diff --git a/src/datavis3d/utils/utils.pri b/src/utils/utils.pri
index 566af55f..566af55f 100644
--- a/src/datavis3d/utils/utils.pri
+++ b/src/utils/utils.pri
diff --git a/src/datavis3d/utils/utils_p.h b/src/utils/utils_p.h
index 1668ac40..1668ac40 100644
--- a/src/datavis3d/utils/utils_p.h
+++ b/src/utils/utils_p.h
diff --git a/src/datavis3d/utils/vertexindexer.cpp b/src/utils/vertexindexer.cpp
index 7e5a863f..7e5a863f 100644
--- a/src/datavis3d/utils/vertexindexer.cpp
+++ b/src/utils/vertexindexer.cpp
diff --git a/src/datavis3d/utils/vertexindexer_p.h b/src/utils/vertexindexer_p.h
index 3ee908af..3ee908af 100644
--- a/src/datavis3d/utils/vertexindexer_p.h
+++ b/src/utils/vertexindexer_p.h