From 6713e9266b5df317109f1645ac516346a6f9a44c Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Tue, 13 Aug 2013 11:54:26 +0200
Subject: [PATCH] Prepare the directories to have more examples included.

This also ajust the name to be consistent with other Qt examples.
- Move nano browser one directory level down,
  also renaming them to match their target name
- Remove the dashes from the target names
- Rename the qtquick example directory to quick, matching the style in lib

Change-Id: I4a5e31be0b919ae596eadbf731be52372ae61151
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
---
 examples/examples.pro                                         | 4 ++--
 examples/{qtquick => quick/quicknanobrowser}/main.cpp         | 0
 .../quicknanobrowser/quicknanobrowser.pro}                    | 4 ++--
 examples/{qtquick => quick/quicknanobrowser}/quickwindow.cpp  | 0
 examples/{qtquick => quick/quicknanobrowser}/quickwindow.h    | 0
 examples/{qtquick => quick/quicknanobrowser}/quickwindow.qml  | 0
 examples/{qtquick => quick/quicknanobrowser}/resources.qrc    | 0
 examples/widgets/{ => widgetsnanobrowser}/main.cpp            | 0
 .../widgetsnanobrowser.pro}                                   | 4 ++--
 examples/widgets/{ => widgetsnanobrowser}/widgetwindow.cpp    | 0
 examples/widgets/{ => widgetsnanobrowser}/widgetwindow.h      | 0
 11 files changed, 6 insertions(+), 6 deletions(-)
 rename examples/{qtquick => quick/quicknanobrowser}/main.cpp (100%)
 rename examples/{qtquick/qtquick.pro => quick/quicknanobrowser/quicknanobrowser.pro} (83%)
 rename examples/{qtquick => quick/quicknanobrowser}/quickwindow.cpp (100%)
 rename examples/{qtquick => quick/quicknanobrowser}/quickwindow.h (100%)
 rename examples/{qtquick => quick/quicknanobrowser}/quickwindow.qml (100%)
 rename examples/{qtquick => quick/quicknanobrowser}/resources.qrc (100%)
 rename examples/widgets/{ => widgetsnanobrowser}/main.cpp (100%)
 rename examples/widgets/{widgets.pro => widgetsnanobrowser/widgetsnanobrowser.pro} (65%)
 rename examples/widgets/{ => widgetsnanobrowser}/widgetwindow.cpp (100%)
 rename examples/widgets/{ => widgetsnanobrowser}/widgetwindow.h (100%)

diff --git a/examples/examples.pro b/examples/examples.pro
index eb04ac0ec..970c58c69 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,4 +1,4 @@
 TEMPLATE=subdirs
 
-SUBDIRS += qtquick
-qtHaveModule(widgets): SUBDIRS += widgets
+SUBDIRS += quick/quicknanobrowser
+qtHaveModule(widgets): SUBDIRS += widgets/widgetsnanobrowser
diff --git a/examples/qtquick/main.cpp b/examples/quick/quicknanobrowser/main.cpp
similarity index 100%
rename from examples/qtquick/main.cpp
rename to examples/quick/quicknanobrowser/main.cpp
diff --git a/examples/qtquick/qtquick.pro b/examples/quick/quicknanobrowser/quicknanobrowser.pro
similarity index 83%
rename from examples/qtquick/qtquick.pro
rename to examples/quick/quicknanobrowser/quicknanobrowser.pro
index 3b3e98cf1..da71b034c 100644
--- a/examples/qtquick/qtquick.pro
+++ b/examples/quick/quicknanobrowser/quicknanobrowser.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
-TARGET = qtquick-nano-browser
+TARGET = quicknanobrowser
 
-include(../common.pri)
+include(../../common.pri)
 
 HEADERS = quickwindow.h
 SOURCES = quickwindow.cpp main.cpp
diff --git a/examples/qtquick/quickwindow.cpp b/examples/quick/quicknanobrowser/quickwindow.cpp
similarity index 100%
rename from examples/qtquick/quickwindow.cpp
rename to examples/quick/quicknanobrowser/quickwindow.cpp
diff --git a/examples/qtquick/quickwindow.h b/examples/quick/quicknanobrowser/quickwindow.h
similarity index 100%
rename from examples/qtquick/quickwindow.h
rename to examples/quick/quicknanobrowser/quickwindow.h
diff --git a/examples/qtquick/quickwindow.qml b/examples/quick/quicknanobrowser/quickwindow.qml
similarity index 100%
rename from examples/qtquick/quickwindow.qml
rename to examples/quick/quicknanobrowser/quickwindow.qml
diff --git a/examples/qtquick/resources.qrc b/examples/quick/quicknanobrowser/resources.qrc
similarity index 100%
rename from examples/qtquick/resources.qrc
rename to examples/quick/quicknanobrowser/resources.qrc
diff --git a/examples/widgets/main.cpp b/examples/widgets/widgetsnanobrowser/main.cpp
similarity index 100%
rename from examples/widgets/main.cpp
rename to examples/widgets/widgetsnanobrowser/main.cpp
diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro
similarity index 65%
rename from examples/widgets/widgets.pro
rename to examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro
index cf016402c..4a4cefd42 100644
--- a/examples/widgets/widgets.pro
+++ b/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
-TARGET = widget-nano-browser
+TARGET = widgetsnanobrowser
 
-include(../common.pri)
+include(../../common.pri)
 
 HEADERS = widgetwindow.h
 SOURCES = widgetwindow.cpp main.cpp
diff --git a/examples/widgets/widgetwindow.cpp b/examples/widgets/widgetsnanobrowser/widgetwindow.cpp
similarity index 100%
rename from examples/widgets/widgetwindow.cpp
rename to examples/widgets/widgetsnanobrowser/widgetwindow.cpp
diff --git a/examples/widgets/widgetwindow.h b/examples/widgets/widgetsnanobrowser/widgetwindow.h
similarity index 100%
rename from examples/widgets/widgetwindow.h
rename to examples/widgets/widgetsnanobrowser/widgetwindow.h
-- 
GitLab