##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

qmlcustomlegend: fix qt5 build
Jani Honkonen -
r2077:816c8c6e440e
parent child
Show More
Side by Side Unified
Context file:
r2077:816c8c6e440e Loading diff...:
Show file before | Show file after | Hide comments
@@ -18,8 +18,12
18 18 **
19 19 ****************************************************************************/
20 20
21 #include <QtGui/QApplication>
22 #include <QDeclarativeEngine>
21 #include <QApplication>
22 #ifdef QT5_QUICK_1
23 #include <QtQuick1/QDeclarativeEngine>
24 #else
25 #include <QtDeclarative/QDeclarativeEngine>
26 #endif
23 27 #include "qmlapplicationviewer.h"
24 28
25 29 Q_DECL_EXPORT int main(int argc, char *argv[])
@@ -27,7 +31,7 Q_DECL_EXPORT int main(int argc, char *argv[])
27 31 QScopedPointer<QApplication> app(createApplication(argc, argv));
28 32 QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
29 33
30 viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
34 //viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
31 35 viewer->setSource(QUrl("qrc:/qml/qmlcustomlegend/loader.qml"));
32 36 viewer->setRenderHint(QPainter::Antialiasing, true);
33 37 viewer->showExpanded();
Show file before | Show file after | Hide comments
@@ -12,10 +12,16
12 12
13 13 #include <QtCore/QDir>
14 14 #include <QtCore/QFileInfo>
15 #include <QtDeclarative/QDeclarativeComponent>
16 #include <QtDeclarative/QDeclarativeEngine>
17 #include <QtDeclarative/QDeclarativeContext>
18 #include <QtGui/QApplication>
15 #ifdef QT5_QUICK_1
16 #include <QtQuick1/QDeclarativeComponent>
17 #include <QtQuick1/QDeclarativeEngine>
18 #include <QtQuick1/QDeclarativeContext>
19 #else
20 #include <QtDeclarative/QDeclarativeComponent>
21 #include <QtDeclarative/QDeclarativeEngine>
22 #include <QtDeclarative/QDeclarativeContext>
23 #endif
24 #include <QApplication>
19 25
20 26 #include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
21 27
@@ -136,48 +142,48 void QmlApplicationViewer::addImportPath(const QString &path)
136 142 d->view->engine()->addImportPath(d->adjustPath(path));
137 143 }
138 144
139 void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
140 {
141 #if defined(Q_OS_SYMBIAN)
142 // If the version of Qt on the device is < 4.7.2, that attribute won't work
143 if (orientation != ScreenOrientationAuto) {
144 const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));
145 if (v.count() == 3 && (v.at(0).toInt() << 16 | v.at(1).toInt() << 8 | v.at(2).toInt()) < 0x040702) {
146 qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");
147 return;
148 }
149 }
150 #endif // Q_OS_SYMBIAN
151
152 Qt::WidgetAttribute attribute;
153 switch (orientation) {
154 #if QT_VERSION < 0x040702
155 // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
156 case ScreenOrientationLockPortrait:
157 attribute = static_cast<Qt::WidgetAttribute>(128);
158 break;
159 case ScreenOrientationLockLandscape:
160 attribute = static_cast<Qt::WidgetAttribute>(129);
161 break;
162 default:
163 case ScreenOrientationAuto:
164 attribute = static_cast<Qt::WidgetAttribute>(130);
165 break;
166 #else // QT_VERSION < 0x040702
167 case ScreenOrientationLockPortrait:
168 attribute = Qt::WA_LockPortraitOrientation;
169 break;
170 case ScreenOrientationLockLandscape:
171 attribute = Qt::WA_LockLandscapeOrientation;
172 break;
173 default:
174 case ScreenOrientationAuto:
175 attribute = Qt::WA_AutoOrientation;
176 break;
177 #endif // QT_VERSION < 0x040702
178 };
179 setAttribute(attribute, true);
180 }
145 //void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
146 //{
147 //#if defined(Q_OS_SYMBIAN)
148 // // If the version of Qt on the device is < 4.7.2, that attribute won't work
149 // if (orientation != ScreenOrientationAuto) {
150 // const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));
151 // if (v.count() == 3 && (v.at(0).toInt() << 16 | v.at(1).toInt() << 8 | v.at(2).toInt()) < 0x040702) {
152 // qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");
153 // return;
154 // }
155 // }
156 //#endif // Q_OS_SYMBIAN
157
158 // Qt::WidgetAttribute attribute;
159 // switch (orientation) {
160 //#if QT_VERSION < 0x040702
161 // // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
162 // case ScreenOrientationLockPortrait:
163 // attribute = static_cast<Qt::WidgetAttribute>(128);
164 // break;
165 // case ScreenOrientationLockLandscape:
166 // attribute = static_cast<Qt::WidgetAttribute>(129);
167 // break;
168 // default:
169 // case ScreenOrientationAuto:
170 // attribute = static_cast<Qt::WidgetAttribute>(130);
171 // break;
172 //#else // QT_VERSION < 0x040702
173 // case ScreenOrientationLockPortrait:
174 // attribute = Qt::WA_LockPortraitOrientation;
175 // break;
176 // case ScreenOrientationLockLandscape:
177 // attribute = Qt::WA_LockLandscapeOrientation;
178 // break;
179 // default:
180 // case ScreenOrientationAuto:
181 // attribute = Qt::WA_AutoOrientation;
182 // break;
183 //#endif // QT_VERSION < 0x040702
184 // };
185 // setAttribute(attribute, true);
186 //}
181 187
182 188 void QmlApplicationViewer::showExpanded()
183 189 {
Show file before | Show file after | Hide comments
@@ -11,7 +11,11
11 11 #ifndef QMLAPPLICATIONVIEWER_H
12 12 #define QMLAPPLICATIONVIEWER_H
13 13
14 #include <QtDeclarative/QDeclarativeView>
14 #ifdef QT5_QUICK_1
15 #include <QtQuick1/QDeclarativeView>
16 #else
17 #include <QtDeclarative/QDeclarativeView>
18 #endif
15 19
16 20 class QmlApplicationViewer : public QDeclarativeView
17 21 {
@@ -33,7 +37,7 public:
33 37 void addImportPath(const QString &path);
34 38
35 39 // Note that this will only have an effect on Symbian and Fremantle.
36 void setOrientation(ScreenOrientation orientation);
40 // void setOrientation(ScreenOrientation orientation);
37 41
38 42 void showExpanded();
39 43
Show file before | Show file after | Hide comments
@@ -1,4 +1,8
1 QT += declarative
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 QT += declarative
5 }
2 6
3 7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 8 HEADERS += $$PWD/qmlapplicationviewer.h
General Comments 0
You need to be logged in to leave comments. Login now