From a36570f5a611a04ade4f98b25ca9d2926a97e5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Mon, 14 Dec 2015 19:39:00 +0100 Subject: [PATCH] Removed obsolete QML extension for QtCreator --- Makefile | 8 +-- README.md | 12 ++-- .../{quickapp => }/AtmosphereModeler.cpp | 0 .../{quickapp => }/AtmosphereModeler.h | 0 .../{quickapp => }/FloatPropertyBind.cpp | 0 .../{quickapp => }/FloatPropertyBind.h | 0 .../{quickapp => }/IntPropertyBind.cpp | 0 .../modeler/{quickapp => }/IntPropertyBind.h | 0 .../{quickapp => }/MainModelerWindow.cpp | 0 .../{quickapp => }/MainModelerWindow.h | 0 .../modeler/{quickapp => }/ModelerCameras.cpp | 0 .../modeler/{quickapp => }/ModelerCameras.h | 0 .../modeler/{quickapp => }/OpenGLView.cpp | 0 .../modeler/{quickapp => }/OpenGLView.h | 0 .../modeler/{quickapp => }/PropertyBind.cpp | 0 .../modeler/{quickapp => }/PropertyBind.h | 0 .../{quickapp => }/RenderPreviewProvider.cpp | 0 .../{quickapp => }/RenderPreviewProvider.h | 0 .../modeler/{quickapp => }/RenderProcess.cpp | 0 .../modeler/{quickapp => }/RenderProcess.h | 0 .../modeler/{quickapp => }/WaterModeler.cpp | 0 .../modeler/{quickapp => }/WaterModeler.h | 0 .../modeler/{quickapp => }/deployment.pri | 0 src/interface/modeler/extension/extension.pro | 29 ---------- .../modeler/extension/extension_plugin.cpp | 9 --- .../modeler/extension/extension_plugin.h | 14 ----- src/interface/modeler/extension/paysages.cpp | 12 ---- src/interface/modeler/extension/paysages.h | 15 ----- src/interface/modeler/extension/qmldir | 3 - .../modeler/{quickapp => }/images.qrc | 0 src/interface/modeler/{quickapp => }/main.cpp | 0 src/interface/modeler/modeler.pro | 52 ++++++++++++++++-- .../modeler/{quickapp => }/modeler_global.h | 0 src/interface/modeler/{quickapp => }/qml.qrc | 0 .../{quickapp => }/qml/AtmosphereSection.qml | 0 .../modeler/{quickapp => }/qml/BaseChoice.qml | 0 .../{quickapp => }/qml/BaseChoiceItem.qml | 0 .../modeler/{quickapp => }/qml/BasePanel.qml | 0 .../{quickapp => }/qml/BaseRectangle.qml | 0 .../qml/BaseSecondaryToolbar.qml | 0 .../{quickapp => }/qml/BaseSection.qml | 0 .../modeler/{quickapp => }/qml/BaseSlider.qml | 0 .../{quickapp => }/qml/BaseToolbar.qml | 0 .../{quickapp => }/qml/CameraChoice.qml | 0 .../{quickapp => }/qml/ClickableImage.qml | 0 .../modeler/{quickapp => }/qml/OpenGLView.qml | 0 .../qml/PanelAtmosphereDaytime.qml | 0 .../{quickapp => }/qml/PanelPictureChoice.qml | 0 .../{quickapp => }/qml/PanelSimpleFloat.qml | 0 .../{quickapp => }/qml/PictureChoiceItem.qml | 0 .../{quickapp => }/qml/RenderDialog.qml | 0 .../{quickapp => }/qml/ToolbarButton.qml | 0 .../modeler/{quickapp => }/qml/Tooltip.qml | 0 .../{quickapp => }/qml/WaterSection.qml | 0 .../modeler/{quickapp => }/qml/app.qrc | 0 .../{quickapp => }/qml/images/arrow_down.png | Bin .../{quickapp => }/qml/images/arrow_up.png | Bin .../qml/images/display_topdown.png | Bin .../{quickapp => }/qml/images/help.png | Bin .../qml/images/icon_atmosphere.png | Bin .../qml/images/icon_atmosphere_day.png | Bin .../qml/images/icon_atmosphere_daytime.png | Bin .../qml/images/icon_atmosphere_night.png | Bin .../{quickapp => }/qml/images/icon_cancel.png | Bin .../{quickapp => }/qml/images/icon_exit.png | Bin .../qml/images/icon_file_load.png | Bin .../qml/images/icon_file_new.png | Bin .../qml/images/icon_file_save.png | Bin .../{quickapp => }/qml/images/icon_preset.png | Bin .../qml/images/icon_render_final.png | Bin .../qml/images/icon_render_medium.png | Bin .../qml/images/icon_render_quick.png | Bin .../qml/images/icon_render_show.png | Bin .../qml/images/icon_sun_radius.png | Bin .../{quickapp => }/qml/images/icon_water.png | Bin .../qml/images/icon_water_level.png | Bin .../qml/images/icon_water_reflection.png | Bin .../qml/images/preset_water_lake.jpg | Bin .../qml/images/preset_water_sea.jpg | Bin .../qml/images/tab_atmosphere.png | Bin .../{quickapp => }/qml/images/tab_clouds.png | Bin .../{quickapp => }/qml/images/tab_display.png | Bin .../{quickapp => }/qml/images/tab_file.png | Bin .../{quickapp => }/qml/images/tab_render.png | Bin .../{quickapp => }/qml/images/tab_terrain.png | Bin .../qml/images/tab_textures.png | Bin .../{quickapp => }/qml/images/tab_water.png | Bin .../qml/images/toggle_water.png | Bin .../modeler/{quickapp => }/qml/main.qml | 0 src/interface/modeler/quickapp/quickapp.pro | 52 ------------------ 90 files changed, 58 insertions(+), 148 deletions(-) rename src/interface/modeler/{quickapp => }/AtmosphereModeler.cpp (100%) rename src/interface/modeler/{quickapp => }/AtmosphereModeler.h (100%) rename src/interface/modeler/{quickapp => }/FloatPropertyBind.cpp (100%) rename src/interface/modeler/{quickapp => }/FloatPropertyBind.h (100%) rename src/interface/modeler/{quickapp => }/IntPropertyBind.cpp (100%) rename src/interface/modeler/{quickapp => }/IntPropertyBind.h (100%) rename src/interface/modeler/{quickapp => }/MainModelerWindow.cpp (100%) rename src/interface/modeler/{quickapp => }/MainModelerWindow.h (100%) rename src/interface/modeler/{quickapp => }/ModelerCameras.cpp (100%) rename src/interface/modeler/{quickapp => }/ModelerCameras.h (100%) rename src/interface/modeler/{quickapp => }/OpenGLView.cpp (100%) rename src/interface/modeler/{quickapp => }/OpenGLView.h (100%) rename src/interface/modeler/{quickapp => }/PropertyBind.cpp (100%) rename src/interface/modeler/{quickapp => }/PropertyBind.h (100%) rename src/interface/modeler/{quickapp => }/RenderPreviewProvider.cpp (100%) rename src/interface/modeler/{quickapp => }/RenderPreviewProvider.h (100%) rename src/interface/modeler/{quickapp => }/RenderProcess.cpp (100%) rename src/interface/modeler/{quickapp => }/RenderProcess.h (100%) rename src/interface/modeler/{quickapp => }/WaterModeler.cpp (100%) rename src/interface/modeler/{quickapp => }/WaterModeler.h (100%) rename src/interface/modeler/{quickapp => }/deployment.pri (100%) delete mode 100644 src/interface/modeler/extension/extension.pro delete mode 100644 src/interface/modeler/extension/extension_plugin.cpp delete mode 100644 src/interface/modeler/extension/extension_plugin.h delete mode 100644 src/interface/modeler/extension/paysages.cpp delete mode 100644 src/interface/modeler/extension/paysages.h delete mode 100644 src/interface/modeler/extension/qmldir rename src/interface/modeler/{quickapp => }/images.qrc (100%) rename src/interface/modeler/{quickapp => }/main.cpp (100%) rename src/interface/modeler/{quickapp => }/modeler_global.h (100%) rename src/interface/modeler/{quickapp => }/qml.qrc (100%) rename src/interface/modeler/{quickapp => }/qml/AtmosphereSection.qml (100%) rename src/interface/modeler/{quickapp => }/qml/BaseChoice.qml (100%) rename src/interface/modeler/{quickapp => }/qml/BaseChoiceItem.qml (100%) rename src/interface/modeler/{quickapp => }/qml/BasePanel.qml (100%) rename src/interface/modeler/{quickapp => }/qml/BaseRectangle.qml (100%) rename src/interface/modeler/{quickapp => }/qml/BaseSecondaryToolbar.qml (100%) rename src/interface/modeler/{quickapp => }/qml/BaseSection.qml (100%) rename src/interface/modeler/{quickapp => }/qml/BaseSlider.qml (100%) rename src/interface/modeler/{quickapp => }/qml/BaseToolbar.qml (100%) rename src/interface/modeler/{quickapp => }/qml/CameraChoice.qml (100%) rename src/interface/modeler/{quickapp => }/qml/ClickableImage.qml (100%) rename src/interface/modeler/{quickapp => }/qml/OpenGLView.qml (100%) rename src/interface/modeler/{quickapp => }/qml/PanelAtmosphereDaytime.qml (100%) rename src/interface/modeler/{quickapp => }/qml/PanelPictureChoice.qml (100%) rename src/interface/modeler/{quickapp => }/qml/PanelSimpleFloat.qml (100%) rename src/interface/modeler/{quickapp => }/qml/PictureChoiceItem.qml (100%) rename src/interface/modeler/{quickapp => }/qml/RenderDialog.qml (100%) rename src/interface/modeler/{quickapp => }/qml/ToolbarButton.qml (100%) rename src/interface/modeler/{quickapp => }/qml/Tooltip.qml (100%) rename src/interface/modeler/{quickapp => }/qml/WaterSection.qml (100%) rename src/interface/modeler/{quickapp => }/qml/app.qrc (100%) rename src/interface/modeler/{quickapp => }/qml/images/arrow_down.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/arrow_up.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/display_topdown.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/help.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_atmosphere.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_atmosphere_day.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_atmosphere_daytime.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_atmosphere_night.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_cancel.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_exit.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_file_load.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_file_new.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_file_save.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_preset.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_render_final.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_render_medium.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_render_quick.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_render_show.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_sun_radius.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_water.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_water_level.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/icon_water_reflection.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/preset_water_lake.jpg (100%) rename src/interface/modeler/{quickapp => }/qml/images/preset_water_sea.jpg (100%) rename src/interface/modeler/{quickapp => }/qml/images/tab_atmosphere.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/tab_clouds.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/tab_display.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/tab_file.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/tab_render.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/tab_terrain.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/tab_textures.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/tab_water.png (100%) rename src/interface/modeler/{quickapp => }/qml/images/toggle_water.png (100%) rename src/interface/modeler/{quickapp => }/qml/main.qml (100%) delete mode 100644 src/interface/modeler/quickapp/quickapp.pro diff --git a/Makefile b/Makefile index 77a229b..8a53c4d 100644 --- a/Makefile +++ b/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/ diff --git a/README.md b/README.md index 6b10d4f..892454e 100644 --- a/README.md +++ b/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 diff --git a/src/interface/modeler/quickapp/AtmosphereModeler.cpp b/src/interface/modeler/AtmosphereModeler.cpp similarity index 100% rename from src/interface/modeler/quickapp/AtmosphereModeler.cpp rename to src/interface/modeler/AtmosphereModeler.cpp diff --git a/src/interface/modeler/quickapp/AtmosphereModeler.h b/src/interface/modeler/AtmosphereModeler.h similarity index 100% rename from src/interface/modeler/quickapp/AtmosphereModeler.h rename to src/interface/modeler/AtmosphereModeler.h diff --git a/src/interface/modeler/quickapp/FloatPropertyBind.cpp b/src/interface/modeler/FloatPropertyBind.cpp similarity index 100% rename from src/interface/modeler/quickapp/FloatPropertyBind.cpp rename to src/interface/modeler/FloatPropertyBind.cpp diff --git a/src/interface/modeler/quickapp/FloatPropertyBind.h b/src/interface/modeler/FloatPropertyBind.h similarity index 100% rename from src/interface/modeler/quickapp/FloatPropertyBind.h rename to src/interface/modeler/FloatPropertyBind.h diff --git a/src/interface/modeler/quickapp/IntPropertyBind.cpp b/src/interface/modeler/IntPropertyBind.cpp similarity index 100% rename from src/interface/modeler/quickapp/IntPropertyBind.cpp rename to src/interface/modeler/IntPropertyBind.cpp diff --git a/src/interface/modeler/quickapp/IntPropertyBind.h b/src/interface/modeler/IntPropertyBind.h similarity index 100% rename from src/interface/modeler/quickapp/IntPropertyBind.h rename to src/interface/modeler/IntPropertyBind.h diff --git a/src/interface/modeler/quickapp/MainModelerWindow.cpp b/src/interface/modeler/MainModelerWindow.cpp similarity index 100% rename from src/interface/modeler/quickapp/MainModelerWindow.cpp rename to src/interface/modeler/MainModelerWindow.cpp diff --git a/src/interface/modeler/quickapp/MainModelerWindow.h b/src/interface/modeler/MainModelerWindow.h similarity index 100% rename from src/interface/modeler/quickapp/MainModelerWindow.h rename to src/interface/modeler/MainModelerWindow.h diff --git a/src/interface/modeler/quickapp/ModelerCameras.cpp b/src/interface/modeler/ModelerCameras.cpp similarity index 100% rename from src/interface/modeler/quickapp/ModelerCameras.cpp rename to src/interface/modeler/ModelerCameras.cpp diff --git a/src/interface/modeler/quickapp/ModelerCameras.h b/src/interface/modeler/ModelerCameras.h similarity index 100% rename from src/interface/modeler/quickapp/ModelerCameras.h rename to src/interface/modeler/ModelerCameras.h diff --git a/src/interface/modeler/quickapp/OpenGLView.cpp b/src/interface/modeler/OpenGLView.cpp similarity index 100% rename from src/interface/modeler/quickapp/OpenGLView.cpp rename to src/interface/modeler/OpenGLView.cpp diff --git a/src/interface/modeler/quickapp/OpenGLView.h b/src/interface/modeler/OpenGLView.h similarity index 100% rename from src/interface/modeler/quickapp/OpenGLView.h rename to src/interface/modeler/OpenGLView.h diff --git a/src/interface/modeler/quickapp/PropertyBind.cpp b/src/interface/modeler/PropertyBind.cpp similarity index 100% rename from src/interface/modeler/quickapp/PropertyBind.cpp rename to src/interface/modeler/PropertyBind.cpp diff --git a/src/interface/modeler/quickapp/PropertyBind.h b/src/interface/modeler/PropertyBind.h similarity index 100% rename from src/interface/modeler/quickapp/PropertyBind.h rename to src/interface/modeler/PropertyBind.h diff --git a/src/interface/modeler/quickapp/RenderPreviewProvider.cpp b/src/interface/modeler/RenderPreviewProvider.cpp similarity index 100% rename from src/interface/modeler/quickapp/RenderPreviewProvider.cpp rename to src/interface/modeler/RenderPreviewProvider.cpp diff --git a/src/interface/modeler/quickapp/RenderPreviewProvider.h b/src/interface/modeler/RenderPreviewProvider.h similarity index 100% rename from src/interface/modeler/quickapp/RenderPreviewProvider.h rename to src/interface/modeler/RenderPreviewProvider.h diff --git a/src/interface/modeler/quickapp/RenderProcess.cpp b/src/interface/modeler/RenderProcess.cpp similarity index 100% rename from src/interface/modeler/quickapp/RenderProcess.cpp rename to src/interface/modeler/RenderProcess.cpp diff --git a/src/interface/modeler/quickapp/RenderProcess.h b/src/interface/modeler/RenderProcess.h similarity index 100% rename from src/interface/modeler/quickapp/RenderProcess.h rename to src/interface/modeler/RenderProcess.h diff --git a/src/interface/modeler/quickapp/WaterModeler.cpp b/src/interface/modeler/WaterModeler.cpp similarity index 100% rename from src/interface/modeler/quickapp/WaterModeler.cpp rename to src/interface/modeler/WaterModeler.cpp diff --git a/src/interface/modeler/quickapp/WaterModeler.h b/src/interface/modeler/WaterModeler.h similarity index 100% rename from src/interface/modeler/quickapp/WaterModeler.h rename to src/interface/modeler/WaterModeler.h diff --git a/src/interface/modeler/quickapp/deployment.pri b/src/interface/modeler/deployment.pri similarity index 100% rename from src/interface/modeler/quickapp/deployment.pri rename to src/interface/modeler/deployment.pri diff --git a/src/interface/modeler/extension/extension.pro b/src/interface/modeler/extension/extension.pro deleted file mode 100644 index d52d747..0000000 --- a/src/interface/modeler/extension/extension.pro +++ /dev/null @@ -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 -} - diff --git a/src/interface/modeler/extension/extension_plugin.cpp b/src/interface/modeler/extension/extension_plugin.cpp deleted file mode 100644 index b056ea7..0000000 --- a/src/interface/modeler/extension/extension_plugin.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "extension_plugin.h" -#include "paysages.h" - -#include - -void ExtensionPlugin::registerTypes(const char *uri) { - // @uri Paysages - qmlRegisterType(uri, 1, 0, "Paysages"); -} diff --git a/src/interface/modeler/extension/extension_plugin.h b/src/interface/modeler/extension/extension_plugin.h deleted file mode 100644 index 0e950e6..0000000 --- a/src/interface/modeler/extension/extension_plugin.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef EXTENSION_PLUGIN_H -#define EXTENSION_PLUGIN_H - -#include - -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 diff --git a/src/interface/modeler/extension/paysages.cpp b/src/interface/modeler/extension/paysages.cpp deleted file mode 100644 index 3311ce3..0000000 --- a/src/interface/modeler/extension/paysages.cpp +++ /dev/null @@ -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() { -} diff --git a/src/interface/modeler/extension/paysages.h b/src/interface/modeler/extension/paysages.h deleted file mode 100644 index 8993c50..0000000 --- a/src/interface/modeler/extension/paysages.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef PAYSAGES_H -#define PAYSAGES_H - -#include - -class Paysages : public QQuickItem { - Q_OBJECT - Q_DISABLE_COPY(Paysages) - - public: - Paysages(QQuickItem *parent = 0); - ~Paysages(); -}; - -#endif // PAYSAGES_H diff --git a/src/interface/modeler/extension/qmldir b/src/interface/modeler/extension/qmldir deleted file mode 100644 index f7a7af9..0000000 --- a/src/interface/modeler/extension/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -module Paysages -plugin extension - diff --git a/src/interface/modeler/quickapp/images.qrc b/src/interface/modeler/images.qrc similarity index 100% rename from src/interface/modeler/quickapp/images.qrc rename to src/interface/modeler/images.qrc diff --git a/src/interface/modeler/quickapp/main.cpp b/src/interface/modeler/main.cpp similarity index 100% rename from src/interface/modeler/quickapp/main.cpp rename to src/interface/modeler/main.cpp diff --git a/src/interface/modeler/modeler.pro b/src/interface/modeler/modeler.pro index 711f598..79fcdf2 100644 --- a/src/interface/modeler/modeler.pro +++ b/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 diff --git a/src/interface/modeler/quickapp/modeler_global.h b/src/interface/modeler/modeler_global.h similarity index 100% rename from src/interface/modeler/quickapp/modeler_global.h rename to src/interface/modeler/modeler_global.h diff --git a/src/interface/modeler/quickapp/qml.qrc b/src/interface/modeler/qml.qrc similarity index 100% rename from src/interface/modeler/quickapp/qml.qrc rename to src/interface/modeler/qml.qrc diff --git a/src/interface/modeler/quickapp/qml/AtmosphereSection.qml b/src/interface/modeler/qml/AtmosphereSection.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/AtmosphereSection.qml rename to src/interface/modeler/qml/AtmosphereSection.qml diff --git a/src/interface/modeler/quickapp/qml/BaseChoice.qml b/src/interface/modeler/qml/BaseChoice.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/BaseChoice.qml rename to src/interface/modeler/qml/BaseChoice.qml diff --git a/src/interface/modeler/quickapp/qml/BaseChoiceItem.qml b/src/interface/modeler/qml/BaseChoiceItem.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/BaseChoiceItem.qml rename to src/interface/modeler/qml/BaseChoiceItem.qml diff --git a/src/interface/modeler/quickapp/qml/BasePanel.qml b/src/interface/modeler/qml/BasePanel.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/BasePanel.qml rename to src/interface/modeler/qml/BasePanel.qml diff --git a/src/interface/modeler/quickapp/qml/BaseRectangle.qml b/src/interface/modeler/qml/BaseRectangle.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/BaseRectangle.qml rename to src/interface/modeler/qml/BaseRectangle.qml diff --git a/src/interface/modeler/quickapp/qml/BaseSecondaryToolbar.qml b/src/interface/modeler/qml/BaseSecondaryToolbar.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/BaseSecondaryToolbar.qml rename to src/interface/modeler/qml/BaseSecondaryToolbar.qml diff --git a/src/interface/modeler/quickapp/qml/BaseSection.qml b/src/interface/modeler/qml/BaseSection.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/BaseSection.qml rename to src/interface/modeler/qml/BaseSection.qml diff --git a/src/interface/modeler/quickapp/qml/BaseSlider.qml b/src/interface/modeler/qml/BaseSlider.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/BaseSlider.qml rename to src/interface/modeler/qml/BaseSlider.qml diff --git a/src/interface/modeler/quickapp/qml/BaseToolbar.qml b/src/interface/modeler/qml/BaseToolbar.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/BaseToolbar.qml rename to src/interface/modeler/qml/BaseToolbar.qml diff --git a/src/interface/modeler/quickapp/qml/CameraChoice.qml b/src/interface/modeler/qml/CameraChoice.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/CameraChoice.qml rename to src/interface/modeler/qml/CameraChoice.qml diff --git a/src/interface/modeler/quickapp/qml/ClickableImage.qml b/src/interface/modeler/qml/ClickableImage.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/ClickableImage.qml rename to src/interface/modeler/qml/ClickableImage.qml diff --git a/src/interface/modeler/quickapp/qml/OpenGLView.qml b/src/interface/modeler/qml/OpenGLView.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/OpenGLView.qml rename to src/interface/modeler/qml/OpenGLView.qml diff --git a/src/interface/modeler/quickapp/qml/PanelAtmosphereDaytime.qml b/src/interface/modeler/qml/PanelAtmosphereDaytime.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/PanelAtmosphereDaytime.qml rename to src/interface/modeler/qml/PanelAtmosphereDaytime.qml diff --git a/src/interface/modeler/quickapp/qml/PanelPictureChoice.qml b/src/interface/modeler/qml/PanelPictureChoice.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/PanelPictureChoice.qml rename to src/interface/modeler/qml/PanelPictureChoice.qml diff --git a/src/interface/modeler/quickapp/qml/PanelSimpleFloat.qml b/src/interface/modeler/qml/PanelSimpleFloat.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/PanelSimpleFloat.qml rename to src/interface/modeler/qml/PanelSimpleFloat.qml diff --git a/src/interface/modeler/quickapp/qml/PictureChoiceItem.qml b/src/interface/modeler/qml/PictureChoiceItem.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/PictureChoiceItem.qml rename to src/interface/modeler/qml/PictureChoiceItem.qml diff --git a/src/interface/modeler/quickapp/qml/RenderDialog.qml b/src/interface/modeler/qml/RenderDialog.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/RenderDialog.qml rename to src/interface/modeler/qml/RenderDialog.qml diff --git a/src/interface/modeler/quickapp/qml/ToolbarButton.qml b/src/interface/modeler/qml/ToolbarButton.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/ToolbarButton.qml rename to src/interface/modeler/qml/ToolbarButton.qml diff --git a/src/interface/modeler/quickapp/qml/Tooltip.qml b/src/interface/modeler/qml/Tooltip.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/Tooltip.qml rename to src/interface/modeler/qml/Tooltip.qml diff --git a/src/interface/modeler/quickapp/qml/WaterSection.qml b/src/interface/modeler/qml/WaterSection.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/WaterSection.qml rename to src/interface/modeler/qml/WaterSection.qml diff --git a/src/interface/modeler/quickapp/qml/app.qrc b/src/interface/modeler/qml/app.qrc similarity index 100% rename from src/interface/modeler/quickapp/qml/app.qrc rename to src/interface/modeler/qml/app.qrc diff --git a/src/interface/modeler/quickapp/qml/images/arrow_down.png b/src/interface/modeler/qml/images/arrow_down.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/arrow_down.png rename to src/interface/modeler/qml/images/arrow_down.png diff --git a/src/interface/modeler/quickapp/qml/images/arrow_up.png b/src/interface/modeler/qml/images/arrow_up.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/arrow_up.png rename to src/interface/modeler/qml/images/arrow_up.png diff --git a/src/interface/modeler/quickapp/qml/images/display_topdown.png b/src/interface/modeler/qml/images/display_topdown.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/display_topdown.png rename to src/interface/modeler/qml/images/display_topdown.png diff --git a/src/interface/modeler/quickapp/qml/images/help.png b/src/interface/modeler/qml/images/help.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/help.png rename to src/interface/modeler/qml/images/help.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_atmosphere.png b/src/interface/modeler/qml/images/icon_atmosphere.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_atmosphere.png rename to src/interface/modeler/qml/images/icon_atmosphere.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_atmosphere_day.png b/src/interface/modeler/qml/images/icon_atmosphere_day.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_atmosphere_day.png rename to src/interface/modeler/qml/images/icon_atmosphere_day.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_atmosphere_daytime.png b/src/interface/modeler/qml/images/icon_atmosphere_daytime.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_atmosphere_daytime.png rename to src/interface/modeler/qml/images/icon_atmosphere_daytime.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_atmosphere_night.png b/src/interface/modeler/qml/images/icon_atmosphere_night.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_atmosphere_night.png rename to src/interface/modeler/qml/images/icon_atmosphere_night.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_cancel.png b/src/interface/modeler/qml/images/icon_cancel.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_cancel.png rename to src/interface/modeler/qml/images/icon_cancel.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_exit.png b/src/interface/modeler/qml/images/icon_exit.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_exit.png rename to src/interface/modeler/qml/images/icon_exit.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_file_load.png b/src/interface/modeler/qml/images/icon_file_load.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_file_load.png rename to src/interface/modeler/qml/images/icon_file_load.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_file_new.png b/src/interface/modeler/qml/images/icon_file_new.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_file_new.png rename to src/interface/modeler/qml/images/icon_file_new.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_file_save.png b/src/interface/modeler/qml/images/icon_file_save.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_file_save.png rename to src/interface/modeler/qml/images/icon_file_save.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_preset.png b/src/interface/modeler/qml/images/icon_preset.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_preset.png rename to src/interface/modeler/qml/images/icon_preset.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_render_final.png b/src/interface/modeler/qml/images/icon_render_final.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_render_final.png rename to src/interface/modeler/qml/images/icon_render_final.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_render_medium.png b/src/interface/modeler/qml/images/icon_render_medium.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_render_medium.png rename to src/interface/modeler/qml/images/icon_render_medium.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_render_quick.png b/src/interface/modeler/qml/images/icon_render_quick.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_render_quick.png rename to src/interface/modeler/qml/images/icon_render_quick.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_render_show.png b/src/interface/modeler/qml/images/icon_render_show.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_render_show.png rename to src/interface/modeler/qml/images/icon_render_show.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_sun_radius.png b/src/interface/modeler/qml/images/icon_sun_radius.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_sun_radius.png rename to src/interface/modeler/qml/images/icon_sun_radius.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_water.png b/src/interface/modeler/qml/images/icon_water.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_water.png rename to src/interface/modeler/qml/images/icon_water.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_water_level.png b/src/interface/modeler/qml/images/icon_water_level.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_water_level.png rename to src/interface/modeler/qml/images/icon_water_level.png diff --git a/src/interface/modeler/quickapp/qml/images/icon_water_reflection.png b/src/interface/modeler/qml/images/icon_water_reflection.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/icon_water_reflection.png rename to src/interface/modeler/qml/images/icon_water_reflection.png diff --git a/src/interface/modeler/quickapp/qml/images/preset_water_lake.jpg b/src/interface/modeler/qml/images/preset_water_lake.jpg similarity index 100% rename from src/interface/modeler/quickapp/qml/images/preset_water_lake.jpg rename to src/interface/modeler/qml/images/preset_water_lake.jpg diff --git a/src/interface/modeler/quickapp/qml/images/preset_water_sea.jpg b/src/interface/modeler/qml/images/preset_water_sea.jpg similarity index 100% rename from src/interface/modeler/quickapp/qml/images/preset_water_sea.jpg rename to src/interface/modeler/qml/images/preset_water_sea.jpg diff --git a/src/interface/modeler/quickapp/qml/images/tab_atmosphere.png b/src/interface/modeler/qml/images/tab_atmosphere.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/tab_atmosphere.png rename to src/interface/modeler/qml/images/tab_atmosphere.png diff --git a/src/interface/modeler/quickapp/qml/images/tab_clouds.png b/src/interface/modeler/qml/images/tab_clouds.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/tab_clouds.png rename to src/interface/modeler/qml/images/tab_clouds.png diff --git a/src/interface/modeler/quickapp/qml/images/tab_display.png b/src/interface/modeler/qml/images/tab_display.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/tab_display.png rename to src/interface/modeler/qml/images/tab_display.png diff --git a/src/interface/modeler/quickapp/qml/images/tab_file.png b/src/interface/modeler/qml/images/tab_file.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/tab_file.png rename to src/interface/modeler/qml/images/tab_file.png diff --git a/src/interface/modeler/quickapp/qml/images/tab_render.png b/src/interface/modeler/qml/images/tab_render.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/tab_render.png rename to src/interface/modeler/qml/images/tab_render.png diff --git a/src/interface/modeler/quickapp/qml/images/tab_terrain.png b/src/interface/modeler/qml/images/tab_terrain.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/tab_terrain.png rename to src/interface/modeler/qml/images/tab_terrain.png diff --git a/src/interface/modeler/quickapp/qml/images/tab_textures.png b/src/interface/modeler/qml/images/tab_textures.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/tab_textures.png rename to src/interface/modeler/qml/images/tab_textures.png diff --git a/src/interface/modeler/quickapp/qml/images/tab_water.png b/src/interface/modeler/qml/images/tab_water.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/tab_water.png rename to src/interface/modeler/qml/images/tab_water.png diff --git a/src/interface/modeler/quickapp/qml/images/toggle_water.png b/src/interface/modeler/qml/images/toggle_water.png similarity index 100% rename from src/interface/modeler/quickapp/qml/images/toggle_water.png rename to src/interface/modeler/qml/images/toggle_water.png diff --git a/src/interface/modeler/quickapp/qml/main.qml b/src/interface/modeler/qml/main.qml similarity index 100% rename from src/interface/modeler/quickapp/qml/main.qml rename to src/interface/modeler/qml/main.qml diff --git a/src/interface/modeler/quickapp/quickapp.pro b/src/interface/modeler/quickapp/quickapp.pro deleted file mode 100644 index feaf0d8..0000000 --- a/src/interface/modeler/quickapp/quickapp.pro +++ /dev/null @@ -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