More consistent examples directory structure

Under examples the next directory level distinguishes imports/modules
and the next directory level distinguishes examples.

Change-Id: Icabadaac6ccb9c1c424efa9c9e64a7d94bc7c0da
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

examples/localstorage/localstorage.pro

@@ -1,9 +1,2 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/localstorage
-qml.files = localstorage.qml hello.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/localstorage
-INSTALLS += target qml
+TEMPLATE = subdirs
+SUBDIRS += localstorage

examples/localstorage/localstorage/localstorage.pro

@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/localstorage
+qml.files = localstorage.qml hello.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/localstorage
+INSTALLS += target qml

examples/localstorage/localstorage/main.cpp

@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(localstorage)
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(localstorage)

examples/qml/cppextensions/cppextensions.pro

@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    imageprovider \
-    plugins \
-    networkaccessmanagerfactory \
-    referenceexamples
-

examples/qml/cppextensions/cppextensions.qmlproject

@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    importPaths: [ "plugins" ]
-}

examples/qml/qml.pro

@@ -1 +1,7 @@
 TEMPLATE = subdirs
+
+SUBDIRS +=imageprovider \
+          plugins \
+          networkaccessmanagerfactory \
+          referenceexamples \
+          shell