Browse Source

Removed obsolete QML extension for QtCreator

Michaël Lemaire 4 years ago
parent
commit
a36570f5a6
90 changed files with 58 additions and 148 deletions
  1. 4 4
      Makefile
  2. 6 6
      README.md
  3. 0 0
      src/interface/modeler/AtmosphereModeler.cpp
  4. 0 0
      src/interface/modeler/AtmosphereModeler.h
  5. 0 0
      src/interface/modeler/FloatPropertyBind.cpp
  6. 0 0
      src/interface/modeler/FloatPropertyBind.h
  7. 0 0
      src/interface/modeler/IntPropertyBind.cpp
  8. 0 0
      src/interface/modeler/IntPropertyBind.h
  9. 0 0
      src/interface/modeler/MainModelerWindow.cpp
  10. 0 0
      src/interface/modeler/MainModelerWindow.h
  11. 0 0
      src/interface/modeler/ModelerCameras.cpp
  12. 0 0
      src/interface/modeler/ModelerCameras.h
  13. 0 0
      src/interface/modeler/OpenGLView.cpp
  14. 0 0
      src/interface/modeler/OpenGLView.h
  15. 0 0
      src/interface/modeler/PropertyBind.cpp
  16. 0 0
      src/interface/modeler/PropertyBind.h
  17. 0 0
      src/interface/modeler/RenderPreviewProvider.cpp
  18. 0 0
      src/interface/modeler/RenderPreviewProvider.h
  19. 0 0
      src/interface/modeler/RenderProcess.cpp
  20. 0 0
      src/interface/modeler/RenderProcess.h
  21. 0 0
      src/interface/modeler/WaterModeler.cpp
  22. 0 0
      src/interface/modeler/WaterModeler.h
  23. 0 0
      src/interface/modeler/deployment.pri
  24. 0 29
      src/interface/modeler/extension/extension.pro
  25. 0 9
      src/interface/modeler/extension/extension_plugin.cpp
  26. 0 14
      src/interface/modeler/extension/extension_plugin.h
  27. 0 12
      src/interface/modeler/extension/paysages.cpp
  28. 0 15
      src/interface/modeler/extension/paysages.h
  29. 0 3
      src/interface/modeler/extension/qmldir
  30. 0 0
      src/interface/modeler/images.qrc
  31. 0 0
      src/interface/modeler/main.cpp
  32. 48 4
      src/interface/modeler/modeler.pro
  33. 0 0
      src/interface/modeler/modeler_global.h
  34. 0 0
      src/interface/modeler/qml.qrc
  35. 0 0
      src/interface/modeler/qml/AtmosphereSection.qml
  36. 0 0
      src/interface/modeler/qml/BaseChoice.qml
  37. 0 0
      src/interface/modeler/qml/BaseChoiceItem.qml
  38. 0 0
      src/interface/modeler/qml/BasePanel.qml
  39. 0 0
      src/interface/modeler/qml/BaseRectangle.qml
  40. 0 0
      src/interface/modeler/qml/BaseSecondaryToolbar.qml
  41. 0 0
      src/interface/modeler/qml/BaseSection.qml
  42. 0 0
      src/interface/modeler/qml/BaseSlider.qml
  43. 0 0
      src/interface/modeler/qml/BaseToolbar.qml
  44. 0 0
      src/interface/modeler/qml/CameraChoice.qml
  45. 0 0
      src/interface/modeler/qml/ClickableImage.qml
  46. 0 0
      src/interface/modeler/qml/OpenGLView.qml
  47. 0 0
      src/interface/modeler/qml/PanelAtmosphereDaytime.qml
  48. 0 0
      src/interface/modeler/qml/PanelPictureChoice.qml
  49. 0 0
      src/interface/modeler/qml/PanelSimpleFloat.qml
  50. 0 0
      src/interface/modeler/qml/PictureChoiceItem.qml
  51. 0 0
      src/interface/modeler/qml/RenderDialog.qml
  52. 0 0
      src/interface/modeler/qml/ToolbarButton.qml
  53. 0 0
      src/interface/modeler/qml/Tooltip.qml
  54. 0 0
      src/interface/modeler/qml/WaterSection.qml
  55. 0 0
      src/interface/modeler/qml/app.qrc
  56. 0 0
      src/interface/modeler/qml/images/arrow_down.png
  57. 0 0
      src/interface/modeler/qml/images/arrow_up.png
  58. 0 0
      src/interface/modeler/qml/images/display_topdown.png
  59. 0 0
      src/interface/modeler/qml/images/help.png
  60. 0 0
      src/interface/modeler/qml/images/icon_atmosphere.png
  61. 0 0
      src/interface/modeler/qml/images/icon_atmosphere_day.png
  62. 0 0
      src/interface/modeler/qml/images/icon_atmosphere_daytime.png
  63. 0 0
      src/interface/modeler/qml/images/icon_atmosphere_night.png
  64. 0 0
      src/interface/modeler/qml/images/icon_cancel.png
  65. 0 0
      src/interface/modeler/qml/images/icon_exit.png
  66. 0 0
      src/interface/modeler/qml/images/icon_file_load.png
  67. 0 0
      src/interface/modeler/qml/images/icon_file_new.png
  68. 0 0
      src/interface/modeler/qml/images/icon_file_save.png
  69. 0 0
      src/interface/modeler/qml/images/icon_preset.png
  70. 0 0
      src/interface/modeler/qml/images/icon_render_final.png
  71. 0 0
      src/interface/modeler/qml/images/icon_render_medium.png
  72. 0 0
      src/interface/modeler/qml/images/icon_render_quick.png
  73. 0 0
      src/interface/modeler/qml/images/icon_render_show.png
  74. 0 0
      src/interface/modeler/qml/images/icon_sun_radius.png
  75. 0 0
      src/interface/modeler/qml/images/icon_water.png
  76. 0 0
      src/interface/modeler/qml/images/icon_water_level.png
  77. 0 0
      src/interface/modeler/qml/images/icon_water_reflection.png
  78. 0 0
      src/interface/modeler/qml/images/preset_water_lake.jpg
  79. 0 0
      src/interface/modeler/qml/images/preset_water_sea.jpg
  80. 0 0
      src/interface/modeler/qml/images/tab_atmosphere.png
  81. 0 0
      src/interface/modeler/qml/images/tab_clouds.png
  82. 0 0
      src/interface/modeler/qml/images/tab_display.png
  83. 0 0
      src/interface/modeler/qml/images/tab_file.png
  84. 0 0
      src/interface/modeler/qml/images/tab_render.png
  85. 0 0
      src/interface/modeler/qml/images/tab_terrain.png
  86. 0 0
      src/interface/modeler/qml/images/tab_textures.png
  87. 0 0
      src/interface/modeler/qml/images/tab_water.png
  88. 0 0
      src/interface/modeler/qml/images/toggle_water.png
  89. 0 0
      src/interface/modeler/qml/main.qml
  90. 0 52
      src/interface/modeler/quickapp/quickapp.pro

