shadereffects example modifications

Modified the example to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>

35 files changed, 61 insertions, 22 deletions

diff --git a/examples/declarative/shadereffects/main.cpp b/examples/declarative/shadereffects/main.cpp
index c284b99a11..e191bfae8f 100755
--- a/examples/declarative/shadereffects/main.cpp
+++ b/examples/declarative/shadereffects/main.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+#include "qmlapplicationviewer.h"
 #include <QtGui/QApplication>
 #include <QtOpenGL>
 #include <QDeclarativeView>
@@ -53,7 +54,7 @@ int main(int argc, char *argv[])
 #endif
 
     QApplication app(argc, argv);
-    QDeclarativeView view;
+    QmlApplicationViewer viewer;
 
 #ifndef SHADEREFFECTS_USE_OPENGL_GRAPHICSSYSTEM
     QGLFormat format = QGLFormat::defaultFormat();
@@ -61,16 +62,16 @@ int main(int argc, char *argv[])
     format.setSwapInterval(1);
     QGLWidget* glWidget = new QGLWidget(format);
     glWidget->setAutoFillBackground(false);
-    view.setViewport(glWidget);
+    viewer.setViewport(glWidget);
 #endif
 
-    view.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
-    view.setAttribute(Qt::WA_OpaquePaintEvent);
-    view.setAttribute(Qt::WA_NoSystemBackground);
-    view.setSource(QUrl::fromLocalFile(QLatin1String("qml/main.qml")));
-    QObject::connect(view.engine(), SIGNAL(quit()), &view, SLOT(close()));
-
-    view.show();
+    viewer.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+    viewer.setAttribute(Qt::WA_OpaquePaintEvent);
+    viewer.setAttribute(Qt::WA_NoSystemBackground);
+    viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
+    viewer.setMainQmlFile(QLatin1String("qml/shadereffects/main.qml"));
+    QObject::connect(viewer.engine(), SIGNAL(quit()), &viewer, SLOT(close()));
+    viewer.showExpanded();
 
     return app.exec();
 }
