feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QNX: Use QtQuick2ApplicationViewer for BB Quick 2 app templates

Browse Source 
Change-Id: I7b5029856bcba23e89a5ff83a5ae62906d1dbbe1
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
This commit is contained in:
El Mehdi Fekari
2013-01-29 18:14:58 +01:00
committed by Nicolas Arnaud-Cormos
parent fe10c7aa1e
commit 1a0bed277d
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp
View File

@@ -26,6 +26,9 @@ QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path)
if (!QDir::isAbsolutePath(path))
return QString::fromLatin1("%1/../Resources/%2")
.arg(QCoreApplication::applicationDirPath(), path);
#elif defined(Q_OS_QNX)
if (!QDir::isAbsolutePath(path))
return QString::fromLatin1("app/native/%1").arg(path);
#elif defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID)
const QString pathInInstallDir =
QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
@@ -65,7 +68,7 @@ void QtQuick2ApplicationViewer::addImportPath(const QString &path)
void QtQuick2ApplicationViewer::showExpanded()
{
#if defined(Q_WS_SIMULATOR)
#if defined(Q_WS_SIMULATOR) || defined(Q_OS_QNX)
showFullScreen();
#else
show();

19
share/qtcreator/templates/wizards/bb-qt5-quick2app/main.cpp
View File

@@ -1,18 +1,13 @@
#include <QGuiApplication>
#include <QQuickView>
#include <QQmlEngine>
#include "qtquick2applicationviewer.h"
int main( int argc, char** argv )
int main(int argc, char *argv[])
{
QGuiApplication app( argc, argv );
QGuiApplication app(argc, argv);
QQuickView view;
view.setResizeMode( QQuickView::SizeRootObjectToView );
view.setSource( QUrl( "app/native/qml/main.qml" ) );
QObject::connect( view.engine(), SIGNAL( quit() ),
QCoreApplication::instance(), SLOT( quit() ) );
view.show();
QtQuick2ApplicationViewer viewer;
viewer.setMainQmlFile(QLatin1String("qml/main.qml")); // MAINQML
viewer.showExpanded();
return app.exec();
}
}

3
share/qtcreator/templates/wizards/bb-qt5-quick2app/project.pro
View File

@@ -1,5 +1,8 @@
TEMPLATE = app
# Please do not modify the following line.
include(qtquick2applicationviewer/qtquick2applicationviewer.pri)
QT += qml quick
# Additional import path used to resolve QML modules in Creator's code model

3
share/qtcreator/templates/wizards/bb-qt5-quick2app/wizard.xml
View File

@@ -42,5 +42,8 @@
<file source="qml/main.qml" openeditor="true"/>
<file source="bar-descriptor.xml" openeditor="true"/>
<file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
<file source="../../qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.h" target="qtquick2applicationviewer/qtquick2applicationviewer.h" />
<file source="../../qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp" target="qtquick2applicationviewer/qtquick2applicationviewer.cpp" />
<file source="../../qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.pri" target="qtquick2applicationviewer/qtquick2applicationviewer.pri" />
</files>
</wizard>