+ 4 - 4
Makefile

@@ -49,13 +49,13 @@ else
 endif
 
 run:build
-	LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/interface/modeler/quickapp/paysages-modeler $(ARGS)
+	LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/interface/modeler/paysages-modeler $(ARGS)
 
 run_cli:build
 	LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/interface/commandline/paysages-cli $(ARGS)
 
 profile:build
-	LD_LIBRARY_PATH=${LIBRARY_PATH} perf record -g ${BUILDPATH}/interface/modeler/quickapp/paysages-modeler $(ARGS)
+	LD_LIBRARY_PATH=${LIBRARY_PATH} perf record -g ${BUILDPATH}/interface/modeler/paysages-modeler $(ARGS)
 	perf report -g
 
 profile_cli:build
@@ -64,7 +64,7 @@ profile_cli:build
 
 gltrace:build
 	rm -f *.trace
-	LD_PRELOAD="$(wildcard /usr/lib/x86_64-linux-gnu/apitrace/wrappers/glxtrace.so /usr/local/lib/x86_64-linux-gnu/apitrace/wrappers/glxtrace.so)" LD_LIBRARY_PATH=$(LIBRARY_PATH) ${BUILDPATH}/interface/modeler/quickapp/paysages-modeler $(ARGS)
+	LD_PRELOAD="$(wildcard /usr/lib/x86_64-linux-gnu/apitrace/wrappers/glxtrace.so /usr/local/lib/x86_64-linux-gnu/apitrace/wrappers/glxtrace.so)" LD_LIBRARY_PATH=$(LIBRARY_PATH) ${BUILDPATH}/interface/modeler/paysages-modeler $(ARGS)
 	qapitrace paysages-modeler.trace
 
 package:build
