diff options
author | Weblate <noreply@weblate.org> | 2017-06-21 10:53:14 +0200 |
---|---|---|
committer | Weblate <noreply@weblate.org> | 2017-06-21 10:53:14 +0200 |
commit | 822427d3b6e482e09d433c19b8517e10578c4fa7 (patch) | |
tree | b06dccee376b00bb3abd8705b38af8dc83d3b91d /main.cpp | |
parent | c57b8966d8c85e195494138c5ba1b33b75d0a601 (diff) | |
parent | 941e702b9d244a9f469bbdef531dffa1c6f3eac4 (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 - Florent Revest <revestflo@gmail.com> + * Copyright (C) 2017 - Florent Revest <revestflo@gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,18 +15,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <QQuickView> -#include <QGuiApplication> -#include <QScreen> -#include <MDeclarativeCache> +#include <asteroidapp.h> -Q_DECL_EXPORT int main(int argc, char *argv[]) +int main(int argc, char *argv[]) { - QScopedPointer<QGuiApplication> app(MDeclarativeCache::qApplication(argc, argv)); - QScopedPointer<QQuickView> view(MDeclarativeCache::qQuickView()); - view->setSource(QUrl("qrc:/main.qml")); - view->setTitle("Stopwatch"); - view->resize(app->primaryScreen()->size()); - view->show(); - return app->exec(); + return AsteroidApp::main(argc, argv); } |