diff options
author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-19 16:44:50 +0200 |
---|---|---|
committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-19 16:44:50 +0200 |
commit | ae1b9c676dc9c590008de58ce0ab51bff3ef0f9e (patch) | |
tree | 9ec38d6bd01c111ef6b9f91643d34b223c1a6fba | |
parent | 19ae511027367c890cda0df4dd1364a3219aafd3 (diff) |
Move examples/graphicsview/blurpicker|lighting to examples/effects.
-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) | bin | 3760 -> 3760 bytes | |||
-rw-r--r-- | examples/effects/blurpicker/images/accessories-text-editor.png (renamed from examples/graphicsview/blurpicker/images/accessories-text-editor.png) | bin | 4746 -> 4746 bytes | |||
-rw-r--r-- | examples/effects/blurpicker/images/background.jpg (renamed from examples/graphicsview/blurpicker/images/background.jpg) | bin | 16259 -> 16259 bytes | |||
-rw-r--r-- | examples/effects/blurpicker/images/help-browser.png (renamed from examples/graphicsview/blurpicker/images/help-browser.png) | bin | 5392 -> 5392 bytes | |||
-rw-r--r-- | examples/effects/blurpicker/images/internet-group-chat.png (renamed from examples/graphicsview/blurpicker/images/internet-group-chat.png) | bin | 2809 -> 2809 bytes | |||
-rw-r--r-- | examples/effects/blurpicker/images/internet-mail.png (renamed from examples/graphicsview/blurpicker/images/internet-mail.png) | bin | 3899 -> 3899 bytes | |||
-rw-r--r-- | examples/effects/blurpicker/images/internet-web-browser.png (renamed from examples/graphicsview/blurpicker/images/internet-web-browser.png) | bin | 6376 -> 6376 bytes | |||
-rw-r--r-- | examples/effects/blurpicker/images/office-calendar.png (renamed from examples/graphicsview/blurpicker/images/office-calendar.png) | bin | 4010 -> 4010 bytes | |||
-rw-r--r-- | examples/effects/blurpicker/images/system-users.png (renamed from examples/graphicsview/blurpicker/images/system-users.png) | bin | 5353 -> 5353 bytes | |||
-rw-r--r-- | examples/effects/blurpicker/main.cpp (renamed from examples/graphicsview/blurpicker/main.cpp) | 0 | ||||
-rw-r--r-- | examples/effects/effects.pro | 12 | ||||
-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.pro | 1 | ||||
-rw-r--r-- | examples/graphicsview/graphicsview.pro | 2 |
26 files changed, 17 insertions, 6 deletions
diff --git a/examples/graphicsview/blurpicker/blureffect.cpp b/examples/effects/blurpicker/blureffect.cpp index 82be44f4a6..82be44f4a6 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 89694b6b5d..89694b6b5d 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 9904dfa683..9904dfa683 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 b7ea3b4e01..b7ea3b4e01 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 e42cc0f951..76537a9783 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 e88eaca966..e88eaca966 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 0927e177d2..0927e177d2 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 Binary files differindex 4e7661f65c..4e7661f65c 100644 --- a/examples/graphicsview/blurpicker/images/accessories-calculator.png +++ b/examples/effects/blurpicker/images/accessories-calculator.png diff --git a/examples/graphicsview/blurpicker/images/accessories-text-editor.png b/examples/effects/blurpicker/images/accessories-text-editor.png Binary files differindex 33bef0bc17..33bef0bc17 100644 --- a/examples/graphicsview/blurpicker/images/accessories-text-editor.png +++ b/examples/effects/blurpicker/images/accessories-text-editor.png diff --git a/examples/graphicsview/blurpicker/images/background.jpg b/examples/effects/blurpicker/images/background.jpg Binary files differindex e75b38899d..e75b38899d 100644 --- a/examples/graphicsview/blurpicker/images/background.jpg +++ b/examples/effects/blurpicker/images/background.jpg diff --git a/examples/graphicsview/blurpicker/images/help-browser.png b/examples/effects/blurpicker/images/help-browser.png Binary files differindex 8ef4fae91b..8ef4fae91b 100644 --- a/examples/graphicsview/blurpicker/images/help-browser.png +++ b/examples/effects/blurpicker/images/help-browser.png diff --git a/examples/graphicsview/blurpicker/images/internet-group-chat.png b/examples/effects/blurpicker/images/internet-group-chat.png Binary files differindex dd92d93947..dd92d93947 100644 --- a/examples/graphicsview/blurpicker/images/internet-group-chat.png +++ b/examples/effects/blurpicker/images/internet-group-chat.png diff --git a/examples/graphicsview/blurpicker/images/internet-mail.png b/examples/effects/blurpicker/images/internet-mail.png Binary files differindex 7e6b93be83..7e6b93be83 100644 --- a/examples/graphicsview/blurpicker/images/internet-mail.png +++ b/examples/effects/blurpicker/images/internet-mail.png diff --git a/examples/graphicsview/blurpicker/images/internet-web-browser.png b/examples/effects/blurpicker/images/internet-web-browser.png Binary files differindex a979a92b4f..a979a92b4f 100644 --- a/examples/graphicsview/blurpicker/images/internet-web-browser.png +++ b/examples/effects/blurpicker/images/internet-web-browser.png diff --git a/examples/graphicsview/blurpicker/images/office-calendar.png b/examples/effects/blurpicker/images/office-calendar.png Binary files differindex e09590682b..e09590682b 100644 --- a/examples/graphicsview/blurpicker/images/office-calendar.png +++ b/examples/effects/blurpicker/images/office-calendar.png diff --git a/examples/graphicsview/blurpicker/images/system-users.png b/examples/effects/blurpicker/images/system-users.png Binary files differindex a7f630a5bd..a7f630a5bd 100644 --- a/examples/graphicsview/blurpicker/images/system-users.png +++ b/examples/effects/blurpicker/images/system-users.png diff --git a/examples/graphicsview/blurpicker/main.cpp b/examples/effects/blurpicker/main.cpp index b88a51d791..b88a51d791 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 0000000000..8ba03246da --- /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 63f0a6c519..63f0a6c519 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 70a4d48eb2..70a4d48eb2 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 440bb53c76..ea9d5f682c 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 07415f68cc..07415f68cc 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 f447531623..f447531623 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 68318b03f1..68318b03f1 100644 --- a/examples/graphicsview/lighting/shadoweffect.h +++ b/examples/effects/lighting/shadoweffect.h diff --git a/examples/examples.pro b/examples/examples.pro index e6cece9dac..197e80f976 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 4dd0b138bb..7c8e78738e 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 |