Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative into newdocs

Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137

1 files changed, 2 insertions, 24 deletions

diff --git a/examples/demos/tweetsearch/main.cpp b/examples/demos/tweetsearch/main.cpp
index 211d3eb07b..8b1d59679c 100644
--- a/examples/demos/tweetsearch/main.cpp
+++ b/examples/demos/tweetsearch/main.cpp
@@ -37,27 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
-#include <QGuiApplication>
-#include <QStringList>
-#include <QQuickView>
-#include <QQmlEngine>
-
-void usage()
-{
-    exit(0);
-}
-
-int main(int argc, char* argv[])
-{
-    QGuiApplication app(argc,argv);
-    QQuickView view;
-    QUrl launchFile = QUrl::fromLocalFile(QLatin1String("tweetsearch.qml"));
-    if (app.arguments().contains(QLatin1String("-help")))
-        usage();
-    view.connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()));
-    view.setSource(launchFile);
-    view.show();
-    return app.exec();
-}
-
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(tweetsearch)