Move shader effect example from examples/graphicsview to examples/effects

20 files changed, 10 insertions, 4 deletions

diff --git a/examples/graphicsview/customshader/blureffect.cpp b/examples/effects/customshader/blureffect.cpp
index 2b5237b..2b5237b 100644
--- a/examples/graphicsview/customshader/blureffect.cpp
+++ b/examples/effects/customshader/blureffect.cpp
diff --git a/examples/graphicsview/customshader/blureffect.h b/examples/effects/customshader/blureffect.h
index bf72226..bf72226 100644
--- a/examples/graphicsview/customshader/blureffect.h
+++ b/examples/effects/customshader/blureffect.h
diff --git a/examples/graphicsview/customshader/blurpicker.cpp b/examples/effects/customshader/blurpicker.cpp
index de80312..de80312 100644
--- a/examples/graphicsview/customshader/blurpicker.cpp
+++ b/examples/effects/customshader/blurpicker.cpp
diff --git a/examples/graphicsview/customshader/blurpicker.h b/examples/effects/customshader/blurpicker.h
index b7ea3b4..b7ea3b4 100644
--- a/examples/graphicsview/customshader/blurpicker.h
+++ b/examples/effects/customshader/blurpicker.h
diff --git a/examples/graphicsview/customshader/blurpicker.qrc b/examples/effects/customshader/blurpicker.qrc
index e88eaca..e88eaca 100644
--- a/examples/graphicsview/customshader/blurpicker.qrc
+++ b/examples/effects/customshader/blurpicker.qrc
diff --git a/examples/graphicsview/customshader/customshader.pro b/examples/effects/customshader/customshader.pro
index bc07d7a..4ce5d2b 100644
--- a/examples/graphicsview/customshader/customshader.pro
+++ b/examples/effects/customshader/customshader.pro
@@ -4,7 +4,7 @@ RESOURCES += blurpicker.qrc
 QT += opengl
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/blurpicker
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blurpicker.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/blurpicker
+target.path = $$[QT_INSTALL_EXAMPLES]/effects/customshader
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS customshader.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/effects/customshader
 INSTALLS += target sources
diff --git a/examples/graphicsview/customshader/customshadereffect.cpp b/examples/effects/customshader/customshadereffect.cpp
index 293123c..293123c 100644
--- a/examples/graphicsview/customshader/customshadereffect.cpp
+++ b/examples/effects/customshader/customshadereffect.cpp
diff --git a/examples/graphicsview/customshader/customshadereffect.h b/examples/effects/customshader/customshadereffect.h
index 6482bd5..6482bd5 100644
--- a/examples/graphicsview/customshader/customshadereffect.h
+++ b/examples/effects/customshader/customshadereffect.h
diff --git a/examples/effects/customshader/images/README.txt b/examples/effects/customshader/images/README.txt
new file mode 100644
index 0000000..0927e17
--- /dev/null
+++ b/examples/effects/customshader/images/README.txt
@@ -0,0 +1,5 @@
+The background is taken from a public domain photo at:
+http://www.photos8.com/view/computer_board2-800x600.html
+
+All other icons are from the Tango Desktop project:
+http://tango.freedesktop.org/Tango_Desktop_Project
diff --git a/examples/effects/customshader/images/accessories-calculator.png b/examples/effects/customshader/images/accessories-calculator.png
new file mode 100644
index 0000000..4e7661f
--- /dev/null
+++ b/examples/effects/customshader/images/accessories-calculator.png
diff --git a/examples/effects/customshader/images/accessories-text-editor.png b/examples/effects/customshader/images/accessories-text-editor.png
new file mode 100644
index 0000000..33bef0b
--- /dev/null
+++ b/examples/effects/customshader/images/accessories-text-editor.png
diff --git a/examples/effects/customshader/images/background.jpg b/examples/effects/customshader/images/background.jpg
new file mode 100644
index 0000000..e75b388
--- /dev/null
+++ b/examples/effects/customshader/images/background.jpg
diff --git a/examples/effects/customshader/images/help-browser.png b/examples/effects/customshader/images/help-browser.png
new file mode 100644
index 0000000..8ef4fae
--- /dev/null
+++ b/examples/effects/customshader/images/help-browser.png
diff --git a/examples/effects/customshader/images/internet-group-chat.png b/examples/effects/customshader/images/internet-group-chat.png
new file mode 100644
index 0000000..dd92d93
--- /dev/null
+++ b/examples/effects/customshader/images/internet-group-chat.png
diff --git a/examples/effects/customshader/images/internet-mail.png b/examples/effects/customshader/images/internet-mail.png
new file mode 100644
index 0000000..7e6b93b
--- /dev/null
+++ b/examples/effects/customshader/images/internet-mail.png
diff --git a/examples/effects/customshader/images/internet-web-browser.png b/examples/effects/customshader/images/internet-web-browser.png
new file mode 100644
index 0000000..a979a92
--- /dev/null
+++ b/examples/effects/customshader/images/internet-web-browser.png
diff --git a/examples/effects/customshader/images/office-calendar.png b/examples/effects/customshader/images/office-calendar.png
new file mode 100644
index 0000000..e095906
--- /dev/null
+++ b/examples/effects/customshader/images/office-calendar.png
diff --git a/examples/effects/customshader/images/system-users.png b/examples/effects/customshader/images/system-users.png
new file mode 100644
index 0000000..a7f630a
--- /dev/null
+++ b/examples/effects/customshader/images/system-users.png
diff --git a/examples/graphicsview/customshader/main.cpp b/examples/effects/customshader/main.cpp
index b88a51d..b88a51d 100644
--- a/examples/graphicsview/customshader/main.cpp
+++ b/examples/effects/customshader/main.cpp
diff --git a/examples/effects/effects.pro b/examples/effects/effects.pro
index 8ba0324..4a6c8de 100644
--- a/examples/effects/effects.pro
+++ b/examples/effects/effects.pro
@@ -2,7 +2,8 @@ TEMPLATE      = \
               subdirs
 SUBDIRS       = \
               blurpicker \
-              lighting
+              lighting \
+              customshader
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/effects