diff --git a/examples/declarative/shadereffects/qml/Curtain.qml b/examples/declarative/shadereffects/qml/shadereffects/Curtain.qml
index 03ac0e9f55..03ac0e9f55 100755..100644
--- a/examples/declarative/shadereffects/qml/Curtain.qml
+++ b/examples/declarative/shadereffects/qml/shadereffects/Curtain.qml
diff --git a/examples/declarative/shadereffects/qml/CurtainEffect.qml b/examples/declarative/shadereffects/qml/shadereffects/CurtainEffect.qml
index c33cce48ca..c33cce48ca 100755..100644
--- a/examples/declarative/shadereffects/qml/CurtainEffect.qml
+++ b/examples/declarative/shadereffects/qml/shadereffects/CurtainEffect.qml
diff --git a/examples/declarative/shadereffects/qml/DropShadow.qml b/examples/declarative/shadereffects/qml/shadereffects/DropShadow.qml
index 442fb38f2f..442fb38f2f 100755..100644
--- a/examples/declarative/shadereffects/qml/DropShadow.qml
+++ b/examples/declarative/shadereffects/qml/shadereffects/DropShadow.qml
diff --git a/examples/declarative/shadereffects/qml/DropShadowEffect.qml b/examples/declarative/shadereffects/qml/shadereffects/DropShadowEffect.qml
index 71b6ac982e..71b6ac982e 100755..100644
--- a/examples/declarative/shadereffects/qml/DropShadowEffect.qml
+++ b/examples/declarative/shadereffects/qml/shadereffects/DropShadowEffect.qml
diff --git a/examples/declarative/shadereffects/qml/Grayscale.qml b/examples/declarative/shadereffects/qml/shadereffects/Grayscale.qml
index 58c94fc992..58c94fc992 100755..100644
--- a/examples/declarative/shadereffects/qml/Grayscale.qml
+++ b/examples/declarative/shadereffects/qml/shadereffects/Grayscale.qml
diff --git a/examples/declarative/shadereffects/qml/GrayscaleEffect.qml b/examples/declarative/shadereffects/qml/shadereffects/GrayscaleEffect.qml
index 0343893576..0343893576 100755..100644
--- a/examples/declarative/shadereffects/qml/GrayscaleEffect.qml
+++ b/examples/declarative/shadereffects/qml/shadereffects/GrayscaleEffect.qml
diff --git a/examples/declarative/shadereffects/qml/ImageMask.qml b/examples/declarative/shadereffects/qml/shadereffects/ImageMask.qml
index 068696e98b..068696e98b 100755..100644
--- a/examples/declarative/shadereffects/qml/ImageMask.qml
+++ b/examples/declarative/shadereffects/qml/shadereffects/ImageMask.qml
diff --git a/examples/declarative/shadereffects/qml/ImageMaskEffect.qml b/examples/declarative/shadereffects/qml/shadereffects/ImageMaskEffect.qml
index e4dddf4d50..e4dddf4d50 100755..100644
--- a/examples/declarative/shadereffects/qml/ImageMaskEffect.qml
+++ b/examples/declarative/shadereffects/qml/shadereffects/ImageMaskEffect.qml
diff --git a/examples/declarative/shadereffects/qml/RadialWave.qml b/examples/declarative/shadereffects/qml/shadereffects/RadialWave.qml
index 5aaac9ec91..5aaac9ec91 100755..100644
--- a/examples/declarative/shadereffects/qml/RadialWave.qml
+++ b/examples/declarative/shadereffects/qml/shadereffects/RadialWave.qml
diff --git a/examples/declarative/shadereffects/qml/RadialWaveEffect.qml b/examples/declarative/shadereffects/qml/shadereffects/RadialWaveEffect.qml
index 82a15a8e18..82a15a8e18 100755..100644
--- a/examples/declarative/shadereffects/qml/RadialWaveEffect.qml
+++ b/examples/declarative/shadereffects/qml/shadereffects/RadialWaveEffect.qml
diff --git a/examples/declarative/shadereffects/qml/Water.qml b/examples/declarative/shadereffects/qml/shadereffects/Water.qml
index 8810161a92..8810161a92 100755..100644
--- a/examples/declarative/shadereffects/qml/Water.qml
+++ b/examples/declarative/shadereffects/qml/shadereffects/Water.qml
diff --git a/examples/declarative/shadereffects/qml/WaterEffect.qml b/examples/declarative/shadereffects/qml/shadereffects/WaterEffect.qml
index e2fee5c95e..e2fee5c95e 100755..100644
--- a/examples/declarative/shadereffects/qml/WaterEffect.qml
+++ b/examples/declarative/shadereffects/qml/shadereffects/WaterEffect.qml
diff --git a/examples/declarative/shadereffects/qml/images/Curtain.jpg b/examples/declarative/shadereffects/qml/shadereffects/images/Curtain.jpg
index 40003cbb0f..40003cbb0f 100755..100644
--- a/examples/declarative/shadereffects/qml/images/Curtain.jpg
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/Curtain.jpg
diff --git a/examples/declarative/shadereffects/qml/images/DropShadow.jpg b/examples/declarative/shadereffects/qml/shadereffects/images/DropShadow.jpg
index c1e693a5f4..c1e693a5f4 100755..100644
--- a/examples/declarative/shadereffects/qml/images/DropShadow.jpg
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/DropShadow.jpg
diff --git a/examples/declarative/shadereffects/qml/images/Grayscale.jpg b/examples/declarative/shadereffects/qml/shadereffects/images/Grayscale.jpg
index c95cab47bd..c95cab47bd 100755..100644
--- a/examples/declarative/shadereffects/qml/images/Grayscale.jpg
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/Grayscale.jpg
diff --git a/examples/declarative/shadereffects/qml/images/ImageMask.jpg b/examples/declarative/shadereffects/qml/shadereffects/images/ImageMask.jpg
index 0da4c0da3f..0da4c0da3f 100755..100644
--- a/examples/declarative/shadereffects/qml/images/ImageMask.jpg
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/ImageMask.jpg
diff --git a/examples/declarative/shadereffects/qml/images/RadialWave.jpg b/examples/declarative/shadereffects/qml/shadereffects/images/RadialWave.jpg
index fc51efcc9c..fc51efcc9c 100755..100644
--- a/examples/declarative/shadereffects/qml/images/RadialWave.jpg
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/RadialWave.jpg
diff --git a/examples/declarative/shadereffects/qml/images/Water.jpg b/examples/declarative/shadereffects/qml/shadereffects/images/Water.jpg
index 38615c139d..38615c139d 100755..100644
--- a/examples/declarative/shadereffects/qml/images/Water.jpg
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/Water.jpg
diff --git a/examples/declarative/shadereffects/qml/images/back.png b/examples/declarative/shadereffects/qml/shadereffects/images/back.png
index 5dd3d22608..5dd3d22608 100755..100644
--- a/examples/declarative/shadereffects/qml/images/back.png
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/back.png
diff --git a/examples/declarative/shadereffects/qml/images/bg.jpg b/examples/declarative/shadereffects/qml/shadereffects/images/bg.jpg
index 4d22143810..4d22143810 100755..100644
--- a/examples/declarative/shadereffects/qml/images/bg.jpg
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/bg.jpg
diff --git a/examples/declarative/shadereffects/qml/images/desaturate.jpg b/examples/declarative/shadereffects/qml/shadereffects/images/desaturate.jpg
index e5e99bb943..e5e99bb943 100755..100644
--- a/examples/declarative/shadereffects/qml/images/desaturate.jpg
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/desaturate.jpg
diff --git a/examples/declarative/shadereffects/qml/images/drop_shadow.png b/examples/declarative/shadereffects/qml/shadereffects/images/drop_shadow.png
index 144c02d548..144c02d548 100755..100644
--- a/examples/declarative/shadereffects/qml/images/drop_shadow.png
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/drop_shadow.png
diff --git a/examples/declarative/shadereffects/qml/images/fabric.jpg b/examples/declarative/shadereffects/qml/shadereffects/images/fabric.jpg
index ab654093a3..ab654093a3 100755..100644
--- a/examples/declarative/shadereffects/qml/images/fabric.jpg
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/fabric.jpg
diff --git a/examples/declarative/shadereffects/qml/images/flower.png b/examples/declarative/shadereffects/qml/shadereffects/images/flower.png
index 144c02d548..144c02d548 100755..100644
--- a/examples/declarative/shadereffects/qml/images/flower.png
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/flower.png
diff --git a/examples/declarative/shadereffects/qml/images/image1.jpg b/examples/declarative/shadereffects/qml/shadereffects/images/image1.jpg
index 3442e77591..3442e77591 100755..100644
--- a/examples/declarative/shadereffects/qml/images/image1.jpg
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/image1.jpg
diff --git a/examples/declarative/shadereffects/qml/images/image2.jpg b/examples/declarative/shadereffects/qml/shadereffects/images/image2.jpg
index 23e5c5c1cf..23e5c5c1cf 100755..100644
--- a/examples/declarative/shadereffects/qml/images/image2.jpg
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/image2.jpg
diff --git a/examples/declarative/shadereffects/qml/images/qt-logo.png b/examples/declarative/shadereffects/qml/shadereffects/images/qt-logo.png
index 41a304b44b..41a304b44b 100755..100644
--- a/examples/declarative/shadereffects/qml/images/qt-logo.png
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/qt-logo.png
diff --git a/examples/declarative/shadereffects/qml/images/shader_effects.jpg b/examples/declarative/shadereffects/qml/shadereffects/images/shader_effects.jpg
index 19e8a3999a..19e8a3999a 100755..100644
--- a/examples/declarative/shadereffects/qml/images/shader_effects.jpg
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/shader_effects.jpg
diff --git a/examples/declarative/shadereffects/qml/images/sky.jpg b/examples/declarative/shadereffects/qml/shadereffects/images/sky.jpg
index 8fc19ed1be..8fc19ed1be 100755..100644
--- a/examples/declarative/shadereffects/qml/images/sky.jpg
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/sky.jpg
diff --git a/examples/declarative/shadereffects/qml/images/toolbar.png b/examples/declarative/shadereffects/qml/shadereffects/images/toolbar.png
index 773e3ea1bc..773e3ea1bc 100755..100644
--- a/examples/declarative/shadereffects/qml/images/toolbar.png
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/toolbar.png
diff --git a/examples/declarative/shadereffects/qml/images/wave.jpg b/examples/declarative/shadereffects/qml/shadereffects/images/wave.jpg
index c8083bbad1..c8083bbad1 100755..100644
--- a/examples/declarative/shadereffects/qml/images/wave.jpg
+++ b/examples/declarative/shadereffects/qml/shadereffects/images/wave.jpg
diff --git a/examples/declarative/shadereffects/qml/main.qml b/examples/declarative/shadereffects/qml/shadereffects/main.qml
index f38424ae33..f38424ae33 100755..100644
--- a/examples/declarative/shadereffects/qml/main.qml
+++ b/examples/declarative/shadereffects/qml/shadereffects/main.qml
diff --git a/examples/declarative/shadereffects/shadereffects.pro b/examples/declarative/shadereffects/shadereffects.pro
index 1107887263..23a951c2f7 100755
--- a/examples/declarative/shadereffects/shadereffects.pro
+++ b/examples/declarative/shadereffects/shadereffects.pro
@@ -1,21 +1,43 @@
-TEMPLATE = app
-TARGET = shadereffects
-DEPENDPATH += .
-INCLUDEPATH += .
+# Add more folders to ship with the application, here
+folder_01.source = qml/shadereffects
+folder_01.target = qml
+DEPLOYMENTFOLDERS = folder_01
+
+# Additional import path used to resolve QML modules in Creator's code model
+QML_IMPORT_PATH =
+
+symbian:TARGET.UID3 = 0xE1CB8EBB
+
+# Smart Installer package's UID
+# This UID is from the protected range and therefore the package will
+# fail to install if self-signed. By default qmake uses the unprotected
+# range value if unprotected UID is defined for the application and
+# 0x2002CCCF value if protected UID is given to the application
+#symbian:DEPLOYMENT.installer_header = 0x2002CCCF
+
+# Allow network access on Symbian
+symbian:TARGET.CAPABILITY += NetworkServices
+
+# If your application uses the Qt Mobility libraries, uncomment the following
+# lines and add the respective components to the MOBILITY variable.
+# CONFIG += mobility
+# MOBILITY +=
+
+# Speed up launching on MeeGo/Harmattan when using applauncherd daemon
+# CONFIG += qdeclarative-boostable
+
+# Add dependency to Symbian components
+# CONFIG += qt-components
+
 QT += declarative opengl
 
-# Input
+# The .cpp file which was generated for your project. Feel free to hack it.
 SOURCES += main.cpp
 
 symbian {
     DEFINES += SHADEREFFECTS_USE_OPENGL_GRAPHICSSYSTEM
 }
 
-
-target.path = $$[QT_INSTALL_EXAMPLES]/declarative/shadereffects
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS shadereffects.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/shadereffects
-qmlfiles.files = qml
-qmlfiles.path = $$[QT_INSTALL_EXAMPLES]/declarative/shadereffects
-
-INSTALLS += target sources qmlfiles
+# Please do not modify the following two lines. Required for deployment.
+include(../../tools/qmlapplicationviewer/qmlapplicationviewer.pri)
+qtcAddDeployment()
diff --git a/examples/declarative/shadereffects/shadereffects.qmlproject b/examples/declarative/shadereffects/shadereffects.qmlproject
new file mode 100644
index 0000000000..112be81a5c
--- /dev/null
+++ b/examples/declarative/shadereffects/shadereffects.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "qml/shadereffects"
+    }
+    JavaScriptFiles {
+        directory: "qml/shadereffects"
+    }
+    ImageFiles {
+        directory: "qml/shadereffects"
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
\ No newline at end of file