diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-08-13 11:54:26 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-08-19 18:55:35 +0200 |
| commit | 6713e9266b5df317109f1645ac516346a6f9a44c (patch) | |
| tree | 1bc81fa70dc67f7c5df5551fdb2813d3400bf04d /examples | |
| parent | 1c7cfb2c890243a59aff8583d3fc5cbdf476ca7f (diff) | |
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>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/examples.pro | 4 | ||||
| -rw-r--r-- | examples/quick/quicknanobrowser/main.cpp (renamed from examples/qtquick/main.cpp) | 0 | ||||
| -rw-r--r-- | examples/quick/quicknanobrowser/quicknanobrowser.pro (renamed from examples/qtquick/qtquick.pro) | 4 | ||||
| -rw-r--r-- | examples/quick/quicknanobrowser/quickwindow.cpp (renamed from examples/qtquick/quickwindow.cpp) | 0 | ||||
| -rw-r--r-- | examples/quick/quicknanobrowser/quickwindow.h (renamed from examples/qtquick/quickwindow.h) | 0 | ||||
| -rw-r--r-- | examples/quick/quicknanobrowser/quickwindow.qml (renamed from examples/qtquick/quickwindow.qml) | 0 | ||||
| -rw-r--r-- | examples/quick/quicknanobrowser/resources.qrc (renamed from examples/qtquick/resources.qrc) | 0 | ||||
| -rw-r--r-- | examples/widgets/widgetsnanobrowser/main.cpp (renamed from examples/widgets/main.cpp) | 0 | ||||
| -rw-r--r-- | examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro (renamed from examples/widgets/widgets.pro) | 4 | ||||
| -rw-r--r-- | examples/widgets/widgetsnanobrowser/widgetwindow.cpp (renamed from examples/widgets/widgetwindow.cpp) | 0 | ||||
| -rw-r--r-- | examples/widgets/widgetsnanobrowser/widgetwindow.h (renamed from examples/widgets/widgetwindow.h) | 0 |
11 files changed, 6 insertions, 6 deletions
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 index 982c1eb7a..982c1eb7a 100644 --- a/examples/qtquick/main.cpp +++ b/examples/quick/quicknanobrowser/main.cpp diff --git a/examples/qtquick/qtquick.pro b/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 index 1f753c691..1f753c691 100644 --- a/examples/qtquick/quickwindow.cpp +++ b/examples/quick/quicknanobrowser/quickwindow.cpp diff --git a/examples/qtquick/quickwindow.h b/examples/quick/quicknanobrowser/quickwindow.h index 3f1f944ca..3f1f944ca 100644 --- a/examples/qtquick/quickwindow.h +++ b/examples/quick/quicknanobrowser/quickwindow.h diff --git a/examples/qtquick/quickwindow.qml b/examples/quick/quicknanobrowser/quickwindow.qml index 9086d26fa..9086d26fa 100644 --- a/examples/qtquick/quickwindow.qml +++ b/examples/quick/quicknanobrowser/quickwindow.qml diff --git a/examples/qtquick/resources.qrc b/examples/quick/quicknanobrowser/resources.qrc index de8232440..de8232440 100644 --- a/examples/qtquick/resources.qrc +++ b/examples/quick/quicknanobrowser/resources.qrc diff --git a/examples/widgets/main.cpp b/examples/widgets/widgetsnanobrowser/main.cpp index f6c9a37b0..f6c9a37b0 100644 --- a/examples/widgets/main.cpp +++ b/examples/widgets/widgetsnanobrowser/main.cpp diff --git a/examples/widgets/widgets.pro b/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 index a1ab56d0a..a1ab56d0a 100644 --- a/examples/widgets/widgetwindow.cpp +++ b/examples/widgets/widgetsnanobrowser/widgetwindow.cpp diff --git a/examples/widgets/widgetwindow.h b/examples/widgets/widgetsnanobrowser/widgetwindow.h index 863e8a73f..863e8a73f 100644 --- a/examples/widgets/widgetwindow.h +++ b/examples/widgets/widgetsnanobrowser/widgetwindow.h |