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

Making the QmlApplicationViewer Qt5 compatible

Browse Source 
This patch makes a "QmlApplicationViewer" based application from
the Qt Quick app wizard buildable and runnable with Qt5. Note,
that this is still QtQuick 1.1. We are still missing a QtQuick 2.0
based pendant of QmlApplicationViewer.

In addition (separate patch), we may want to tweak the wizard
flags in a way that the wizard allows to create a "Qt Quick 1"
application for a Qt5 target. (Or perhaps we explicitly do not
want that, because we want the developer to use QtQuick 2 with
Qt5?)

Change-Id: Ie3fc8a77a1ff4fba3244f2047d2685c570014356
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
This commit is contained in:
Alessandro Portale
2012-08-10 18:08:18 +02:00
parent 6887d28e09
commit 0418e6dc64
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
View File

@@ -116,6 +116,7 @@ void QmlApplicationViewer::addImportPath(const QString &path)
void QmlApplicationViewer::setOrientation(ScreenOrientation orientation) void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
{ {
#if QT_VERSION < 0x050000
#if defined(Q_OS_SYMBIAN) #if defined(Q_OS_SYMBIAN)
// If the version of Qt on the device is < 4.7.2, that attribute won't work // If the version of Qt on the device is < 4.7.2, that attribute won't work
if (orientation != ScreenOrientationAuto) { if (orientation != ScreenOrientationAuto) {
@@ -155,6 +156,9 @@ void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
#endif // QT_VERSION < 0x040702 #endif // QT_VERSION < 0x040702
}; };
setAttribute(attribute, true); setAttribute(attribute, true);
#else // QT_VERSION < 0x050000
Q_UNUSED(orientation)
#endif // QT_VERSION < 0x050000
} }
void QmlApplicationViewer::showExpanded() void QmlApplicationViewer::showExpanded()

4
share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri
View File

@@ -4,7 +4,11 @@
# It is recommended not to modify this file, since newer versions of Qt Creator # It is recommended not to modify this file, since newer versions of Qt Creator
# may offer an updated version of it. # may offer an updated version of it.
equals(QT_MAJOR_VERSION, 5) {
QT += quick1
} else {
QT += declarative QT += declarative
}
SOURCES += $$PWD/qmlapplicationviewer.cpp SOURCES += $$PWD/qmlapplicationviewer.cpp
HEADERS += $$PWD/qmlapplicationviewer.h HEADERS += $$PWD/qmlapplicationviewer.h

2
src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
View File

@@ -463,7 +463,7 @@ QString QtQuickApp::componentSetDir(ComponentSet componentSet) const
} }
} }
const int QtQuickApp::StubVersion = 21; const int QtQuickApp::StubVersion = 22;
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Qt4ProjectManager