summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@qt.io>2018-08-07 09:24:01 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2018-08-20 15:00:50 +0000
commitbf8e5b17c12919005504432f37dc965c49c33159 (patch)
tree0a643ea16d64577ca3a67f624e5ff373be8639f7 /examples
parent3236562180cfa298ed16525b2a1d2757f514a14c (diff)
Move shared example folder to examples/demos/shared
The root examples directory should not contains shared folders. In the past multimedia was the only module installing things there, now the qtdoc module started doing the same. Let's clean up both. Fixes: QTBUG-69784 Change-Id: Id9f98711e1dff3f610bafddc2a8bebbb764e1504 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/demos/calqlatr/calqlatr.pro2
-rw-r--r--examples/demos/calqlatr/main.cpp2
-rw-r--r--examples/demos/clocks/main.cpp2
-rw-r--r--examples/demos/maroon/main.cpp2
-rw-r--r--examples/demos/rssnews/main.cpp2
-rw-r--r--examples/demos/samegame/main.cpp2
-rw-r--r--examples/demos/shared/Button.qml (renamed from examples/shared/Button.qml)0
-rw-r--r--examples/demos/shared/CheckBox.qml (renamed from examples/shared/CheckBox.qml)0
-rw-r--r--examples/demos/shared/Label.qml (renamed from examples/shared/Label.qml)0
-rw-r--r--examples/demos/shared/LauncherList.qml (renamed from examples/shared/LauncherList.qml)0
-rw-r--r--examples/demos/shared/README (renamed from examples/shared/README)0
-rw-r--r--examples/demos/shared/SimpleLauncherDelegate.qml (renamed from examples/shared/SimpleLauncherDelegate.qml)0
-rw-r--r--examples/demos/shared/Slider.qml (renamed from examples/shared/Slider.qml)0
-rw-r--r--examples/demos/shared/TabSet.qml (renamed from examples/shared/TabSet.qml)0
-rw-r--r--examples/demos/shared/TextField.qml (renamed from examples/shared/TextField.qml)0
-rw-r--r--examples/demos/shared/images/back.png (renamed from examples/shared/images/back.png)bin1590 -> 1590 bytes
-rw-r--r--examples/demos/shared/images/checkmark.png (renamed from examples/shared/images/checkmark.png)bin809 -> 809 bytes
-rw-r--r--examples/demos/shared/images/next.png (renamed from examples/shared/images/next.png)bin1371 -> 1371 bytes
-rw-r--r--examples/demos/shared/images/qt-logo.png (renamed from examples/shared/images/qt-logo.png)bin9186 -> 9186 bytes
-rw-r--r--examples/demos/shared/images/slider_handle.png (renamed from examples/shared/images/slider_handle.png)bin887 -> 887 bytes
-rw-r--r--examples/demos/shared/images/tab.png (renamed from examples/shared/images/tab.png)bin309 -> 309 bytes
-rw-r--r--examples/demos/shared/qmldir (renamed from examples/shared/qmldir)0
-rw-r--r--examples/demos/shared/quick_shared.qrc (renamed from examples/shared/quick_shared.qrc)0
-rw-r--r--examples/demos/shared/shared.h (renamed from examples/shared/shared.h)0
-rw-r--r--examples/demos/shared/shared.qrc (renamed from examples/shared/shared.qrc)0
-rw-r--r--examples/demos/stocqt/main.cpp2
-rw-r--r--examples/demos/tweetsearch/main.cpp2
27 files changed, 8 insertions, 8 deletions
diff --git a/examples/demos/calqlatr/calqlatr.pro b/examples/demos/calqlatr/calqlatr.pro
index fef2432e3..19ed61c6e 100644
--- a/examples/demos/calqlatr/calqlatr.pro
+++ b/examples/demos/calqlatr/calqlatr.pro
@@ -4,7 +4,7 @@ QT += qml quick
SOURCES += main.cpp
RESOURCES += calqlatr.qrc \
- ../../shared/shared.qrc
+ ../shared/shared.qrc
OTHER_FILES = calqlatr.qml \
content/Button.qml \
diff --git a/examples/demos/calqlatr/main.cpp b/examples/demos/calqlatr/main.cpp
index bc6e591e9..6e25fc639 100644
--- a/examples/demos/calqlatr/main.cpp
+++ b/examples/demos/calqlatr/main.cpp
@@ -47,5 +47,5 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
DECLARATIVE_EXAMPLE_MAIN(demos/calqlatr/calqlatr)
diff --git a/examples/demos/clocks/main.cpp b/examples/demos/clocks/main.cpp
index 5d5b0ca64..c2508dc6a 100644
--- a/examples/demos/clocks/main.cpp
+++ b/examples/demos/clocks/main.cpp
@@ -47,5 +47,5 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
DECLARATIVE_EXAMPLE_MAIN(demos/clocks/clocks)
diff --git a/examples/demos/maroon/main.cpp b/examples/demos/maroon/main.cpp
index f6590fc32..baf372125 100644
--- a/examples/demos/maroon/main.cpp
+++ b/examples/demos/maroon/main.cpp
@@ -47,5 +47,5 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
DECLARATIVE_EXAMPLE_MAIN(demos/maroon/maroon)
diff --git a/examples/demos/rssnews/main.cpp b/examples/demos/rssnews/main.cpp
index a0d621bbb..7bbd83c46 100644
--- a/examples/demos/rssnews/main.cpp
+++ b/examples/demos/rssnews/main.cpp
@@ -47,5 +47,5 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
DECLARATIVE_EXAMPLE_MAIN(demos/rssnews/rssnews)
diff --git a/examples/demos/samegame/main.cpp b/examples/demos/samegame/main.cpp
index d2ccd84cf..8ac1f7ab4 100644
--- a/examples/demos/samegame/main.cpp
+++ b/examples/demos/samegame/main.cpp
@@ -47,5 +47,5 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
DECLARATIVE_EXAMPLE_MAIN(demos/samegame/samegame)
diff --git a/examples/shared/Button.qml b/examples/demos/shared/Button.qml
index 8abce273b..8abce273b 100644
--- a/examples/shared/Button.qml
+++ b/examples/demos/shared/Button.qml
diff --git a/examples/shared/CheckBox.qml b/examples/demos/shared/CheckBox.qml
index bcf8178f7..bcf8178f7 100644
--- a/examples/shared/CheckBox.qml
+++ b/examples/demos/shared/CheckBox.qml
diff --git a/examples/shared/Label.qml b/examples/demos/shared/Label.qml
index acbffb8df..acbffb8df 100644
--- a/examples/shared/Label.qml
+++ b/examples/demos/shared/Label.qml
diff --git a/examples/shared/LauncherList.qml b/examples/demos/shared/LauncherList.qml
index e532b53e7..e532b53e7 100644
--- a/examples/shared/LauncherList.qml
+++ b/examples/demos/shared/LauncherList.qml
diff --git a/examples/shared/README b/examples/demos/shared/README
index 2bf26d7c8..2bf26d7c8 100644
--- a/examples/shared/README
+++ b/examples/demos/shared/README
diff --git a/examples/shared/SimpleLauncherDelegate.qml b/examples/demos/shared/SimpleLauncherDelegate.qml
index 86a3b0dfd..86a3b0dfd 100644
--- a/examples/shared/SimpleLauncherDelegate.qml
+++ b/examples/demos/shared/SimpleLauncherDelegate.qml
diff --git a/examples/shared/Slider.qml b/examples/demos/shared/Slider.qml
index 28f92446d..28f92446d 100644
--- a/examples/shared/Slider.qml
+++ b/examples/demos/shared/Slider.qml
diff --git a/examples/shared/TabSet.qml b/examples/demos/shared/TabSet.qml
index d66aa3363..d66aa3363 100644
--- a/examples/shared/TabSet.qml
+++ b/examples/demos/shared/TabSet.qml
diff --git a/examples/shared/TextField.qml b/examples/demos/shared/TextField.qml
index 05e048011..05e048011 100644
--- a/examples/shared/TextField.qml
+++ b/examples/demos/shared/TextField.qml
diff --git a/examples/shared/images/back.png b/examples/demos/shared/images/back.png
index 53402096b..53402096b 100644
--- a/examples/shared/images/back.png
+++ b/examples/demos/shared/images/back.png
Binary files differ
diff --git a/examples/shared/images/checkmark.png b/examples/demos/shared/images/checkmark.png
index 821aafccd..821aafccd 100644
--- a/examples/shared/images/checkmark.png
+++ b/examples/demos/shared/images/checkmark.png
Binary files differ
diff --git a/examples/shared/images/next.png b/examples/demos/shared/images/next.png
index cdef8db6e..cdef8db6e 100644
--- a/examples/shared/images/next.png
+++ b/examples/demos/shared/images/next.png
Binary files differ
diff --git a/examples/shared/images/qt-logo.png b/examples/demos/shared/images/qt-logo.png
index ecbff0ca3..ecbff0ca3 100644
--- a/examples/shared/images/qt-logo.png
+++ b/examples/demos/shared/images/qt-logo.png
Binary files differ
diff --git a/examples/shared/images/slider_handle.png b/examples/demos/shared/images/slider_handle.png
index 63c518be7..63c518be7 100644
--- a/examples/shared/images/slider_handle.png
+++ b/examples/demos/shared/images/slider_handle.png
Binary files differ
diff --git a/examples/shared/images/tab.png b/examples/demos/shared/images/tab.png
index 2ea989b68..2ea989b68 100644
--- a/examples/shared/images/tab.png
+++ b/examples/demos/shared/images/tab.png
Binary files differ
diff --git a/examples/shared/qmldir b/examples/demos/shared/qmldir
index b539191fe..b539191fe 100644
--- a/examples/shared/qmldir
+++ b/examples/demos/shared/qmldir
diff --git a/examples/shared/quick_shared.qrc b/examples/demos/shared/quick_shared.qrc
index 21f393a64..21f393a64 100644
--- a/examples/shared/quick_shared.qrc
+++ b/examples/demos/shared/quick_shared.qrc
diff --git a/examples/shared/shared.h b/examples/demos/shared/shared.h
index 18e7ff056..18e7ff056 100644
--- a/examples/shared/shared.h
+++ b/examples/demos/shared/shared.h
diff --git a/examples/shared/shared.qrc b/examples/demos/shared/shared.qrc
index 89b3ff757..89b3ff757 100644
--- a/examples/shared/shared.qrc
+++ b/examples/demos/shared/shared.qrc
diff --git a/examples/demos/stocqt/main.cpp b/examples/demos/stocqt/main.cpp
index 6031e2810..b91d7543c 100644
--- a/examples/demos/stocqt/main.cpp
+++ b/examples/demos/stocqt/main.cpp
@@ -47,5 +47,5 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
DECLARATIVE_EXAMPLE_MAIN(demos/stocqt/stocqt)
diff --git a/examples/demos/tweetsearch/main.cpp b/examples/demos/tweetsearch/main.cpp
index fe612eaa1..508d34e91 100644
--- a/examples/demos/tweetsearch/main.cpp
+++ b/examples/demos/tweetsearch/main.cpp
@@ -47,5 +47,5 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
DECLARATIVE_EXAMPLE_MAIN(demos/tweetsearch/tweetsearch)