@@ -78,7 +78,7 @@ package:build
 	cp $(BUILDPATH)/render/software/libpaysages_render_software.so* paysages3d-linux/lib/
 	cp $(BUILDPATH)/render/preview/libpaysages_render_preview.so* paysages3d-linux/lib/
 	cp $(BUILDPATH)/render/opengl/libpaysages_render_opengl.so* paysages3d-linux/lib/
-	cp $(BUILDPATH)/interface/modeler/quickapp/paysages-modeler paysages3d-linux/lib/
+	cp $(BUILDPATH)/interface/modeler/paysages-modeler paysages3d-linux/lib/
 	chmod +x paysages3d-linux/lib/paysages-modeler
 	cp -r data paysages3d-linux/
 	cp dist/paysages3d.sh paysages3d-linux/

+ 6 - 6
README.md

@@ -16,20 +16,20 @@ It is written in C++ 11, using Qt 5.4 as only external dependency.
 
 ### Using QtSDK (All platforms)
 
-Download and install the latest [QtSDK](http://qt-project.org/downloads).
+Download and install the latest [QtSDK](http://qt.io/download).
 
 Launch QtCreator, open the project file *src/paysages.pro* and build it.
 
-To run the program, choose the *quickapp* target.
+To run the program, choose the *modeler* target.
 To run the unit tests, choose the *tests* target.
 
 ### Using a packaged Qt (Linux)
 
-You need at least the 5.4 packaged version of Qt, with qMake and QtCore, QtGui and QtOpengl modules.
+You need at least the 5.4 packaged version of Qt, with qMake and QtCore, QtQuick and QtOpengl modules.
 
 On Ubuntu/Mint:
 
-    sudo apt-get install qt5-qmake libqt5core5a libqt5gui5 libqt5widgets5 libqt5opengl5-dev
+    sudo apt-get install qt5-qmake libqt5core5a libqt5quick5 libqt5qml5 libqt5opengl5-dev
 
 Then to build and run the software:
 
@@ -49,5 +49,5 @@ The source code is subject to the terms of the [Mozilla Public License, v. 2.0](
 
 * [Michaël Lemaire](http://thunderk.net) - Main developer
 * [Eric Bruneton and Fabrice Neyet](http://www-evasion.imag.fr/Membres/Eric.Bruneton/) - Publication and source code from *Precomputed Atmospheric Scattering (2008)*
-* [Qt](http://qt-project.org/) - Base framework
-* [GoogleTest](https://code.google.com/p/googletest/) - Used for unit testing
+* [Qt](http://qt.io/) - Base framework
+* [GoogleTest](https://github.com/google/googletest/) - Used for unit testing

src/interface/modeler/quickapp/AtmosphereModeler.cpp → src/interface/modeler/AtmosphereModeler.cpp


src/interface/modeler/quickapp/AtmosphereModeler.h → src/interface/modeler/AtmosphereModeler.h


src/interface/modeler/quickapp/FloatPropertyBind.cpp → src/interface/modeler/FloatPropertyBind.cpp


src/interface/modeler/quickapp/FloatPropertyBind.h → src/interface/modeler/FloatPropertyBind.h


src/interface/modeler/quickapp/IntPropertyBind.cpp → src/interface/modeler/IntPropertyBind.cpp


src/interface/modeler/quickapp/IntPropertyBind.h → src/interface/modeler/IntPropertyBind.h


src/interface/modeler/quickapp/MainModelerWindow.cpp → src/interface/modeler/MainModelerWindow.cpp


src/interface/modeler/quickapp/MainModelerWindow.h → src/interface/modeler/MainModelerWindow.h


src/interface/modeler/quickapp/ModelerCameras.cpp → src/interface/modeler/ModelerCameras.cpp


src/interface/modeler/quickapp/ModelerCameras.h → src/interface/modeler/ModelerCameras.h


src/interface/modeler/quickapp/OpenGLView.cpp → src/interface/modeler/OpenGLView.cpp


src/interface/modeler/quickapp/OpenGLView.h → src/interface/modeler/OpenGLView.h


src/interface/modeler/quickapp/PropertyBind.cpp → src/interface/modeler/PropertyBind.cpp


src/interface/modeler/quickapp/PropertyBind.h → src/interface/modeler/PropertyBind.h


src/interface/modeler/quickapp/RenderPreviewProvider.cpp → src/interface/modeler/RenderPreviewProvider.cpp


src/interface/modeler/quickapp/RenderPreviewProvider.h → src/interface/modeler/RenderPreviewProvider.h


src/interface/modeler/quickapp/RenderProcess.cpp → src/interface/modeler/RenderProcess.cpp


src/interface/modeler/quickapp/RenderProcess.h → src/interface/modeler/RenderProcess.h


src/interface/modeler/quickapp/WaterModeler.cpp → src/interface/modeler/WaterModeler.cpp


src/interface/modeler/quickapp/WaterModeler.h → src/interface/modeler/WaterModeler.h


src/interface/modeler/quickapp/deployment.pri → src/interface/modeler/deployment.pri


+ 0 - 29
src/interface/modeler/extension/extension.pro

@@ -1,29 +0,0 @@
-TEMPLATE = lib
-TARGET = extension
-QT += qml quick
-CONFIG += qt plugin
-
-TARGET = $$qtLibraryTarget($$TARGET)
-uri = Paysages
-
-SOURCES += $$files(*.cpp)
-HEADERS += $$files(*.h)
-
-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
-unix {
-    installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
-    qmldir.path = $$installPath
-    target.path = $$installPath
-    INSTALLS += target qmldir
-}
-

+ 0 - 9
src/interface/modeler/extension/extension_plugin.cpp

@@ -1,9 +0,0 @@
-#include "extension_plugin.h"
-#include "paysages.h"
-
-#include <qqml.h>
-
-void ExtensionPlugin::registerTypes(const char *uri) {
-    // @uri Paysages
-    qmlRegisterType<Paysages>(uri, 1, 0, "Paysages");
-}

+ 0 - 14
src/interface/modeler/extension/extension_plugin.h

@@ -1,14 +0,0 @@
-#ifndef EXTENSION_PLUGIN_H
-#define EXTENSION_PLUGIN_H
-
-#include <QQmlExtensionPlugin>
-
-class ExtensionPlugin : public QQmlExtensionPlugin {
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-
-  public:
-    void registerTypes(const char *uri);
-};
-
-#endif // EXTENSION_PLUGIN_H

+ 0 - 12
src/interface/modeler/extension/paysages.cpp

@@ -1,12 +0,0 @@
-#include "paysages.h"
-
-Paysages::Paysages(QQuickItem *parent) : QQuickItem(parent) {
-    // By default, QQuickItem does not draw anything. If you subclass
-    // QQuickItem to create a visual item, you will need to uncomment the
-    // following line and re-implement updatePaintNode()
-
-    // setFlag(ItemHasContents, true);
-}
-
-Paysages::~Paysages() {
-}

+ 0 - 15
src/interface/modeler/extension/paysages.h

@@ -1,15 +0,0 @@
-#ifndef PAYSAGES_H
-#define PAYSAGES_H
-
-#include <QQuickItem>
-
-class Paysages : public QQuickItem {
-    Q_OBJECT
-    Q_DISABLE_COPY(Paysages)
-
-  public:
-    Paysages(QQuickItem *parent = 0);
-    ~Paysages();
-};
-
-#endif // PAYSAGES_H

+ 0 - 3
src/interface/modeler/extension/qmldir

@@ -1,3 +0,0 @@
-module Paysages
-plugin extension
-

src/interface/modeler/quickapp/images.qrc → src/interface/modeler/images.qrc


src/interface/modeler/quickapp/main.cpp → src/interface/modeler/main.cpp


+ 48 - 4
src/interface/modeler/modeler.pro

@@ -1,5 +1,49 @@
-TEMPLATE = subdirs
+TEMPLATE = app
 
-SUBDIRS = \
-    quickapp \
-    extension
+QT += qml quick
+
+include(../../common.pri)
+
+SOURCES += $$files(*.cpp)
+HEADERS += $$files(*.h)
+
+RESOURCES += \
+    qml/app.qrc
+
+TARGET = paysages-modeler
+
+# Default rules for deployment.
+include(deployment.pri)
+
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../system/release/ -lpaysages_system
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../system/debug/ -lpaysages_system
+else:unix: LIBS += -L$$OUT_PWD/../../system/ -lpaysages_system
+INCLUDEPATH += $$PWD/../../system
+DEPENDPATH += $$PWD/../../system
+
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../basics/release/ -lpaysages_basics
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../basics/debug/ -lpaysages_basics
+else:unix: LIBS += -L$$OUT_PWD/../../basics/ -lpaysages_basics
+INCLUDEPATH += $$PWD/../../basics
+DEPENDPATH += $$PWD/../../basics
+
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../definition/release/ -lpaysages_definition
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../definition/debug/ -lpaysages_definition
+else:unix: LIBS += -L$$OUT_PWD/../../definition/ -lpaysages_definition
+INCLUDEPATH += $$PWD/../../definition
+DEPENDPATH += $$PWD/../../definition
+
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../render/software/release/ -lpaysages_render_software
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../render/software/debug/ -lpaysages_render_software
+else:unix: LIBS += -L$$OUT_PWD/../../render/software/ -lpaysages_render_software
+INCLUDEPATH += $$PWD/../../render/software
+DEPENDPATH += $$PWD/../../render/software
+
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../render/opengl/release/ -lpaysages_render_opengl
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../render/opengl/debug/ -lpaysages_render_opengl
+else:unix: LIBS += -L$$OUT_PWD/../../render/opengl/ -lpaysages_render_opengl
+INCLUDEPATH += $$PWD/../../render/opengl
+DEPENDPATH += $$PWD/../../render/opengl
+
+OTHER_FILES += \
+    qml/*.qml

src/interface/modeler/quickapp/modeler_global.h → src/interface/modeler/modeler_global.h


src/interface/modeler/quickapp/qml.qrc → src/interface/modeler/qml.qrc


src/interface/modeler/quickapp/qml/AtmosphereSection.qml → src/interface/modeler/qml/AtmosphereSection.qml


src/interface/modeler/quickapp/qml/BaseChoice.qml → src/interface/modeler/qml/BaseChoice.qml


src/interface/modeler/quickapp/qml/BaseChoiceItem.qml → src/interface/modeler/qml/BaseChoiceItem.qml


src/interface/modeler/quickapp/qml/BasePanel.qml → src/interface/modeler/qml/BasePanel.qml


src/interface/modeler/quickapp/qml/BaseRectangle.qml → src/interface/modeler/qml/BaseRectangle.qml


src/interface/modeler/quickapp/qml/BaseSecondaryToolbar.qml → src/interface/modeler/qml/BaseSecondaryToolbar.qml


src/interface/modeler/quickapp/qml/BaseSection.qml → src/interface/modeler/qml/BaseSection.qml


src/interface/modeler/quickapp/qml/BaseSlider.qml → src/interface/modeler/qml/BaseSlider.qml


src/interface/modeler/quickapp/qml/BaseToolbar.qml → src/interface/modeler/qml/BaseToolbar.qml


src/interface/modeler/quickapp/qml/CameraChoice.qml → src/interface/modeler/qml/CameraChoice.qml


src/interface/modeler/quickapp/qml/ClickableImage.qml → src/interface/modeler/qml/ClickableImage.qml


src/interface/modeler/quickapp/qml/OpenGLView.qml → src/interface/modeler/qml/OpenGLView.qml


src/interface/modeler/quickapp/qml/PanelAtmosphereDaytime.qml → src/interface/modeler/qml/PanelAtmosphereDaytime.qml


src/interface/modeler/quickapp/qml/PanelPictureChoice.qml → src/interface/modeler/qml/PanelPictureChoice.qml


src/interface/modeler/quickapp/qml/PanelSimpleFloat.qml → src/interface/modeler/qml/PanelSimpleFloat.qml


src/interface/modeler/quickapp/qml/PictureChoiceItem.qml → src/interface/modeler/qml/PictureChoiceItem.qml


src/interface/modeler/quickapp/qml/RenderDialog.qml → src/interface/modeler/qml/RenderDialog.qml


src/interface/modeler/quickapp/qml/ToolbarButton.qml → src/interface/modeler/qml/ToolbarButton.qml


src/interface/modeler/quickapp/qml/Tooltip.qml → src/interface/modeler/qml/Tooltip.qml


src/interface/modeler/quickapp/qml/WaterSection.qml → src/interface/modeler/qml/WaterSection.qml


src/interface/modeler/quickapp/qml/app.qrc → src/interface/modeler/qml/app.qrc


src/interface/modeler/quickapp/qml/images/arrow_down.png → src/interface/modeler/qml/images/arrow_down.png


src/interface/modeler/quickapp/qml/images/arrow_up.png → src/interface/modeler/qml/images/arrow_up.png


src/interface/modeler/quickapp/qml/images/display_topdown.png → src/interface/modeler/qml/images/display_topdown.png


src/interface/modeler/quickapp/qml/images/help.png → src/interface/modeler/qml/images/help.png


src/interface/modeler/quickapp/qml/images/icon_atmosphere.png → src/interface/modeler/qml/images/icon_atmosphere.png


src/interface/modeler/quickapp/qml/images/icon_atmosphere_day.png → src/interface/modeler/qml/images/icon_atmosphere_day.png


src/interface/modeler/quickapp/qml/images/icon_atmosphere_daytime.png → src/interface/modeler/qml/images/icon_atmosphere_daytime.png


src/interface/modeler/quickapp/qml/images/icon_atmosphere_night.png → src/interface/modeler/qml/images/icon_atmosphere_night.png


src/interface/modeler/quickapp/qml/images/icon_cancel.png → src/interface/modeler/qml/images/icon_cancel.png


src/interface/modeler/quickapp/qml/images/icon_exit.png → src/interface/modeler/qml/images/icon_exit.png


src/interface/modeler/quickapp/qml/images/icon_file_load.png → src/interface/modeler/qml/images/icon_file_load.png


src/interface/modeler/quickapp/qml/images/icon_file_new.png → src/interface/modeler/qml/images/icon_file_new.png


src/interface/modeler/quickapp/qml/images/icon_file_save.png → src/interface/modeler/qml/images/icon_file_save.png


src/interface/modeler/quickapp/qml/images/icon_preset.png → src/interface/modeler/qml/images/icon_preset.png


src/interface/modeler/quickapp/qml/images/icon_render_final.png → src/interface/modeler/qml/images/icon_render_final.png


src/interface/modeler/quickapp/qml/images/icon_render_medium.png → src/interface/modeler/qml/images/icon_render_medium.png


src/interface/modeler/quickapp/qml/images/icon_render_quick.png → src/interface/modeler/qml/images/icon_render_quick.png


src/interface/modeler/quickapp/qml/images/icon_render_show.png → src/interface/modeler/qml/images/icon_render_show.png


src/interface/modeler/quickapp/qml/images/icon_sun_radius.png → src/interface/modeler/qml/images/icon_sun_radius.png


src/interface/modeler/quickapp/qml/images/icon_water.png → src/interface/modeler/qml/images/icon_water.png


src/interface/modeler/quickapp/qml/images/icon_water_level.png → src/interface/modeler/qml/images/icon_water_level.png


src/interface/modeler/quickapp/qml/images/icon_water_reflection.png → src/interface/modeler/qml/images/icon_water_reflection.png


src/interface/modeler/quickapp/qml/images/preset_water_lake.jpg → src/interface/modeler/qml/images/preset_water_lake.jpg


src/interface/modeler/quickapp/qml/images/preset_water_sea.jpg → src/interface/modeler/qml/images/preset_water_sea.jpg


src/interface/modeler/quickapp/qml/images/tab_atmosphere.png → src/interface/modeler/qml/images/tab_atmosphere.png


src/interface/modeler/quickapp/qml/images/tab_clouds.png → src/interface/modeler/qml/images/tab_clouds.png


src/interface/modeler/quickapp/qml/images/tab_display.png → src/interface/modeler/qml/images/tab_display.png


src/interface/modeler/quickapp/qml/images/tab_file.png → src/interface/modeler/qml/images/tab_file.png


src/interface/modeler/quickapp/qml/images/tab_render.png → src/interface/modeler/qml/images/tab_render.png


src/interface/modeler/quickapp/qml/images/tab_terrain.png → src/interface/modeler/qml/images/tab_terrain.png


src/interface/modeler/quickapp/qml/images/tab_textures.png → src/interface/modeler/qml/images/tab_textures.png


src/interface/modeler/quickapp/qml/images/tab_water.png → src/interface/modeler/qml/images/tab_water.png


src/interface/modeler/quickapp/qml/images/toggle_water.png → src/interface/modeler/qml/images/toggle_water.png


src/interface/modeler/quickapp/qml/main.qml → src/interface/modeler/qml/main.qml


+ 0 - 52
src/interface/modeler/quickapp/quickapp.pro

@@ -1,52 +0,0 @@
-TEMPLATE = app
-
-QT += qml quick widgets
-
-include(../../../common.pri)
-
-SOURCES += $$files(*.cpp)
-HEADERS += $$files(*.h)
-
-RESOURCES += \
-    qml/app.qrc
-
-TARGET = paysages-modeler
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH = ../extension
-
-# Default rules for deployment.
-include(deployment.pri)
-
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../../system/release/ -lpaysages_system
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../../system/debug/ -lpaysages_system
-else:unix: LIBS += -L$$OUT_PWD/../../../system/ -lpaysages_system
-INCLUDEPATH += $$PWD/../../../system
-DEPENDPATH += $$PWD/../../../system
-
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../../basics/release/ -lpaysages_basics
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../../basics/debug/ -lpaysages_basics
-else:unix: LIBS += -L$$OUT_PWD/../../../basics/ -lpaysages_basics
-INCLUDEPATH += $$PWD/../../../basics
-DEPENDPATH += $$PWD/../../../basics
-
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../../definition/release/ -lpaysages_definition
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../../definition/debug/ -lpaysages_definition
-else:unix: LIBS += -L$$OUT_PWD/../../../definition/ -lpaysages_definition
-INCLUDEPATH += $$PWD/../../../definition
-DEPENDPATH += $$PWD/../../../definition
-
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../../render/software/release/ -lpaysages_render_software
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../../render/software/debug/ -lpaysages_render_software
-else:unix: LIBS += -L$$OUT_PWD/../../../render/software/ -lpaysages_render_software
-INCLUDEPATH += $$PWD/../../../render/software
-DEPENDPATH += $$PWD/../../../render/software
-
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../../render/opengl/release/ -lpaysages_render_opengl
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../../render/opengl/debug/ -lpaysages_render_opengl
-else:unix: LIBS += -L$$OUT_PWD/../../../render/opengl/ -lpaysages_render_opengl
-INCLUDEPATH += $$PWD/../../../render/opengl
-DEPENDPATH += $$PWD/../../../render/opengl
-
-OTHER_FILES += \
-    qml/*.qml