aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-06-11 23:46:24 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-06-11 22:46:55 +0000
commit7b0007e6c95fe80c6a7da77cd39a9e0e4774f734 (patch)
treec7ae5ecc802e35f84360df47abf8c53002c5ae5b
parent1c1dd5ed4748207d8643ff0530b8281c549d3517 (diff)
Move the drawer example under extras
Change-Id: I61827e005c9c7a047e181c8f23baac9a09a865ee Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
-rw-r--r--.gitignore2
-rw-r--r--examples/quick/controls/controls.pro1
-rw-r--r--examples/quick/extras/drawer/drawer.pro (renamed from examples/quick/controls/drawer/drawer.pro)0
-rw-r--r--examples/quick/extras/drawer/drawer.qrc (renamed from examples/quick/controls/drawer/drawer.qrc)0
-rw-r--r--examples/quick/extras/drawer/images/arrow.png (renamed from examples/quick/controls/drawer/images/arrow.png)bin2446 -> 2446 bytes
-rw-r--r--examples/quick/extras/drawer/images/qt-logo.png (renamed from examples/quick/controls/drawer/images/qt-logo.png)bin21710 -> 21710 bytes
-rw-r--r--examples/quick/extras/drawer/main.cpp (renamed from examples/quick/controls/drawer/main.cpp)0
-rw-r--r--examples/quick/extras/drawer/main.qml (renamed from examples/quick/controls/drawer/main.qml)0
-rw-r--r--examples/quick/extras/extras.pro3
-rw-r--r--examples/quick/quick.pro3
10 files changed, 6 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 16e4e9cd..802236a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,10 +6,10 @@
/mkspecs
/examples/quick/calendar/calendar
-/examples/quick/controls/drawer/drawer
/examples/quick/controls/mirroring/mirroring
/examples/quick/controls/theme/theme
/examples/quick/controls/tabs/tabs
+/examples/quick/extras/drawer/drawer
/tests/auto/controls/tst_controls
/tests/auto/declarative/tst_declarative
diff --git a/examples/quick/controls/controls.pro b/examples/quick/controls/controls.pro
index 37087c42..f3b2e617 100644
--- a/examples/quick/controls/controls.pro
+++ b/examples/quick/controls/controls.pro
@@ -1,6 +1,5 @@
TEMPLATE = subdirs
SUBDIRS += \
- drawer \
mirroring \
theme \
tabs
diff --git a/examples/quick/controls/drawer/drawer.pro b/examples/quick/extras/drawer/drawer.pro
index 8c128054..8c128054 100644
--- a/examples/quick/controls/drawer/drawer.pro
+++ b/examples/quick/extras/drawer/drawer.pro
diff --git a/examples/quick/controls/drawer/drawer.qrc b/examples/quick/extras/drawer/drawer.qrc
index 25cc5cbe..25cc5cbe 100644
--- a/examples/quick/controls/drawer/drawer.qrc
+++ b/examples/quick/extras/drawer/drawer.qrc
diff --git a/examples/quick/controls/drawer/images/arrow.png b/examples/quick/extras/drawer/images/arrow.png
index 4981e0de..4981e0de 100644
--- a/examples/quick/controls/drawer/images/arrow.png
+++ b/examples/quick/extras/drawer/images/arrow.png
Binary files differ
diff --git a/examples/quick/controls/drawer/images/qt-logo.png b/examples/quick/extras/drawer/images/qt-logo.png
index cf350dad..cf350dad 100644
--- a/examples/quick/controls/drawer/images/qt-logo.png
+++ b/examples/quick/extras/drawer/images/qt-logo.png
Binary files differ
diff --git a/examples/quick/controls/drawer/main.cpp b/examples/quick/extras/drawer/main.cpp
index 92844360..92844360 100644
--- a/examples/quick/controls/drawer/main.cpp
+++ b/examples/quick/extras/drawer/main.cpp
diff --git a/examples/quick/controls/drawer/main.qml b/examples/quick/extras/drawer/main.qml
index 55385a6a..55385a6a 100644
--- a/examples/quick/controls/drawer/main.qml
+++ b/examples/quick/extras/drawer/main.qml
diff --git a/examples/quick/extras/extras.pro b/examples/quick/extras/extras.pro
new file mode 100644
index 00000000..960d3705
--- /dev/null
+++ b/examples/quick/extras/extras.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+SUBDIRS += \
+ drawer
diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
index 80f94e86..18a33efe 100644
--- a/examples/quick/quick.pro
+++ b/examples/quick/quick.pro
@@ -1,4 +1,5 @@
TEMPLATE = subdirs
SUBDIRS += \
calendar \
- controls
+ controls \
+ extras