Removed obsolete QML extension for QtCreator

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/

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
+* [Qt](http://qt.io/) - Base framework
-* [GoogleTest](https://code.google.com/p/googletest/) - Used for unit testing
+* [GoogleTest](https://github.com/google/googletest/) - Used for unit testing

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
-}
-

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");
-}

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

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() {
-}

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

src/interface/modeler/extension/qmldir

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

src/interface/modeler/modeler.pro

@@ -1,5 +1,49 @@
-TEMPLATE = subdirs
+TEMPLATE = app
 
-SUBDIRS = \
+QT += qml quick
-    quickapp \
+
-    extension
+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/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