summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorBjørn Erik Nilsen <bjorn.nilsen@nokia.com>2009-08-19 14:44:50 (GMT)
committerBjørn Erik Nilsen <bjorn.nilsen@nokia.com>2009-08-19 14:44:50 (GMT)
commitae1b9c676dc9c590008de58ce0ab51bff3ef0f9e (patch)
tree9ec38d6bd01c111ef6b9f91643d34b223c1a6fba /examples
parent19ae511027367c890cda0df4dd1364a3219aafd3 (diff)
downloadQt-ae1b9c676dc9c590008de58ce0ab51bff3ef0f9e.zip
Qt-ae1b9c676dc9c590008de58ce0ab51bff3ef0f9e.tar.gz
Qt-ae1b9c676dc9c590008de58ce0ab51bff3ef0f9e.tar.bz2
Move examples/graphicsview/blurpicker|lighting to examples/effects.
Diffstat (limited to 'examples')
-rw-r--r--examples/effects/blurpicker/blureffect.cpp (renamed from examples/graphicsview/blurpicker/blureffect.cpp)0
-rw-r--r--examples/effects/blurpicker/blureffect.h (renamed from examples/graphicsview/blurpicker/blureffect.h)0
-rw-r--r--examples/effects/blurpicker/blurpicker.cpp (renamed from examples/graphicsview/blurpicker/blurpicker.cpp)0
-rw-r--r--examples/effects/blurpicker/blurpicker.h (renamed from examples/graphicsview/blurpicker/blurpicker.h)0
-rw-r--r--examples/effects/blurpicker/blurpicker.pro (renamed from examples/graphicsview/blurpicker/blurpicker.pro)4
-rw-r--r--examples/effects/blurpicker/blurpicker.qrc (renamed from examples/graphicsview/blurpicker/blurpicker.qrc)0
-rw-r--r--examples/effects/blurpicker/images/README.txt (renamed from examples/graphicsview/blurpicker/images/README.txt)0
-rw-r--r--examples/effects/blurpicker/images/accessories-calculator.png (renamed from examples/graphicsview/blurpicker/images/accessories-calculator.png)bin3760 -> 3760 bytes
-rw-r--r--examples/effects/blurpicker/images/accessories-text-editor.png (renamed from examples/graphicsview/blurpicker/images/accessories-text-editor.png)bin4746 -> 4746 bytes
-rw-r--r--examples/effects/blurpicker/images/background.jpg (renamed from examples/graphicsview/blurpicker/images/background.jpg)bin16259 -> 16259 bytes
-rw-r--r--examples/effects/blurpicker/images/help-browser.png (renamed from examples/graphicsview/blurpicker/images/help-browser.png)bin5392 -> 5392 bytes
-rw-r--r--examples/effects/blurpicker/images/internet-group-chat.png (renamed from examples/graphicsview/blurpicker/images/internet-group-chat.png)bin2809 -> 2809 bytes
-rw-r--r--examples/effects/blurpicker/images/internet-mail.png (renamed from examples/graphicsview/blurpicker/images/internet-mail.png)bin3899 -> 3899 bytes
-rw-r--r--examples/effects/blurpicker/images/internet-web-browser.png (renamed from examples/graphicsview/blurpicker/images/internet-web-browser.png)bin6376 -> 6376 bytes
-rw-r--r--examples/effects/blurpicker/images/office-calendar.png (renamed from examples/graphicsview/blurpicker/images/office-calendar.png)bin4010 -> 4010 bytes
-rw-r--r--examples/effects/blurpicker/images/system-users.png (renamed from examples/graphicsview/blurpicker/images/system-users.png)bin5353 -> 5353 bytes
-rw-r--r--examples/effects/blurpicker/main.cpp (renamed from examples/graphicsview/blurpicker/main.cpp)0
-rw-r--r--examples/effects/effects.pro12
-rw-r--r--examples/effects/lighting/lighting.cpp (renamed from examples/graphicsview/lighting/lighting.cpp)0
-rw-r--r--examples/effects/lighting/lighting.h (renamed from examples/graphicsview/lighting/lighting.h)0
-rw-r--r--examples/effects/lighting/lighting.pro (renamed from examples/graphicsview/lighting/lighting.pro)4
-rw-r--r--examples/effects/lighting/main.cpp (renamed from examples/graphicsview/lighting/main.cpp)0
-rw-r--r--examples/effects/lighting/shadoweffect.cpp (renamed from examples/graphicsview/lighting/shadoweffect.cpp)0
-rw-r--r--examples/effects/lighting/shadoweffect.h (renamed from examples/graphicsview/lighting/shadoweffect.h)0
-rw-r--r--examples/examples.pro1
-rw-r--r--examples/graphicsview/graphicsview.pro2
26 files changed, 17 insertions, 6 deletions
diff --git a/examples/graphicsview/blurpicker/blureffect.cpp b/examples/effects/blurpicker/blureffect.cpp
index 82be44f..82be44f 100644
--- a/examples/graphicsview/blurpicker/blureffect.cpp
+++ b/examples/effects/blurpicker/blureffect.cpp
diff --git a/examples/graphicsview/blurpicker/blureffect.h b/examples/effects/blurpicker/blureffect.h
index 89694b6..89694b6 100644
--- a/examples/graphicsview/blurpicker/blureffect.h
+++ b/examples/effects/blurpicker/blureffect.h
diff --git a/examples/graphicsview/blurpicker/blurpicker.cpp b/examples/effects/blurpicker/blurpicker.cpp
index 9904dfa..9904dfa 100644
--- a/examples/graphicsview/blurpicker/blurpicker.cpp
+++ b/examples/effects/blurpicker/blurpicker.cpp
diff --git a/examples/graphicsview/blurpicker/blurpicker.h b/examples/effects/blurpicker/blurpicker.h
index b7ea3b4..b7ea3b4 100644
--- a/examples/graphicsview/blurpicker/blurpicker.h
+++ b/examples/effects/blurpicker/blurpicker.h
diff --git a/examples/graphicsview/blurpicker/blurpicker.pro b/examples/effects/blurpicker/blurpicker.pro
index e42cc0f..76537a9 100644
--- a/examples/graphicsview/blurpicker/blurpicker.pro
+++ b/examples/effects/blurpicker/blurpicker.pro
@@ -3,7 +3,7 @@ HEADERS += blurpicker.h blureffect.h
RESOURCES += blurpicker.qrc
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/blurpicker
+target.path = $$[QT_INSTALL_EXAMPLES]/effects/blurpicker
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blurpicker.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/blurpicker
+sources.path = $$[QT_INSTALL_EXAMPLES]/effects/blurpicker
INSTALLS += target sources
diff --git a/examples/graphicsview/blurpicker/blurpicker.qrc b/examples/effects/blurpicker/blurpicker.qrc
index e88eaca..e88eaca 100644
--- a/examples/graphicsview/blurpicker/blurpicker.qrc
+++ b/examples/effects/blurpicker/blurpicker.qrc
diff --git a/examples/graphicsview/blurpicker/images/README.txt b/examples/effects/blurpicker/images/README.txt
index 0927e17..0927e17 100644
--- a/examples/graphicsview/blurpicker/images/README.txt
+++ b/examples/effects/blurpicker/images/README.txt
diff --git a/examples/graphicsview/blurpicker/images/accessories-calculator.png b/examples/effects/blurpicker/images/accessories-calculator.png
index 4e7661f..4e7661f 100644
--- a/examples/graphicsview/blurpicker/images/accessories-calculator.png
+++ b/examples/effects/blurpicker/images/accessories-calculator.png
Binary files differ
diff --git a/examples/graphicsview/blurpicker/images/accessories-text-editor.png b/examples/effects/blurpicker/images/accessories-text-editor.png
index 33bef0b..33bef0b 100644
--- a/examples/graphicsview/blurpicker/images/accessories-text-editor.png
+++ b/examples/effects/blurpicker/images/accessories-text-editor.png
Binary files differ
diff --git a/examples/graphicsview/blurpicker/images/background.jpg b/examples/effects/blurpicker/images/background.jpg
index e75b388..e75b388 100644
--- a/examples/graphicsview/blurpicker/images/background.jpg
+++ b/examples/effects/blurpicker/images/background.jpg
Binary files differ
diff --git a/examples/graphicsview/blurpicker/images/help-browser.png b/examples/effects/blurpicker/images/help-browser.png
index 8ef4fae..8ef4fae 100644
--- a/examples/graphicsview/blurpicker/images/help-browser.png
+++ b/examples/effects/blurpicker/images/help-browser.png
Binary files differ
diff --git a/examples/graphicsview/blurpicker/images/internet-group-chat.png b/examples/effects/blurpicker/images/internet-group-chat.png
index dd92d93..dd92d93 100644
--- a/examples/graphicsview/blurpicker/images/internet-group-chat.png
+++ b/examples/effects/blurpicker/images/internet-group-chat.png
Binary files differ
diff --git a/examples/graphicsview/blurpicker/images/internet-mail.png b/examples/effects/blurpicker/images/internet-mail.png
index 7e6b93b..7e6b93b 100644
--- a/examples/graphicsview/blurpicker/images/internet-mail.png
+++ b/examples/effects/blurpicker/images/internet-mail.png
Binary files differ
diff --git a/examples/graphicsview/blurpicker/images/internet-web-browser.png b/examples/effects/blurpicker/images/internet-web-browser.png
index a979a92..a979a92 100644
--- a/examples/graphicsview/blurpicker/images/internet-web-browser.png
+++ b/examples/effects/blurpicker/images/internet-web-browser.png
Binary files differ
diff --git a/examples/graphicsview/blurpicker/images/office-calendar.png b/examples/effects/blurpicker/images/office-calendar.png
index e095906..e095906 100644
--- a/examples/graphicsview/blurpicker/images/office-calendar.png
+++ b/examples/effects/blurpicker/images/office-calendar.png
Binary files differ
diff --git a/examples/graphicsview/blurpicker/images/system-users.png b/examples/effects/blurpicker/images/system-users.png
index a7f630a..a7f630a 100644
--- a/examples/graphicsview/blurpicker/images/system-users.png
+++ b/examples/effects/blurpicker/images/system-users.png
Binary files differ
diff --git a/examples/graphicsview/blurpicker/main.cpp b/examples/effects/blurpicker/main.cpp
index b88a51d..b88a51d 100644
--- a/examples/graphicsview/blurpicker/main.cpp
+++ b/examples/effects/blurpicker/main.cpp
diff --git a/examples/effects/effects.pro b/examples/effects/effects.pro
new file mode 100644
index 0000000..8ba0324
--- /dev/null
+++ b/examples/effects/effects.pro
@@ -0,0 +1,12 @@
+TEMPLATE = \
+ subdirs
+SUBDIRS = \
+ blurpicker \
+ lighting
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/effects
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS effects.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/effects
+INSTALLS += target sources
+
diff --git a/examples/graphicsview/lighting/lighting.cpp b/examples/effects/lighting/lighting.cpp
index 63f0a6c..63f0a6c 100644
--- a/examples/graphicsview/lighting/lighting.cpp
+++ b/examples/effects/lighting/lighting.cpp
diff --git a/examples/graphicsview/lighting/lighting.h b/examples/effects/lighting/lighting.h
index 70a4d48..70a4d48 100644
--- a/examples/graphicsview/lighting/lighting.h
+++ b/examples/effects/lighting/lighting.h
diff --git a/examples/graphicsview/lighting/lighting.pro b/examples/effects/lighting/lighting.pro
index 440bb53..ea9d5f6 100644
--- a/examples/graphicsview/lighting/lighting.pro
+++ b/examples/effects/lighting/lighting.pro
@@ -2,7 +2,7 @@ SOURCES += main.cpp lighting.cpp shadoweffect.cpp
HEADERS += lighting.h shadoweffect.h
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/lighting
+target.path = $$[QT_INSTALL_EXAMPLES]/effects/lighting
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS lighting.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/lighting
+sources.path = $$[QT_INSTALL_EXAMPLES]/effects/lighting
INSTALLS += target sources
diff --git a/examples/graphicsview/lighting/main.cpp b/examples/effects/lighting/main.cpp
index 07415f6..07415f6 100644
--- a/examples/graphicsview/lighting/main.cpp
+++ b/examples/effects/lighting/main.cpp
diff --git a/examples/graphicsview/lighting/shadoweffect.cpp b/examples/effects/lighting/shadoweffect.cpp
index f447531..f447531 100644
--- a/examples/graphicsview/lighting/shadoweffect.cpp
+++ b/examples/effects/lighting/shadoweffect.cpp
diff --git a/examples/graphicsview/lighting/shadoweffect.h b/examples/effects/lighting/shadoweffect.h
index 68318b0..68318b0 100644
--- a/examples/graphicsview/lighting/shadoweffect.h
+++ b/examples/effects/lighting/shadoweffect.h
diff --git a/examples/examples.pro b/examples/examples.pro
index e6cece9..197e80f 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -4,6 +4,7 @@ SUBDIRS = \
desktop \
dialogs \
draganddrop \
+ effects \
graphicsview \
ipc \
itemviews \
diff --git a/examples/graphicsview/graphicsview.pro b/examples/graphicsview/graphicsview.pro
index 4dd0b13..7c8e787 100644
--- a/examples/graphicsview/graphicsview.pro
+++ b/examples/graphicsview/graphicsview.pro
@@ -6,8 +6,6 @@ SUBDIRS = \
diagramscene \
dragdroprobot \
padnavigator \
- lighting \
- blurpicker \
basicgraphicslayouts
contains(QT_CONFIG, qt3support):SUBDIRS += portedcanvas portedasteroids