HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2405:92b9e13486f5

Forced update of qmlapplicationviewer templates

Tero Ahola -

r2405:92b9e13486f5 release-1.2.0

parent child

Context file:

r2405:92b9e13486f5

Expand all files

demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.cpp +69 -92

@@ -1,4 +1,4
1	// checksum 0x~~78c~~ version 0x~~60010~~	1	// checksum 0xbd34 version 0x80016
2	/*	2	/*
3	This file was generated by the Qt Quick Application wizard of Qt Creator.	3	This file was generated by the Qt Quick Application wizard of Qt Creator.
4	QmlApplicationViewer is a convenience class containing mobile device specific	4	QmlApplicationViewer is a convenience class containing mobile device specific
@@ -10,12 +10,12
10		10
11	#include "qmlapplicationviewer.h"	11	#include "qmlapplicationviewer.h"
12		12
13	#include <Q~~tCore/Q~~Dir>	13	#include <QDir>
14	#include <Q~~tCore/Q~~FileInfo>	14	#include <QFileInfo>
15	#include <QtDeclarative/QDeclarativeComponent>
16	#include <QtDeclarative/QDeclarativeEngine>
17	#include <QtDeclarative/QDeclarativeContext>
18	#include <QApplication>	15	#include <QApplication>
		16	#include <QDeclarativeComponent>
		17	#include <QDeclarativeEngine>
		18	#include <QDeclarativeContext>
19		19
20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN	20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
21		21
@@ -50,63 +50,47 static QmlJsDebuggingEnabler enableDebuggingHelper;
50		50
51	class QmlApplicationViewerPrivate	51	class QmlApplicationViewerPrivate
52	{	52	{
53	QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
54
55	QString mainQmlFile;	53	QString mainQmlFile;
56	QDeclarativeView *view;
57	friend class QmlApplicationViewer;	54	friend class QmlApplicationViewer;
58	QString adjustPath(const QString &path);	55	static QString adjustPath(const QString &path);
59	};	56	};
60		57
61	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)	58	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
62	{	59	{
63	#ifdef Q_OS_UNIX
64	#ifdef Q_OS_MAC	60	#ifdef Q_OS_MAC
65	if (!QDir::isAbsolutePath(path))	61	if (!QDir::isAbsolutePath(path))
66	return QCoreApplication::applicationDirPath()	62	return QString::fromLatin1("%1/../Resources/%2")
67	+ QLatin1String("/../Resources/") + path;	63	.arg(QCoreApplication::applicationDirPath(), path);
68	#else	64	#elif defined(Q_OS_QNX)
69	QString pathInInstallDir;	65	if (!QDir::isAbsolutePath(path))
70	const QString applicationDirPath = QCoreApplication::applicationDirPath();	66	return QString::fromLatin1("app/native/%1").arg(path);
71	pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);	67	#elif !defined(Q_OS_ANDROID)
72		68	QString pathInInstallDir =
		69	QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
		70	if (QFileInfo(pathInInstallDir).exists())
		71	return pathInInstallDir;
		72	pathInInstallDir =
		73	QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
73	if (QFileInfo(pathInInstallDir).exists())	74	if (QFileInfo(pathInInstallDir).exists())
74	return pathInInstallDir;	75	return pathInInstallDir;
75	#endif
76	#endif	76	#endif
77	return path;	77	return path;
78	}	78	}
79		79
80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)	80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
81	: QDeclarativeView(parent)	81	: QDeclarativeView(parent)
82	, d(new QmlApplicationViewerPrivate(~~this~~))	82	, d(new QmlApplicationViewerPrivate())
83	{	83	{
84	connect(engine(), SIGNAL(quit()), SLOT(close()));	84	connect(engine(), SIGNAL(quit()), SLOT(close()));
85	setResizeMode(QDeclarativeView::SizeRootObjectToView);	85	setResizeMode(QDeclarativeView::SizeRootObjectToView);
86	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
87	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
88	#if !defined(NO_JSDEBUGGER)
89	new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
90	#endif
91	#if !defined(NO_QMLOBSERVER)
92	new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
93	#endif
94	#endif
95	}
96		86
97	QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView view, QWidget parent)
98	: QDeclarativeView(parent)
99	, d(new QmlApplicationViewerPrivate(view))
100	{
101	connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));
102	view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
103	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in	87	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
104	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800	88	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
105	#if !defined(NO_JSDEBUGGER)	89	#if !defined(NO_JSDEBUGGER)
106	new QmlJSDebugger::JSDebuggerAgent(d->~~view~~->engine());	90	new QmlJSDebugger::JSDebuggerAgent(engine());
107	#endif	91	#endif
108	#if !defined(NO_QMLOBSERVER)	92	#if !defined(NO_QMLOBSERVER)
109	new QmlJSDebugger::QDeclarativeViewObserver(d->~~view~~, d->~~view~~);	93	new QmlJSDebugger::QDeclarativeViewObserver(this, this);
110	#endif	94	#endif
111	#endif	95	#endif
112	}	96	}
@@ -118,75 +102,68 QmlApplicationViewer::~QmlApplicationViewer()
118		102
119	QmlApplicationViewer *QmlApplicationViewer::create()	103	QmlApplicationViewer *QmlApplicationViewer::create()
120	{	104	{
121	#ifdef HARMATTAN_BOOSTER
122	return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);
123	#else
124	return new QmlApplicationViewer();	105	return new QmlApplicationViewer();
125	#endif
126	}	106	}
127		107
128	void QmlApplicationViewer::setMainQmlFile(const QString &file)	108	void QmlApplicationViewer::setMainQmlFile(const QString &file)
129	{	109	{
130	d->mainQmlFile = d->adjustPath(file);	110	d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
131	d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));	111	#ifdef Q_OS_ANDROID
		112	setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
		113	#else
		114	setSource(QUrl::fromLocalFile(d->mainQmlFile));
		115	#endif
132	}	116	}
133		117
134	void QmlApplicationViewer::addImportPath(const QString &path)	118	void QmlApplicationViewer::addImportPath(const QString &path)
135	{	119	{
136	d->~~view~~->engine()->addImportPath(d->adjustPath(path));	120	engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
137	}	121	}
138		122
139	//void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)	123	void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
140	//{	124	{
141	//#if defined(Q_OS_SYMBIAN)	125	#if QT_VERSION < 0x050000
142	// // If the version of Qt on the device is < 4.7.2, that attribute won't work	126	Qt::WidgetAttribute attribute;
143	// if (orientation != ScreenOrientationAuto) {	127	switch (orientation) {
144	// const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));	128	#if QT_VERSION < 0x040702
145	// if (v.count() == 3 && (v.at(0).toInt() << 16 \| v.at(1).toInt() << 8 \| v.at(2).toInt()) < 0x040702) {	129	// Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
146	// qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");	130	case ScreenOrientationLockPortrait:
147	// return;	131	attribute = static_cast<Qt::WidgetAttribute>(128);
148	// }	132	break;
149	// }	133	case ScreenOrientationLockLandscape:
150	//#endif // Q_OS_SYMBIAN	134	attribute = static_cast<Qt::WidgetAttribute>(129);
151		135	break;
152	// Qt::WidgetAttribute attribute;	136	default:
153	// switch (orientation) {	137	case ScreenOrientationAuto:
154	//#if QT_VERSION < 0x040702	138	attribute = static_cast<Qt::WidgetAttribute>(130);
155	// // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes	139	break;
156	// case ScreenOrientationLockPortrait:	140	#else // QT_VERSION < 0x040702
157	// attribute = static_cast<Qt::WidgetAttribute>(128);	141	case ScreenOrientationLockPortrait:
158	// break;	142	attribute = Qt::WA_LockPortraitOrientation;
159	// case ScreenOrientationLockLandscape:	143	break;
160	// attribute = static_cast<Qt::WidgetAttribute>(129);	144	case ScreenOrientationLockLandscape:
161	// break;	145	attribute = Qt::WA_LockLandscapeOrientation;
162	// default:	146	break;
163	// case ScreenOrientationAuto:	147	default:
164	// attribute = static_cast<Qt::WidgetAttribute>(130);	148	case ScreenOrientationAuto:
165	// break;	149	attribute = Qt::WA_AutoOrientation;
166	//#else // QT_VERSION < 0x040702	150	break;
167	// case ScreenOrientationLockPortrait:	151	#endif // QT_VERSION < 0x040702
168	// attribute = Qt::WA_LockPortraitOrientation;	152	};
169	// break;	153	setAttribute(attribute, true);
170	// case ScreenOrientationLockLandscape:	154	#else // QT_VERSION < 0x050000
171	// attribute = Qt::WA_LockLandscapeOrientation;	155	Q_UNUSED(orientation)
172	// break;	156	#endif // QT_VERSION < 0x050000
173	// default:	157	}
174	// case ScreenOrientationAuto:
175	// attribute = Qt::WA_AutoOrientation;
176	// break;
177	//#endif // QT_VERSION < 0x040702
178	// };
179	// setAttribute(attribute, true);
180	//}
181		158
182	void QmlApplicationViewer::showExpanded()	159	void QmlApplicationViewer::showExpanded()
183	{	160	{
184	#if defined(~~Q_OS_SYMBIAN) \|\| defined(~~MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)	161	#if defined(MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)
185	d->~~view~~->showFullScreen();	162	showFullScreen();
186	#elif defined(Q_WS_MAEMO_5)	163	#elif defined(Q_WS_MAEMO_5) \|\| defined(Q_OS_QNX)
187	d->~~view~~->showMaximized();	164	showMaximized();
188	#else	165	#else
189	d->~~view~~->show();	166	show();
190	#endif	167	#endif
191	}	168	}
192		169

demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.h +4 -5

-            // checksum 0x82ed version 0x60010
+            // checksum 0xc67a version 0x80016
             /*
               This file was generated by the Qt Quick Application wizard of Qt Creator.
               QmlApplicationViewer is a convenience class containing mobile device specific
             #ifndef QMLAPPLICATIONVIEWER_H
             #define QMLAPPLICATIONVIEWER_H
-            #include <QtDeclarative/QDeclarativeView>
+            #include <QDeclarativeView>
             class QmlApplicationViewer : public QDeclarativeView
             {
                 void setMainQmlFile(const QString &file);
                 void addImportPath(const QString &path);
-                // Note that this will only have an effect on Symbian and Fremantle.
+                // Note that this will only have an effect on Fremantle.
-                // void setOrientation(ScreenOrientation orientation);
+                void setOrientation(ScreenOrientation orientation);
                 void showExpanded();
             private:
-                explicit QmlApplicationViewer(QDeclarativeView *view, QWidget *parent);
                 class QmlApplicationViewerPrivate *d;
             };

demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp +69 -92

@@ -1,4 +1,4
1	// checksum 0x~~78c~~ version 0x~~60010~~	1	// checksum 0xbd34 version 0x80016
2	/*	2	/*
3	This file was generated by the Qt Quick Application wizard of Qt Creator.	3	This file was generated by the Qt Quick Application wizard of Qt Creator.
4	QmlApplicationViewer is a convenience class containing mobile device specific	4	QmlApplicationViewer is a convenience class containing mobile device specific
@@ -10,12 +10,12
10		10
11	#include "qmlapplicationviewer.h"	11	#include "qmlapplicationviewer.h"
12		12
13	#include <Q~~tCore/Q~~Dir>	13	#include <QDir>
14	#include <Q~~tCore/Q~~FileInfo>	14	#include <QFileInfo>
15	#include <QtDeclarative/QDeclarativeComponent>
16	#include <QtDeclarative/QDeclarativeEngine>
17	#include <QtDeclarative/QDeclarativeContext>
18	#include <QApplication>	15	#include <QApplication>
		16	#include <QDeclarativeComponent>
		17	#include <QDeclarativeEngine>
		18	#include <QDeclarativeContext>
19		19
20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN	20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
21		21
@@ -50,63 +50,47 static QmlJsDebuggingEnabler enableDebuggingHelper;
50		50
51	class QmlApplicationViewerPrivate	51	class QmlApplicationViewerPrivate
52	{	52	{
53	QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
54
55	QString mainQmlFile;	53	QString mainQmlFile;
56	QDeclarativeView *view;
57	friend class QmlApplicationViewer;	54	friend class QmlApplicationViewer;
58	QString adjustPath(const QString &path);	55	static QString adjustPath(const QString &path);
59	};	56	};
60		57
61	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)	58	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
62	{	59	{
63	#ifdef Q_OS_UNIX
64	#ifdef Q_OS_MAC	60	#ifdef Q_OS_MAC
65	if (!QDir::isAbsolutePath(path))	61	if (!QDir::isAbsolutePath(path))
66	return QCoreApplication::applicationDirPath()	62	return QString::fromLatin1("%1/../Resources/%2")
67	+ QLatin1String("/../Resources/") + path;	63	.arg(QCoreApplication::applicationDirPath(), path);
68	#else	64	#elif defined(Q_OS_QNX)
69	QString pathInInstallDir;	65	if (!QDir::isAbsolutePath(path))
70	const QString applicationDirPath = QCoreApplication::applicationDirPath();	66	return QString::fromLatin1("app/native/%1").arg(path);
71	pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);	67	#elif !defined(Q_OS_ANDROID)
72		68	QString pathInInstallDir =
		69	QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
		70	if (QFileInfo(pathInInstallDir).exists())
		71	return pathInInstallDir;
		72	pathInInstallDir =
		73	QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
73	if (QFileInfo(pathInInstallDir).exists())	74	if (QFileInfo(pathInInstallDir).exists())
74	return pathInInstallDir;	75	return pathInInstallDir;
75	#endif
76	#endif	76	#endif
77	return path;	77	return path;
78	}	78	}
79		79
80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)	80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
81	: QDeclarativeView(parent)	81	: QDeclarativeView(parent)
82	, d(new QmlApplicationViewerPrivate(~~this~~))	82	, d(new QmlApplicationViewerPrivate())
83	{	83	{
84	connect(engine(), SIGNAL(quit()), SLOT(close()));	84	connect(engine(), SIGNAL(quit()), SLOT(close()));
85	setResizeMode(QDeclarativeView::SizeRootObjectToView);	85	setResizeMode(QDeclarativeView::SizeRootObjectToView);
86	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
87	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
88	#if !defined(NO_JSDEBUGGER)
89	new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
90	#endif
91	#if !defined(NO_QMLOBSERVER)
92	new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
93	#endif
94	#endif
95	}
96		86
97	QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView view, QWidget parent)
98	: QDeclarativeView(parent)
99	, d(new QmlApplicationViewerPrivate(view))
100	{
101	connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));
102	view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
103	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in	87	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
104	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800	88	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
105	#if !defined(NO_JSDEBUGGER)	89	#if !defined(NO_JSDEBUGGER)
106	new QmlJSDebugger::JSDebuggerAgent(d->~~view~~->engine());	90	new QmlJSDebugger::JSDebuggerAgent(engine());
107	#endif	91	#endif
108	#if !defined(NO_QMLOBSERVER)	92	#if !defined(NO_QMLOBSERVER)
109	new QmlJSDebugger::QDeclarativeViewObserver(d->~~view~~, d->~~view~~);	93	new QmlJSDebugger::QDeclarativeViewObserver(this, this);
110	#endif	94	#endif
111	#endif	95	#endif
112	}	96	}
@@ -118,75 +102,68 QmlApplicationViewer::~QmlApplicationViewer()
118		102
119	QmlApplicationViewer *QmlApplicationViewer::create()	103	QmlApplicationViewer *QmlApplicationViewer::create()
120	{	104	{
121	#ifdef HARMATTAN_BOOSTER
122	return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);
123	#else
124	return new QmlApplicationViewer();	105	return new QmlApplicationViewer();
125	#endif
126	}	106	}
127		107
128	void QmlApplicationViewer::setMainQmlFile(const QString &file)	108	void QmlApplicationViewer::setMainQmlFile(const QString &file)
129	{	109	{
130	d->mainQmlFile = d->adjustPath(file);	110	d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
131	d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));	111	#ifdef Q_OS_ANDROID
		112	setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
		113	#else
		114	setSource(QUrl::fromLocalFile(d->mainQmlFile));
		115	#endif
132	}	116	}
133		117
134	void QmlApplicationViewer::addImportPath(const QString &path)	118	void QmlApplicationViewer::addImportPath(const QString &path)
135	{	119	{
136	d->~~view~~->engine()->addImportPath(d->adjustPath(path));	120	engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
137	}	121	}
138		122
139	//void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)	123	void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
140	//{	124	{
141	//#if defined(Q_OS_SYMBIAN)	125	#if QT_VERSION < 0x050000
142	// // If the version of Qt on the device is < 4.7.2, that attribute won't work	126	Qt::WidgetAttribute attribute;
143	// if (orientation != ScreenOrientationAuto) {	127	switch (orientation) {
144	// const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));	128	#if QT_VERSION < 0x040702
145	// if (v.count() == 3 && (v.at(0).toInt() << 16 \| v.at(1).toInt() << 8 \| v.at(2).toInt()) < 0x040702) {	129	// Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
146	// qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");	130	case ScreenOrientationLockPortrait:
147	// return;	131	attribute = static_cast<Qt::WidgetAttribute>(128);
148	// }	132	break;
149	// }	133	case ScreenOrientationLockLandscape:
150	//#endif // Q_OS_SYMBIAN	134	attribute = static_cast<Qt::WidgetAttribute>(129);
151		135	break;
152	// Qt::WidgetAttribute attribute;	136	default:
153	// switch (orientation) {	137	case ScreenOrientationAuto:
154	//#if QT_VERSION < 0x040702	138	attribute = static_cast<Qt::WidgetAttribute>(130);
155	// // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes	139	break;
156	// case ScreenOrientationLockPortrait:	140	#else // QT_VERSION < 0x040702
157	// attribute = static_cast<Qt::WidgetAttribute>(128);	141	case ScreenOrientationLockPortrait:
158	// break;	142	attribute = Qt::WA_LockPortraitOrientation;
159	// case ScreenOrientationLockLandscape:	143	break;
160	// attribute = static_cast<Qt::WidgetAttribute>(129);	144	case ScreenOrientationLockLandscape:
161	// break;	145	attribute = Qt::WA_LockLandscapeOrientation;
162	// default:	146	break;
163	// case ScreenOrientationAuto:	147	default:
164	// attribute = static_cast<Qt::WidgetAttribute>(130);	148	case ScreenOrientationAuto:
165	// break;	149	attribute = Qt::WA_AutoOrientation;
166	//#else // QT_VERSION < 0x040702	150	break;
167	// case ScreenOrientationLockPortrait:	151	#endif // QT_VERSION < 0x040702
168	// attribute = Qt::WA_LockPortraitOrientation;	152	};
169	// break;	153	setAttribute(attribute, true);
170	// case ScreenOrientationLockLandscape:	154	#else // QT_VERSION < 0x050000
171	// attribute = Qt::WA_LockLandscapeOrientation;	155	Q_UNUSED(orientation)
172	// break;	156	#endif // QT_VERSION < 0x050000
173	// default:	157	}
174	// case ScreenOrientationAuto:
175	// attribute = Qt::WA_AutoOrientation;
176	// break;
177	//#endif // QT_VERSION < 0x040702
178	// };
179	// setAttribute(attribute, true);
180	//}
181		158
182	void QmlApplicationViewer::showExpanded()	159	void QmlApplicationViewer::showExpanded()
183	{	160	{
184	#if defined(~~Q_OS_SYMBIAN) \|\| defined(~~MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)	161	#if defined(MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)
185	d->~~view~~->showFullScreen();	162	showFullScreen();
186	#elif defined(Q_WS_MAEMO_5)	163	#elif defined(Q_WS_MAEMO_5) \|\| defined(Q_OS_QNX)
187	d->~~view~~->showMaximized();	164	showMaximized();
188	#else	165	#else
189	d->~~view~~->show();	166	show();
190	#endif	167	#endif
191	}	168	}
192		169

demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h +4 -5

-            // checksum 0x82ed version 0x60010
+            // checksum 0xc67a version 0x80016
             /*
               This file was generated by the Qt Quick Application wizard of Qt Creator.
               QmlApplicationViewer is a convenience class containing mobile device specific
             #ifndef QMLAPPLICATIONVIEWER_H
             #define QMLAPPLICATIONVIEWER_H
-            #include <QtDeclarative/QDeclarativeView>
+            #include <QDeclarativeView>
             class QmlApplicationViewer : public QDeclarativeView
             {
                 void setMainQmlFile(const QString &file);
                 void addImportPath(const QString &path);
-                // Note that this will only have an effect on Symbian and Fremantle.
+                // Note that this will only have an effect on Fremantle.
-                // void setOrientation(ScreenOrientation orientation);
+                void setOrientation(ScreenOrientation orientation);
                 void showExpanded();
             private:
-                explicit QmlApplicationViewer(QDeclarativeView *view, QWidget *parent);
                 class QmlApplicationViewerPrivate *d;
             };

demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.cpp +69 -92

@@ -1,4 +1,4
1	// checksum 0x~~78c~~ version 0x~~60010~~	1	// checksum 0xbd34 version 0x80016
2	/*	2	/*
3	This file was generated by the Qt Quick Application wizard of Qt Creator.	3	This file was generated by the Qt Quick Application wizard of Qt Creator.
4	QmlApplicationViewer is a convenience class containing mobile device specific	4	QmlApplicationViewer is a convenience class containing mobile device specific
@@ -10,12 +10,12
10		10
11	#include "qmlapplicationviewer.h"	11	#include "qmlapplicationviewer.h"
12		12
13	#include <Q~~tCore/Q~~Dir>	13	#include <QDir>
14	#include <Q~~tCore/Q~~FileInfo>	14	#include <QFileInfo>
15	#include <QtDeclarative/QDeclarativeComponent>
16	#include <QtDeclarative/QDeclarativeEngine>
17	#include <QtDeclarative/QDeclarativeContext>
18	#include <QApplication>	15	#include <QApplication>
		16	#include <QDeclarativeComponent>
		17	#include <QDeclarativeEngine>
		18	#include <QDeclarativeContext>
19		19
20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN	20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
21		21
@@ -50,63 +50,47 static QmlJsDebuggingEnabler enableDebuggingHelper;
50		50
51	class QmlApplicationViewerPrivate	51	class QmlApplicationViewerPrivate
52	{	52	{
53	QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
54
55	QString mainQmlFile;	53	QString mainQmlFile;
56	QDeclarativeView *view;
57	friend class QmlApplicationViewer;	54	friend class QmlApplicationViewer;
58	QString adjustPath(const QString &path);	55	static QString adjustPath(const QString &path);
59	};	56	};
60		57
61	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)	58	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
62	{	59	{
63	#ifdef Q_OS_UNIX
64	#ifdef Q_OS_MAC	60	#ifdef Q_OS_MAC
65	if (!QDir::isAbsolutePath(path))	61	if (!QDir::isAbsolutePath(path))
66	return QCoreApplication::applicationDirPath()	62	return QString::fromLatin1("%1/../Resources/%2")
67	+ QLatin1String("/../Resources/") + path;	63	.arg(QCoreApplication::applicationDirPath(), path);
68	#else	64	#elif defined(Q_OS_QNX)
69	QString pathInInstallDir;	65	if (!QDir::isAbsolutePath(path))
70	const QString applicationDirPath = QCoreApplication::applicationDirPath();	66	return QString::fromLatin1("app/native/%1").arg(path);
71	pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);	67	#elif !defined(Q_OS_ANDROID)
72		68	QString pathInInstallDir =
		69	QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
		70	if (QFileInfo(pathInInstallDir).exists())
		71	return pathInInstallDir;
		72	pathInInstallDir =
		73	QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
73	if (QFileInfo(pathInInstallDir).exists())	74	if (QFileInfo(pathInInstallDir).exists())
74	return pathInInstallDir;	75	return pathInInstallDir;
75	#endif
76	#endif	76	#endif
77	return path;	77	return path;
78	}	78	}
79		79
80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)	80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
81	: QDeclarativeView(parent)	81	: QDeclarativeView(parent)
82	, d(new QmlApplicationViewerPrivate(~~this~~))	82	, d(new QmlApplicationViewerPrivate())
83	{	83	{
84	connect(engine(), SIGNAL(quit()), SLOT(close()));	84	connect(engine(), SIGNAL(quit()), SLOT(close()));
85	setResizeMode(QDeclarativeView::SizeRootObjectToView);	85	setResizeMode(QDeclarativeView::SizeRootObjectToView);
86	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
87	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
88	#if !defined(NO_JSDEBUGGER)
89	new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
90	#endif
91	#if !defined(NO_QMLOBSERVER)
92	new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
93	#endif
94	#endif
95	}
96		86
97	QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView view, QWidget parent)
98	: QDeclarativeView(parent)
99	, d(new QmlApplicationViewerPrivate(view))
100	{
101	connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));
102	view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
103	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in	87	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
104	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800	88	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
105	#if !defined(NO_JSDEBUGGER)	89	#if !defined(NO_JSDEBUGGER)
106	new QmlJSDebugger::JSDebuggerAgent(d->~~view~~->engine());	90	new QmlJSDebugger::JSDebuggerAgent(engine());
107	#endif	91	#endif
108	#if !defined(NO_QMLOBSERVER)	92	#if !defined(NO_QMLOBSERVER)
109	new QmlJSDebugger::QDeclarativeViewObserver(d->~~view~~, d->~~view~~);	93	new QmlJSDebugger::QDeclarativeViewObserver(this, this);
110	#endif	94	#endif
111	#endif	95	#endif
112	}	96	}
@@ -118,75 +102,68 QmlApplicationViewer::~QmlApplicationViewer()
118		102
119	QmlApplicationViewer *QmlApplicationViewer::create()	103	QmlApplicationViewer *QmlApplicationViewer::create()
120	{	104	{
121	#ifdef HARMATTAN_BOOSTER
122	return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);
123	#else
124	return new QmlApplicationViewer();	105	return new QmlApplicationViewer();
125	#endif
126	}	106	}
127		107
128	void QmlApplicationViewer::setMainQmlFile(const QString &file)	108	void QmlApplicationViewer::setMainQmlFile(const QString &file)
129	{	109	{
130	d->mainQmlFile = d->adjustPath(file);	110	d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
131	d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));	111	#ifdef Q_OS_ANDROID
		112	setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
		113	#else
		114	setSource(QUrl::fromLocalFile(d->mainQmlFile));
		115	#endif
132	}	116	}
133		117
134	void QmlApplicationViewer::addImportPath(const QString &path)	118	void QmlApplicationViewer::addImportPath(const QString &path)
135	{	119	{
136	d->~~view~~->engine()->addImportPath(d->adjustPath(path));	120	engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
137	}	121	}
138		122
139	//void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)	123	void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
140	//{	124	{
141	//#if defined(Q_OS_SYMBIAN)	125	#if QT_VERSION < 0x050000
142	// // If the version of Qt on the device is < 4.7.2, that attribute won't work	126	Qt::WidgetAttribute attribute;
143	// if (orientation != ScreenOrientationAuto) {	127	switch (orientation) {
144	// const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));	128	#if QT_VERSION < 0x040702
145	// if (v.count() == 3 && (v.at(0).toInt() << 16 \| v.at(1).toInt() << 8 \| v.at(2).toInt()) < 0x040702) {	129	// Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
146	// qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");	130	case ScreenOrientationLockPortrait:
147	// return;	131	attribute = static_cast<Qt::WidgetAttribute>(128);
148	// }	132	break;
149	// }	133	case ScreenOrientationLockLandscape:
150	//#endif // Q_OS_SYMBIAN	134	attribute = static_cast<Qt::WidgetAttribute>(129);
151		135	break;
152	// Qt::WidgetAttribute attribute;	136	default:
153	// switch (orientation) {	137	case ScreenOrientationAuto:
154	//#if QT_VERSION < 0x040702	138	attribute = static_cast<Qt::WidgetAttribute>(130);
155	// // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes	139	break;
156	// case ScreenOrientationLockPortrait:	140	#else // QT_VERSION < 0x040702
157	// attribute = static_cast<Qt::WidgetAttribute>(128);	141	case ScreenOrientationLockPortrait:
158	// break;	142	attribute = Qt::WA_LockPortraitOrientation;
159	// case ScreenOrientationLockLandscape:	143	break;
160	// attribute = static_cast<Qt::WidgetAttribute>(129);	144	case ScreenOrientationLockLandscape:
161	// break;	145	attribute = Qt::WA_LockLandscapeOrientation;
162	// default:	146	break;
163	// case ScreenOrientationAuto:	147	default:
164	// attribute = static_cast<Qt::WidgetAttribute>(130);	148	case ScreenOrientationAuto:
165	// break;	149	attribute = Qt::WA_AutoOrientation;
166	//#else // QT_VERSION < 0x040702	150	break;
167	// case ScreenOrientationLockPortrait:	151	#endif // QT_VERSION < 0x040702
168	// attribute = Qt::WA_LockPortraitOrientation;	152	};
169	// break;	153	setAttribute(attribute, true);
170	// case ScreenOrientationLockLandscape:	154	#else // QT_VERSION < 0x050000
171	// attribute = Qt::WA_LockLandscapeOrientation;	155	Q_UNUSED(orientation)
172	// break;	156	#endif // QT_VERSION < 0x050000
173	// default:	157	}
174	// case ScreenOrientationAuto:
175	// attribute = Qt::WA_AutoOrientation;
176	// break;
177	//#endif // QT_VERSION < 0x040702
178	// };
179	// setAttribute(attribute, true);
180	//}
181		158
182	void QmlApplicationViewer::showExpanded()	159	void QmlApplicationViewer::showExpanded()
183	{	160	{
184	#if defined(~~Q_OS_SYMBIAN) \|\| defined(~~MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)	161	#if defined(MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)
185	d->~~view~~->showFullScreen();	162	showFullScreen();
186	#elif defined(Q_WS_MAEMO_5)	163	#elif defined(Q_WS_MAEMO_5) \|\| defined(Q_OS_QNX)
187	d->~~view~~->showMaximized();	164	showMaximized();
188	#else	165	#else
189	d->~~view~~->show();	166	show();
190	#endif	167	#endif
191	}	168	}
192		169

demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.h +4 -5

-            // checksum 0x82ed version 0x60010
+            // checksum 0xc67a version 0x80016
             /*
               This file was generated by the Qt Quick Application wizard of Qt Creator.
               QmlApplicationViewer is a convenience class containing mobile device specific
             #ifndef QMLAPPLICATIONVIEWER_H
             #define QMLAPPLICATIONVIEWER_H
-            #include <QtDeclarative/QDeclarativeView>
+            #include <QDeclarativeView>
             class QmlApplicationViewer : public QDeclarativeView
             {
                 void setMainQmlFile(const QString &file);
                 void addImportPath(const QString &path);
-                // Note that this will only have an effect on Symbian and Fremantle.
+                // Note that this will only have an effect on Fremantle.
-                // void setOrientation(ScreenOrientation orientation);
+                void setOrientation(ScreenOrientation orientation);
                 void showExpanded();
             private:
-                explicit QmlApplicationViewer(QDeclarativeView *view, QWidget *parent);
                 class QmlApplicationViewerPrivate *d;
             };

demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.cpp +177 -200

@@ -1,200 +1,177
1	// checksum 0x~~78c~~ version 0x~~60010~~	1	// checksum 0xbd34 version 0x80016
2	/*	2	/*
3	This file was generated by the Qt Quick Application wizard of Qt Creator.	3	This file was generated by the Qt Quick Application wizard of Qt Creator.
4	QmlApplicationViewer is a convenience class containing mobile device specific	4	QmlApplicationViewer is a convenience class containing mobile device specific
5	code such as screen orientation handling. Also QML paths and debugging are	5	code such as screen orientation handling. Also QML paths and debugging are
6	handled here.	6	handled here.
7	It is recommended not to modify this file, since newer versions of Qt Creator	7	It is recommended not to modify this file, since newer versions of Qt Creator
8	may offer an updated version of it.	8	may offer an updated version of it.
9	*/	9	*/
10		10
11	#include "qmlapplicationviewer.h"	11	#include "qmlapplicationviewer.h"
12		12
13	#include <Q~~tCore/Q~~Dir>	13	#include <QDir>
14	#include <Q~~tCore/Q~~FileInfo>	14	#include <QFileInfo>
15	#include <QtDeclarative/QDeclarativeComponent>	15	#include <QApplication>
16	#include <QtDeclarative~~/QDeclarativeEngine~~>	16	#include <QDeclarativeComponent>
17	#include <QtDeclarative~~/QDeclarativeContext~~>	17	#include <QDeclarativeEngine>
18	#include <Q~~Application~~>	18	#include <QDeclarativeContext>
19		19
20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN	20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
21		21
22	#ifdef HARMATTAN_BOOSTER	22	#ifdef HARMATTAN_BOOSTER
23	#include <MDeclarativeCache>	23	#include <MDeclarativeCache>
24	#endif	24	#endif
25		25
26	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800	26	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
27		27
28	#include <qt_private/qdeclarativedebughelper_p.h>	28	#include <qt_private/qdeclarativedebughelper_p.h>
29		29
30	#if !defined(NO_JSDEBUGGER)	30	#if !defined(NO_JSDEBUGGER)
31	#include <jsdebuggeragent.h>	31	#include <jsdebuggeragent.h>
32	#endif	32	#endif
33	#if !defined(NO_QMLOBSERVER)	33	#if !defined(NO_QMLOBSERVER)
34	#include <qdeclarativeviewobserver.h>	34	#include <qdeclarativeviewobserver.h>
35	#endif	35	#endif
36		36
37	// Enable debugging before any QDeclarativeEngine is created	37	// Enable debugging before any QDeclarativeEngine is created
38	struct QmlJsDebuggingEnabler	38	struct QmlJsDebuggingEnabler
39	{	39	{
40	QmlJsDebuggingEnabler()	40	QmlJsDebuggingEnabler()
41	{	41	{
42	QDeclarativeDebugHelper::enableDebugging();	42	QDeclarativeDebugHelper::enableDebugging();
43	}	43	}
44	};	44	};
45		45
46	// Execute code in constructor before first QDeclarativeEngine is instantiated	46	// Execute code in constructor before first QDeclarativeEngine is instantiated
47	static QmlJsDebuggingEnabler enableDebuggingHelper;	47	static QmlJsDebuggingEnabler enableDebuggingHelper;
48		48
49	#endif // QMLJSDEBUGGER	49	#endif // QMLJSDEBUGGER
50		50
51	class QmlApplicationViewerPrivate	51	class QmlApplicationViewerPrivate
52	{	52	{
53	QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}	53	QString mainQmlFile;
54		54	friend class QmlApplicationViewer;
55	QString mainQmlFile;	55	static QString adjustPath(const QString &path);
56	QDeclarativeView *view;	56	};
57	friend class QmlApplicationViewer;	57
58	QString adjustPath(const QString &path);	58	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
59	};	59	{
60		60	#ifdef Q_OS_MAC
61	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)	61	if (!QDir::isAbsolutePath(path))
62	{	62	return QString::fromLatin1("%1/../Resources/%2")
63	#ifdef Q_OS_UNIX	63	.arg(QCoreApplication::applicationDirPath(), path);
64	#ifdef Q_OS_MAC	64	#elif defined(Q_OS_QNX)
65	if (!QDir::isAbsolutePath(path))	65	if (!QDir::isAbsolutePath(path))
66	return QCoreApplication::applicationDirPath()	66	return QString::fromLatin1("app/native/%1").arg(path);
67	+ QLatin1String("/../Resources/") + path;	67	#elif !defined(Q_OS_ANDROID)
68	#else	68	QString pathInInstallDir =
69	QString pathInInstallDir;	69	QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
70	const QString applicationDirPath = QCoreApplication::applicationDirPath();	70	if (QFileInfo(pathInInstallDir).exists())
71	pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);	71	return pathInInstallDir;
72		72	pathInInstallDir =
73	if (QFileInfo(pathInInstallDir).exists())	73	QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
74	return pathInInstallDir;	74	if (QFileInfo(pathInInstallDir).exists())
75	#endif	75	return pathInInstallDir;
76	#endif	76	#endif
77	return path;	77	return path;
78	}	78	}
79		79
80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)	80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
81	: QDeclarativeView(parent)	81	: QDeclarativeView(parent)
82	, d(new QmlApplicationViewerPrivate(~~this~~))	82	, d(new QmlApplicationViewerPrivate())
83	{	83	{
84	connect(engine(), SIGNAL(quit()), SLOT(close()));	84	connect(engine(), SIGNAL(quit()), SLOT(close()));
85	setResizeMode(QDeclarativeView::SizeRootObjectToView);	85	setResizeMode(QDeclarativeView::SizeRootObjectToView);
86	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in	86
87	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800	87	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
88	#if !defined(NO_JSDEBUGGER)	88	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
89	new QmlJSDebugger::JSDebuggerAgent(d->view->engine());	89	#if !defined(NO_JSDEBUGGER)
90	#endif	90	new QmlJSDebugger::JSDebuggerAgent(engine());
91	#if !defined(NO_QMLOBSERVER)	91	#endif
92	new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);	92	#if !defined(NO_QMLOBSERVER)
93	#endif	93	new QmlJSDebugger::QDeclarativeViewObserver(this, this);
94	#endif	94	#endif
95	}	95	#endif
96		96	}
97	QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView view, QWidget parent)	97
98	: QDeclarativeView(parent)	98	QmlApplicationViewer::~QmlApplicationViewer()
99	, d(new QmlApplicationViewerPrivate(view))	99	{
100	{	100	delete d;
101	connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));	101	}
102	view->setResizeMode(QDeclarativeView::SizeRootObjectToView);	102
103	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in	103	QmlApplicationViewer *QmlApplicationViewer::create()
104	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800	104	{
105	#if !defined(NO_JSDEBUGGER)	105	return new QmlApplicationViewer();
106	new QmlJSDebugger::JSDebuggerAgent(d->view->engine());	106	}
107	#endif	107
108	#if !defined(NO_QMLOBSERVER)	108	void QmlApplicationViewer::setMainQmlFile(const QString &file)
109	new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);	109	{
110	#endif	110	d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
111	#endif	111	#ifdef Q_OS_ANDROID
112	}	112	setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
113		113	#else
114	QmlApplicationViewer::~QmlApplicationViewer()	114	setSource(QUrl::fromLocalFile(d->mainQmlFile));
115	{	115	#endif
116	delete d;	116	}
117	}	117
118		118	void QmlApplicationViewer::addImportPath(const QString &path)
119	QmlApplicationViewer *QmlApplicationViewer::create()	119	{
120	{	120	engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
121	#ifdef HARMATTAN_BOOSTER	121	}
122	return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);	122
123	#else	123	void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
124	return new QmlApplicationViewer();	124	{
125	#endif	125	#if QT_VERSION < 0x050000
126	}	126	Qt::WidgetAttribute attribute;
127		127	switch (orientation) {
128	void QmlApplicationViewer::setMainQmlFile(const QString &file)	128	#if QT_VERSION < 0x040702
129	{	129	// Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
130	d->mainQmlFile = d->adjustPath(file);	130	case ScreenOrientationLockPortrait:
131	d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));	131	attribute = static_cast<Qt::WidgetAttribute>(128);
132	}	132	break;
133		133	case ScreenOrientationLockLandscape:
134	void QmlApplicationViewer::addImportPath(const QString &path)	134	attribute = static_cast<Qt::WidgetAttribute>(129);
135	{	135	break;
136	d->view->engine()->addImportPath(d->adjustPath(path));	136	default:
137	}	137	case ScreenOrientationAuto:
138		138	attribute = static_cast<Qt::WidgetAttribute>(130);
139	//void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)	139	break;
140	//{	140	#else // QT_VERSION < 0x040702
141	//#if defined(Q_OS_SYMBIAN)	141	case ScreenOrientationLockPortrait:
142	// // If the version of Qt on the device is < 4.7.2, that attribute won't work	142	attribute = Qt::WA_LockPortraitOrientation;
143	// if (orientation != ScreenOrientationAuto) {	143	break;
144	// const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));	144	case ScreenOrientationLockLandscape:
145	// if (v.count() == 3 && (v.at(0).toInt() << 16 \| v.at(1).toInt() << 8 \| v.at(2).toInt()) < 0x040702) {	145	attribute = Qt::WA_LockLandscapeOrientation;
146	// qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");	146	break;
147	// return;	147	default:
148	// }	148	case ScreenOrientationAuto:
149	// }	149	attribute = Qt::WA_AutoOrientation;
150	//#endif // Q_OS_SYMBIAN	150	break;
151		151	#endif // QT_VERSION < 0x040702
152	// Qt::WidgetAttribute attribute;	152	};
153	// switch (orientation) {	153	setAttribute(attribute, true);
154	//~~#if~~ QT_VERSION < 0x0~~40702~~	154	#else // QT_VERSION < 0x050000
155	// // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes	155	Q_UNUSED(orientation)
156	// case ScreenOrientationLockPortrait:	156	#endif // QT_VERSION < 0x050000
157	// attribute = static_cast<Qt::WidgetAttribute>(128);	157	}
158	// break;	158
159	// case ScreenOrientationLockLandscape:	159	void QmlApplicationViewer::showExpanded()
160	// attribute = static_cast<Qt::WidgetAttribute>(129);	160	{
161	// break;	161	#if defined(MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)
162	// default:	162	showFullScreen();
163	// case ScreenOrientationAuto:	163	#elif defined(Q_WS_MAEMO_5) \|\| defined(Q_OS_QNX)
164	// attribute = static_cast<Qt::WidgetAttribute>(130);	164	showMaximized();
165	// break;	165	#else
166	//#else // QT_VERSION < 0x040702	166	show();
167	// case ScreenOrientationLockPortrait:	167	#endif
168	// attribute = Qt::WA_LockPortraitOrientation;	168	}
169	// break;	169
170	// case ScreenOrientationLockLandscape:	170	QApplication createApplication(int &argc, char *argv)
171	// attribute = Qt::WA_LockLandscapeOrientation;	171	{
172	// break;	172	#ifdef HARMATTAN_BOOSTER
173	// default:	173	return MDeclarativeCache::qApplication(argc, argv);
174	// case ScreenOrientationAuto:	174	#else
175	// attribute = Qt::WA_AutoOrientation;	175	return new QApplication(argc, argv);
176	// break;	176	#endif
177	//#endif // QT_VERSION < 0x040702	177	}
178	// };
179	// setAttribute(attribute, true);
180	//}
181
182	void QmlApplicationViewer::showExpanded()
183	{
184	#if defined(Q_OS_SYMBIAN) \|\| defined(MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)
185	d->view->showFullScreen();
186	#elif defined(Q_WS_MAEMO_5)
187	d->view->showMaximized();
188	#else
189	d->view->show();
190	#endif
191	}
192
193	QApplication createApplication(int &argc, char *argv)
194	{
195	#ifdef HARMATTAN_BOOSTER
196	return MDeclarativeCache::qApplication(argc, argv);
197	#else
198	return new QApplication(argc, argv);
199	#endif
200	}

demos/qmlcustomlegend/qmlapplicationviewer/qmlapplicationviewer.h +46 -47

@@ -1,47 +1,46
1	// checksum 0x~~82ed~~ version 0x~~60010~~	1	// checksum 0xc67a version 0x80016
2	/*	2	/*
3	This file was generated by the Qt Quick Application wizard of Qt Creator.	3	This file was generated by the Qt Quick Application wizard of Qt Creator.
4	QmlApplicationViewer is a convenience class containing mobile device specific	4	QmlApplicationViewer is a convenience class containing mobile device specific
5	code such as screen orientation handling. Also QML paths and debugging are	5	code such as screen orientation handling. Also QML paths and debugging are
6	handled here.	6	handled here.
7	It is recommended not to modify this file, since newer versions of Qt Creator	7	It is recommended not to modify this file, since newer versions of Qt Creator
8	may offer an updated version of it.	8	may offer an updated version of it.
9	*/	9	*/
10		10
11	#ifndef QMLAPPLICATIONVIEWER_H	11	#ifndef QMLAPPLICATIONVIEWER_H
12	#define QMLAPPLICATIONVIEWER_H	12	#define QMLAPPLICATIONVIEWER_H
13		13
14	#include <Q~~tDeclarative/Q~~DeclarativeView>	14	#include <QDeclarativeView>
15		15
16	class QmlApplicationViewer : public QDeclarativeView	16	class QmlApplicationViewer : public QDeclarativeView
17	{	17	{
18	Q_OBJECT	18	Q_OBJECT
19		19
20	public:	20	public:
21	enum ScreenOrientation {	21	enum ScreenOrientation {
22	ScreenOrientationLockPortrait,	22	ScreenOrientationLockPortrait,
23	ScreenOrientationLockLandscape,	23	ScreenOrientationLockLandscape,
24	ScreenOrientationAuto	24	ScreenOrientationAuto
25	};	25	};
26		26
27	explicit QmlApplicationViewer(QWidget *parent = 0);	27	explicit QmlApplicationViewer(QWidget *parent = 0);
28	virtual ~QmlApplicationViewer();	28	virtual ~QmlApplicationViewer();
29		29
30	static QmlApplicationViewer *create();	30	static QmlApplicationViewer *create();
31		31
32	void setMainQmlFile(const QString &file);	32	void setMainQmlFile(const QString &file);
33	void addImportPath(const QString &path);	33	void addImportPath(const QString &path);
34		34
35	// Note that this will only have an effect on ~~Symbian and~~ Fremantle.	35	// Note that this will only have an effect on Fremantle.
36	// void setOrientation(ScreenOrientation orientation);	36	void setOrientation(ScreenOrientation orientation);
37		37
38	void showExpanded();	38	void showExpanded();
39		39
40	private:	40	private:
41	explicit QmlApplicationViewer(QDeclarativeView view, QWidget parent);	41	class QmlApplicationViewerPrivate *d;
42	class QmlApplicationViewerPrivate *d;	42	};
43	};	43
44		44	QApplication createApplication(int &argc, char *argv);
45	QApplication createApplication(int &argc, char *argv);	45
46		46	#endif // QMLAPPLICATIONVIEWER_H
47	#endif // QMLAPPLICATIONVIEWER_H

demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp +69 -92

@@ -1,4 +1,4
1	// checksum 0x~~78c~~ version 0x~~60010~~	1	// checksum 0xbd34 version 0x80016
2	/*	2	/*
3	This file was generated by the Qt Quick Application wizard of Qt Creator.	3	This file was generated by the Qt Quick Application wizard of Qt Creator.
4	QmlApplicationViewer is a convenience class containing mobile device specific	4	QmlApplicationViewer is a convenience class containing mobile device specific
@@ -10,12 +10,12
10		10
11	#include "qmlapplicationviewer.h"	11	#include "qmlapplicationviewer.h"
12		12
13	#include <Q~~tCore/Q~~Dir>	13	#include <QDir>
14	#include <Q~~tCore/Q~~FileInfo>	14	#include <QFileInfo>
15	#include <QtDeclarative/QDeclarativeComponent>
16	#include <QtDeclarative/QDeclarativeEngine>
17	#include <QtDeclarative/QDeclarativeContext>
18	#include <QApplication>	15	#include <QApplication>
		16	#include <QDeclarativeComponent>
		17	#include <QDeclarativeEngine>
		18	#include <QDeclarativeContext>
19		19
20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN	20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
21		21
@@ -50,63 +50,47 static QmlJsDebuggingEnabler enableDebuggingHelper;
50		50
51	class QmlApplicationViewerPrivate	51	class QmlApplicationViewerPrivate
52	{	52	{
53	QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
54
55	QString mainQmlFile;	53	QString mainQmlFile;
56	QDeclarativeView *view;
57	friend class QmlApplicationViewer;	54	friend class QmlApplicationViewer;
58	QString adjustPath(const QString &path);	55	static QString adjustPath(const QString &path);
59	};	56	};
60		57
61	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)	58	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
62	{	59	{
63	#ifdef Q_OS_UNIX
64	#ifdef Q_OS_MAC	60	#ifdef Q_OS_MAC
65	if (!QDir::isAbsolutePath(path))	61	if (!QDir::isAbsolutePath(path))
66	return QCoreApplication::applicationDirPath()	62	return QString::fromLatin1("%1/../Resources/%2")
67	+ QLatin1String("/../Resources/") + path;	63	.arg(QCoreApplication::applicationDirPath(), path);
68	#else	64	#elif defined(Q_OS_QNX)
69	QString pathInInstallDir;	65	if (!QDir::isAbsolutePath(path))
70	const QString applicationDirPath = QCoreApplication::applicationDirPath();	66	return QString::fromLatin1("app/native/%1").arg(path);
71	pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);	67	#elif !defined(Q_OS_ANDROID)
72		68	QString pathInInstallDir =
		69	QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
		70	if (QFileInfo(pathInInstallDir).exists())
		71	return pathInInstallDir;
		72	pathInInstallDir =
		73	QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
73	if (QFileInfo(pathInInstallDir).exists())	74	if (QFileInfo(pathInInstallDir).exists())
74	return pathInInstallDir;	75	return pathInInstallDir;
75	#endif
76	#endif	76	#endif
77	return path;	77	return path;
78	}	78	}
79		79
80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)	80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
81	: QDeclarativeView(parent)	81	: QDeclarativeView(parent)
82	, d(new QmlApplicationViewerPrivate(~~this~~))	82	, d(new QmlApplicationViewerPrivate())
83	{	83	{
84	connect(engine(), SIGNAL(quit()), SLOT(close()));	84	connect(engine(), SIGNAL(quit()), SLOT(close()));
85	setResizeMode(QDeclarativeView::SizeRootObjectToView);	85	setResizeMode(QDeclarativeView::SizeRootObjectToView);
86	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
87	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
88	#if !defined(NO_JSDEBUGGER)
89	new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
90	#endif
91	#if !defined(NO_QMLOBSERVER)
92	new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
93	#endif
94	#endif
95	}
96		86
97	QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView view, QWidget parent)
98	: QDeclarativeView(parent)
99	, d(new QmlApplicationViewerPrivate(view))
100	{
101	connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));
102	view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
103	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in	87	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
104	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800	88	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
105	#if !defined(NO_JSDEBUGGER)	89	#if !defined(NO_JSDEBUGGER)
106	new QmlJSDebugger::JSDebuggerAgent(d->~~view~~->engine());	90	new QmlJSDebugger::JSDebuggerAgent(engine());
107	#endif	91	#endif
108	#if !defined(NO_QMLOBSERVER)	92	#if !defined(NO_QMLOBSERVER)
109	new QmlJSDebugger::QDeclarativeViewObserver(d->~~view~~, d->~~view~~);	93	new QmlJSDebugger::QDeclarativeViewObserver(this, this);
110	#endif	94	#endif
111	#endif	95	#endif
112	}	96	}
@@ -118,75 +102,68 QmlApplicationViewer::~QmlApplicationViewer()
118		102
119	QmlApplicationViewer *QmlApplicationViewer::create()	103	QmlApplicationViewer *QmlApplicationViewer::create()
120	{	104	{
121	#ifdef HARMATTAN_BOOSTER
122	return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);
123	#else
124	return new QmlApplicationViewer();	105	return new QmlApplicationViewer();
125	#endif
126	}	106	}
127		107
128	void QmlApplicationViewer::setMainQmlFile(const QString &file)	108	void QmlApplicationViewer::setMainQmlFile(const QString &file)
129	{	109	{
130	d->mainQmlFile = d->adjustPath(file);	110	d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
131	d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));	111	#ifdef Q_OS_ANDROID
		112	setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
		113	#else
		114	setSource(QUrl::fromLocalFile(d->mainQmlFile));
		115	#endif
132	}	116	}
133		117
134	void QmlApplicationViewer::addImportPath(const QString &path)	118	void QmlApplicationViewer::addImportPath(const QString &path)
135	{	119	{
136	d->~~view~~->engine()->addImportPath(d->adjustPath(path));	120	engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
137	}	121	}
138		122
139	//void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)	123	void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
140	//{	124	{
141	//#if defined(Q_OS_SYMBIAN)	125	#if QT_VERSION < 0x050000
142	// // If the version of Qt on the device is < 4.7.2, that attribute won't work	126	Qt::WidgetAttribute attribute;
143	// if (orientation != ScreenOrientationAuto) {	127	switch (orientation) {
144	// const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));	128	#if QT_VERSION < 0x040702
145	// if (v.count() == 3 && (v.at(0).toInt() << 16 \| v.at(1).toInt() << 8 \| v.at(2).toInt()) < 0x040702) {	129	// Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
146	// qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");	130	case ScreenOrientationLockPortrait:
147	// return;	131	attribute = static_cast<Qt::WidgetAttribute>(128);
148	// }	132	break;
149	// }	133	case ScreenOrientationLockLandscape:
150	//#endif // Q_OS_SYMBIAN	134	attribute = static_cast<Qt::WidgetAttribute>(129);
151		135	break;
152	// Qt::WidgetAttribute attribute;	136	default:
153	// switch (orientation) {	137	case ScreenOrientationAuto:
154	//#if QT_VERSION < 0x040702	138	attribute = static_cast<Qt::WidgetAttribute>(130);
155	// // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes	139	break;
156	// case ScreenOrientationLockPortrait:	140	#else // QT_VERSION < 0x040702
157	// attribute = static_cast<Qt::WidgetAttribute>(128);	141	case ScreenOrientationLockPortrait:
158	// break;	142	attribute = Qt::WA_LockPortraitOrientation;
159	// case ScreenOrientationLockLandscape:	143	break;
160	// attribute = static_cast<Qt::WidgetAttribute>(129);	144	case ScreenOrientationLockLandscape:
161	// break;	145	attribute = Qt::WA_LockLandscapeOrientation;
162	// default:	146	break;
163	// case ScreenOrientationAuto:	147	default:
164	// attribute = static_cast<Qt::WidgetAttribute>(130);	148	case ScreenOrientationAuto:
165	// break;	149	attribute = Qt::WA_AutoOrientation;
166	//#else // QT_VERSION < 0x040702	150	break;
167	// case ScreenOrientationLockPortrait:	151	#endif // QT_VERSION < 0x040702
168	// attribute = Qt::WA_LockPortraitOrientation;	152	};
169	// break;	153	setAttribute(attribute, true);
170	// case ScreenOrientationLockLandscape:	154	#else // QT_VERSION < 0x050000
171	// attribute = Qt::WA_LockLandscapeOrientation;	155	Q_UNUSED(orientation)
172	// break;	156	#endif // QT_VERSION < 0x050000
173	// default:	157	}
174	// case ScreenOrientationAuto:
175	// attribute = Qt::WA_AutoOrientation;
176	// break;
177	//#endif // QT_VERSION < 0x040702
178	// };
179	// setAttribute(attribute, true);
180	//}
181		158
182	void QmlApplicationViewer::showExpanded()	159	void QmlApplicationViewer::showExpanded()
183	{	160	{
184	#if defined(~~Q_OS_SYMBIAN) \|\| defined(~~MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)	161	#if defined(MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)
185	d->~~view~~->showFullScreen();	162	showFullScreen();
186	#elif defined(Q_WS_MAEMO_5)	163	#elif defined(Q_WS_MAEMO_5) \|\| defined(Q_OS_QNX)
187	d->~~view~~->showMaximized();	164	showMaximized();
188	#else	165	#else
189	d->~~view~~->show();	166	show();
190	#endif	167	#endif
191	}	168	}
192		169

demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.h +4 -5

-            // checksum 0x82ed version 0x60010
+            // checksum 0xc67a version 0x80016
             /*
               This file was generated by the Qt Quick Application wizard of Qt Creator.
               QmlApplicationViewer is a convenience class containing mobile device specific
             #ifndef QMLAPPLICATIONVIEWER_H
             #define QMLAPPLICATIONVIEWER_H
-            #include <QtDeclarative/QDeclarativeView>
+            #include <QDeclarativeView>
             class QmlApplicationViewer : public QDeclarativeView
             {
                 void setMainQmlFile(const QString &file);
                 void addImportPath(const QString &path);
-                // Note that this will only have an effect on Symbian and Fremantle.
+                // Note that this will only have an effect on Fremantle.
-                // void setOrientation(ScreenOrientation orientation);
+                void setOrientation(ScreenOrientation orientation);
                 void showExpanded();
             private:
-                explicit QmlApplicationViewer(QDeclarativeView *view, QWidget *parent);
                 class QmlApplicationViewerPrivate *d;
             };

demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.cpp +56 -52

@@ -1,4 +1,4
1	// checksum 0x~~3fbf~~ version 0x~~70013~~	1	// checksum 0xbd34 version 0x80016
2	/*	2	/*
3	This file was generated by the Qt Quick Application wizard of Qt Creator.	3	This file was generated by the Qt Quick Application wizard of Qt Creator.
4	QmlApplicationViewer is a convenience class containing mobile device specific	4	QmlApplicationViewer is a convenience class containing mobile device specific
@@ -13,9 +13,10
13	#include <QDir>	13	#include <QDir>
14	#include <QFileInfo>	14	#include <QFileInfo>
15	#include <QApplication>	15	#include <QApplication>
16	#include <Q~~tDeclarative/Q~~DeclarativeComponent>	16	#include <QDeclarativeComponent>
17	#include <Q~~tDeclarative/Q~~DeclarativeEngine>	17	#include <QDeclarativeEngine>
18	#include <Q~~tDeclarative/Q~~DeclarativeContext>	18	#include <QDeclarativeContext>
		19
19	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN	20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
20		21
21	#ifdef HARMATTAN_BOOSTER	22	#ifdef HARMATTAN_BOOSTER
@@ -56,17 +57,22 class QmlApplicationViewerPrivate
56		57
57	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)	58	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
58	{	59	{
59	#ifdef Q_OS_UNIX
60	#ifdef Q_OS_MAC	60	#ifdef Q_OS_MAC
61	if (!QDir::isAbsolutePath(path))	61	if (!QDir::isAbsolutePath(path))
62	return QString::fromLatin1("%1/../Resources/%2")	62	return QString::fromLatin1("%1/../Resources/%2")
63	.arg(QCoreApplication::applicationDirPath(), path);	63	.arg(QCoreApplication::applicationDirPath(), path);
64	#else	64	#elif defined(Q_OS_QNX)
65	const QString pathInInstallDir =	65	if (!QDir::isAbsolutePath(path))
		66	return QString::fromLatin1("app/native/%1").arg(path);
		67	#elif !defined(Q_OS_ANDROID)
		68	QString pathInInstallDir =
66	QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);	69	QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
67	if (QFileInfo(pathInInstallDir).exists())	70	if (QFileInfo(pathInInstallDir).exists())
68	return pathInInstallDir;	71	return pathInInstallDir;
69	#endif	72	pathInInstallDir =
		73	QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
		74	if (QFileInfo(pathInInstallDir).exists())
		75	return pathInInstallDir;
70	#endif	76	#endif
71	return path;	77	return path;
72	}	78	}
@@ -77,6 +83,7 QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
77	{	83	{
78	connect(engine(), SIGNAL(quit()), SLOT(close()));	84	connect(engine(), SIGNAL(quit()), SLOT(close()));
79	setResizeMode(QDeclarativeView::SizeRootObjectToView);	85	setResizeMode(QDeclarativeView::SizeRootObjectToView);
		86
80	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in	87	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
81	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800	88	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
82	#if !defined(NO_JSDEBUGGER)	89	#if !defined(NO_JSDEBUGGER)
@@ -101,7 +108,11 QmlApplicationViewer *QmlApplicationViewer::create()
101	void QmlApplicationViewer::setMainQmlFile(const QString &file)	108	void QmlApplicationViewer::setMainQmlFile(const QString &file)
102	{	109	{
103	d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);	110	d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
		111	#ifdef Q_OS_ANDROID
		112	setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
		113	#else
104	setSource(QUrl::fromLocalFile(d->mainQmlFile));	114	setSource(QUrl::fromLocalFile(d->mainQmlFile));
		115	#endif
105	}	116	}
106		117
107	void QmlApplicationViewer::addImportPath(const QString &path)	118	void QmlApplicationViewer::addImportPath(const QString &path)
@@ -109,54 +120,47 void QmlApplicationViewer::addImportPath(const QString &path)
109	engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));	120	engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
110	}	121	}
111		122
112	//void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)	123	void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
113	//{	124	{
114	//#if defined(Q_OS_SYMBIAN)	125	#if QT_VERSION < 0x050000
115	// // If the version of Qt on the device is < 4.7.2, that attribute won't work	126	Qt::WidgetAttribute attribute;
116	// if (orientation != ScreenOrientationAuto) {	127	switch (orientation) {
117	// const QStringList v = QString::fromLatin1(qVersion()).split(QLatin1Char('.'));	128	#if QT_VERSION < 0x040702
118	// if (v.count() == 3 && (v.at(0).toInt() << 16 \| v.at(1).toInt() << 8 \| v.at(2).toInt()) < 0x040702) {	129	// Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
119	// qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");	130	case ScreenOrientationLockPortrait:
120	// return;	131	attribute = static_cast<Qt::WidgetAttribute>(128);
121	// }	132	break;
122	// }	133	case ScreenOrientationLockLandscape:
123	//#endif // Q_OS_SYMBIAN	134	attribute = static_cast<Qt::WidgetAttribute>(129);
124		135	break;
125	// Qt::WidgetAttribute attribute;	136	default:
126	// switch (orientation) {	137	case ScreenOrientationAuto:
127	//#if QT_VERSION < 0x040702	138	attribute = static_cast<Qt::WidgetAttribute>(130);
128	// // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes	139	break;
129	// case ScreenOrientationLockPortrait:	140	#else // QT_VERSION < 0x040702
130	// attribute = static_cast<Qt::WidgetAttribute>(128);	141	case ScreenOrientationLockPortrait:
131	// break;	142	attribute = Qt::WA_LockPortraitOrientation;
132	// case ScreenOrientationLockLandscape:	143	break;
133	// attribute = static_cast<Qt::WidgetAttribute>(129);	144	case ScreenOrientationLockLandscape:
134	// break;	145	attribute = Qt::WA_LockLandscapeOrientation;
135	// default:	146	break;
136	// case ScreenOrientationAuto:	147	default:
137	// attribute = static_cast<Qt::WidgetAttribute>(130);	148	case ScreenOrientationAuto:
138	// break;	149	attribute = Qt::WA_AutoOrientation;
139	//#else // QT_VERSION < 0x040702	150	break;
140	// case ScreenOrientationLockPortrait:	151	#endif // QT_VERSION < 0x040702
141	// attribute = Qt::WA_LockPortraitOrientation;	152	};
142	// break;	153	setAttribute(attribute, true);
143	// case ScreenOrientationLockLandscape:	154	#else // QT_VERSION < 0x050000
144	// attribute = Qt::WA_LockLandscapeOrientation;	155	Q_UNUSED(orientation)
145	// break;	156	#endif // QT_VERSION < 0x050000
146	// default:	157	}
147	// case ScreenOrientationAuto:
148	// attribute = Qt::WA_AutoOrientation;
149	// break;
150	//#endif // QT_VERSION < 0x040702
151	// };
152	// setAttribute(attribute, true);
153	//}
154		158
155	void QmlApplicationViewer::showExpanded()	159	void QmlApplicationViewer::showExpanded()
156	{	160	{
157	#if defined(~~Q_OS_SYMBIAN) \|\| defined(~~MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)	161	#if defined(MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)
158	showFullScreen();	162	showFullScreen();
159	#elif defined(Q_WS_MAEMO_5)	163	#elif defined(Q_WS_MAEMO_5) \|\| defined(Q_OS_QNX)
160	showMaximized();	164	showMaximized();
161	#else	165	#else
162	show();	166	show();

demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.h +4 -4

-            // checksum 0x734b version 0x70013
+            // checksum 0xc67a version 0x80016
             /*
               This file was generated by the Qt Quick Application wizard of Qt Creator.
               QmlApplicationViewer is a convenience class containing mobile device specific
             #ifndef QMLAPPLICATIONVIEWER_H
             #define QMLAPPLICATIONVIEWER_H
-            #include <QtDeclarative/QDeclarativeView>
+            #include <QDeclarativeView>
             class QmlApplicationViewer : public QDeclarativeView
             {
                 void setMainQmlFile(const QString &file);
                 void addImportPath(const QString &path);
-                // Note that this will only have an effect on Symbian and Fremantle.
+                // Note that this will only have an effect on Fremantle.
-                // void setOrientation(ScreenOrientation orientation);
+                void setOrientation(ScreenOrientation orientation);
                 void showExpanded();

demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri +29 -8

-            # checksum 0x5b42 version 0x70013
+            # checksum 0x77b version 0x80016
             # This file was generated by the Qt Quick Application wizard of Qt Creator.
             # The code below adds the QmlApplicationViewer to the project and handles the
             # activation of QML debugging.
                 DEFINES += HARMATTAN_BOOSTER
             }
             # This file was generated by an application wizard of Qt Creator.
-            # The code below handles deployment to Symbian and Maemo, aswell as copying
+            # The code below handles deployment to Android and Maemo, aswell as copying
             # of the application data to shadow build directories on desktop.
             # It is recommended not to modify this file, since newer versions of Qt Creator
             # may offer an updated version of it.
             defineTest(qtcAddDeployment) {
             for(deploymentfolder, DEPLOYMENTFOLDERS) {
                 item = item$${deploymentfolder}
-                itemsources = $${item}.sources
+                greaterThan(QT_MAJOR_VERSION, 4) {
+                    itemsources = $${item}.files
+                } else {
+                    itemsources = $${item}.sources
+                }
                 $$itemsources = $$eval($${deploymentfolder}.source)
                 itempath = $${item}.path
                 $$itempath= $$eval($${deploymentfolder}.target)
             MAINPROFILEPWD = $$PWD
-            symbian {
+            android {
-                isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
+                for(deploymentfolder, DEPLOYMENTFOLDERS) {
-                isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+                    item = item$${deploymentfolder}
+                    itemfiles = $${item}.files
+                    $$itemfiles = $$eval($${deploymentfolder}.source)
+                    itempath = $${item}.path
+                    $$itempath = /assets/$$eval($${deploymentfolder}.target)
+                    export($$itemfiles)
+                    export($$itempath)
+                    INSTALLS += $$item
+                }
+                x86 {
+                    target.path = /libs/x86
+                } else: armeabi-v7a {
+                    target.path = /libs/armeabi-v7a
+                } else {
+                    target.path = /libs/armeabi
+                }
+                export(target.path)
+                INSTALLS += target
             } else:win32 {
                 copyCommand =
                 for(deploymentfolder, DEPLOYMENTFOLDERS) {
             export (ICON)
             export (INSTALLS)
             export (DEPLOYMENT)
-            export (TARGET.EPOCHEAPSIZE)
-            export (TARGET.CAPABILITY)
             export (LIBS)
             export (QMAKE_EXTRA_TARGETS)
             }

demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.cpp +69 -92

@@ -1,4 +1,4
1	// checksum 0x~~78c~~ version 0x~~60010~~	1	// checksum 0xbd34 version 0x80016
2	/*	2	/*
3	This file was generated by the Qt Quick Application wizard of Qt Creator.	3	This file was generated by the Qt Quick Application wizard of Qt Creator.
4	QmlApplicationViewer is a convenience class containing mobile device specific	4	QmlApplicationViewer is a convenience class containing mobile device specific
@@ -10,12 +10,12
10		10
11	#include "qmlapplicationviewer.h"	11	#include "qmlapplicationviewer.h"
12		12
13	#include <Q~~tCore/Q~~Dir>	13	#include <QDir>
14	#include <Q~~tCore/Q~~FileInfo>	14	#include <QFileInfo>
15	#include <QtDeclarative/QDeclarativeComponent>
16	#include <QtDeclarative/QDeclarativeEngine>
17	#include <QtDeclarative/QDeclarativeContext>
18	#include <QApplication>	15	#include <QApplication>
		16	#include <QDeclarativeComponent>
		17	#include <QDeclarativeEngine>
		18	#include <QDeclarativeContext>
19		19
20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN	20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
21		21
@@ -50,63 +50,47 static QmlJsDebuggingEnabler enableDebuggingHelper;
50		50
51	class QmlApplicationViewerPrivate	51	class QmlApplicationViewerPrivate
52	{	52	{
53	QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
54
55	QString mainQmlFile;	53	QString mainQmlFile;
56	QDeclarativeView *view;
57	friend class QmlApplicationViewer;	54	friend class QmlApplicationViewer;
58	QString adjustPath(const QString &path);	55	static QString adjustPath(const QString &path);
59	};	56	};
60		57
61	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)	58	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
62	{	59	{
63	#ifdef Q_OS_UNIX
64	#ifdef Q_OS_MAC	60	#ifdef Q_OS_MAC
65	if (!QDir::isAbsolutePath(path))	61	if (!QDir::isAbsolutePath(path))
66	return QCoreApplication::applicationDirPath()	62	return QString::fromLatin1("%1/../Resources/%2")
67	+ QLatin1String("/../Resources/") + path;	63	.arg(QCoreApplication::applicationDirPath(), path);
68	#else	64	#elif defined(Q_OS_QNX)
69	QString pathInInstallDir;	65	if (!QDir::isAbsolutePath(path))
70	const QString applicationDirPath = QCoreApplication::applicationDirPath();	66	return QString::fromLatin1("app/native/%1").arg(path);
71	pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);	67	#elif !defined(Q_OS_ANDROID)
72		68	QString pathInInstallDir =
		69	QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
		70	if (QFileInfo(pathInInstallDir).exists())
		71	return pathInInstallDir;
		72	pathInInstallDir =
		73	QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
73	if (QFileInfo(pathInInstallDir).exists())	74	if (QFileInfo(pathInInstallDir).exists())
74	return pathInInstallDir;	75	return pathInInstallDir;
75	#endif
76	#endif	76	#endif
77	return path;	77	return path;
78	}	78	}
79		79
80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)	80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
81	: QDeclarativeView(parent)	81	: QDeclarativeView(parent)
82	, d(new QmlApplicationViewerPrivate(~~this~~))	82	, d(new QmlApplicationViewerPrivate())
83	{	83	{
84	connect(engine(), SIGNAL(quit()), SLOT(close()));	84	connect(engine(), SIGNAL(quit()), SLOT(close()));
85	setResizeMode(QDeclarativeView::SizeRootObjectToView);	85	setResizeMode(QDeclarativeView::SizeRootObjectToView);
86	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
87	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
88	#if !defined(NO_JSDEBUGGER)
89	new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
90	#endif
91	#if !defined(NO_QMLOBSERVER)
92	new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
93	#endif
94	#endif
95	}
96		86
97	QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView view, QWidget parent)
98	: QDeclarativeView(parent)
99	, d(new QmlApplicationViewerPrivate(view))
100	{
101	connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));
102	view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
103	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in	87	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
104	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800	88	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
105	#if !defined(NO_JSDEBUGGER)	89	#if !defined(NO_JSDEBUGGER)
106	new QmlJSDebugger::JSDebuggerAgent(d->~~view~~->engine());	90	new QmlJSDebugger::JSDebuggerAgent(engine());
107	#endif	91	#endif
108	#if !defined(NO_QMLOBSERVER)	92	#if !defined(NO_QMLOBSERVER)
109	new QmlJSDebugger::QDeclarativeViewObserver(d->~~view~~, d->~~view~~);	93	new QmlJSDebugger::QDeclarativeViewObserver(this, this);
110	#endif	94	#endif
111	#endif	95	#endif
112	}	96	}
@@ -118,75 +102,68 QmlApplicationViewer::~QmlApplicationViewer()
118		102
119	QmlApplicationViewer *QmlApplicationViewer::create()	103	QmlApplicationViewer *QmlApplicationViewer::create()
120	{	104	{
121	#ifdef HARMATTAN_BOOSTER
122	return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);
123	#else
124	return new QmlApplicationViewer();	105	return new QmlApplicationViewer();
125	#endif
126	}	106	}
127		107
128	void QmlApplicationViewer::setMainQmlFile(const QString &file)	108	void QmlApplicationViewer::setMainQmlFile(const QString &file)
129	{	109	{
130	d->mainQmlFile = d->adjustPath(file);	110	d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
131	d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));	111	#ifdef Q_OS_ANDROID
		112	setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
		113	#else
		114	setSource(QUrl::fromLocalFile(d->mainQmlFile));
		115	#endif
132	}	116	}
133		117
134	void QmlApplicationViewer::addImportPath(const QString &path)	118	void QmlApplicationViewer::addImportPath(const QString &path)
135	{	119	{
136	d->~~view~~->engine()->addImportPath(d->adjustPath(path));	120	engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
137	}	121	}
138		122
139	//void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)	123	void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
140	//{	124	{
141	//#if defined(Q_OS_SYMBIAN)	125	#if QT_VERSION < 0x050000
142	// // If the version of Qt on the device is < 4.7.2, that attribute won't work	126	Qt::WidgetAttribute attribute;
143	// if (orientation != ScreenOrientationAuto) {	127	switch (orientation) {
144	// const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));	128	#if QT_VERSION < 0x040702
145	// if (v.count() == 3 && (v.at(0).toInt() << 16 \| v.at(1).toInt() << 8 \| v.at(2).toInt()) < 0x040702) {	129	// Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
146	// qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");	130	case ScreenOrientationLockPortrait:
147	// return;	131	attribute = static_cast<Qt::WidgetAttribute>(128);
148	// }	132	break;
149	// }	133	case ScreenOrientationLockLandscape:
150	//#endif // Q_OS_SYMBIAN	134	attribute = static_cast<Qt::WidgetAttribute>(129);
151		135	break;
152	// Qt::WidgetAttribute attribute;	136	default:
153	// switch (orientation) {	137	case ScreenOrientationAuto:
154	//#if QT_VERSION < 0x040702	138	attribute = static_cast<Qt::WidgetAttribute>(130);
155	// // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes	139	break;
156	// case ScreenOrientationLockPortrait:	140	#else // QT_VERSION < 0x040702
157	// attribute = static_cast<Qt::WidgetAttribute>(128);	141	case ScreenOrientationLockPortrait:
158	// break;	142	attribute = Qt::WA_LockPortraitOrientation;
159	// case ScreenOrientationLockLandscape:	143	break;
160	// attribute = static_cast<Qt::WidgetAttribute>(129);	144	case ScreenOrientationLockLandscape:
161	// break;	145	attribute = Qt::WA_LockLandscapeOrientation;
162	// default:	146	break;
163	// case ScreenOrientationAuto:	147	default:
164	// attribute = static_cast<Qt::WidgetAttribute>(130);	148	case ScreenOrientationAuto:
165	// break;	149	attribute = Qt::WA_AutoOrientation;
166	//#else // QT_VERSION < 0x040702	150	break;
167	// case ScreenOrientationLockPortrait:	151	#endif // QT_VERSION < 0x040702
168	// attribute = Qt::WA_LockPortraitOrientation;	152	};
169	// break;	153	setAttribute(attribute, true);
170	// case ScreenOrientationLockLandscape:	154	#else // QT_VERSION < 0x050000
171	// attribute = Qt::WA_LockLandscapeOrientation;	155	Q_UNUSED(orientation)
172	// break;	156	#endif // QT_VERSION < 0x050000
173	// default:	157	}
174	// case ScreenOrientationAuto:
175	// attribute = Qt::WA_AutoOrientation;
176	// break;
177	//#endif // QT_VERSION < 0x040702
178	// };
179	// setAttribute(attribute, true);
180	//}
181		158
182	void QmlApplicationViewer::showExpanded()	159	void QmlApplicationViewer::showExpanded()
183	{	160	{
184	#if defined(~~Q_OS_SYMBIAN) \|\| defined(~~MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)	161	#if defined(MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)
185	d->~~view~~->showFullScreen();	162	showFullScreen();
186	#elif defined(Q_WS_MAEMO_5)	163	#elif defined(Q_WS_MAEMO_5) \|\| defined(Q_OS_QNX)
187	d->~~view~~->showMaximized();	164	showMaximized();
188	#else	165	#else
189	d->~~view~~->show();	166	show();
190	#endif	167	#endif
191	}	168	}
192		169

demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.h +4 -5

-            // checksum 0x82ed version 0x60010
+            // checksum 0xc67a version 0x80016
             /*
               This file was generated by the Qt Quick Application wizard of Qt Creator.
               QmlApplicationViewer is a convenience class containing mobile device specific
             #ifndef QMLAPPLICATIONVIEWER_H
             #define QMLAPPLICATIONVIEWER_H
-            #include <QtDeclarative/QDeclarativeView>
+            #include <QDeclarativeView>
             class QmlApplicationViewer : public QDeclarativeView
             {
                 void setMainQmlFile(const QString &file);
                 void addImportPath(const QString &path);
-                // Note that this will only have an effect on Symbian and Fremantle.
+                // Note that this will only have an effect on Fremantle.
-                // void setOrientation(ScreenOrientation orientation);
+                void setOrientation(ScreenOrientation orientation);
                 void showExpanded();
             private:
-                explicit QmlApplicationViewer(QDeclarativeView *view, QWidget *parent);
                 class QmlApplicationViewerPrivate *d;
             };

demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.cpp +55 -52

@@ -1,4 +1,4
1	// checksum 0x~~3fbf~~ version 0x~~70013~~	1	// checksum 0xbd34 version 0x80016
2	/*	2	/*
3	This file was generated by the Qt Quick Application wizard of Qt Creator.	3	This file was generated by the Qt Quick Application wizard of Qt Creator.
4	QmlApplicationViewer is a convenience class containing mobile device specific	4	QmlApplicationViewer is a convenience class containing mobile device specific
@@ -12,10 +12,10
12		12
13	#include <QDir>	13	#include <QDir>
14	#include <QFileInfo>	14	#include <QFileInfo>
15	#include <QtDeclarative/QDeclarativeComponent>
16	#include <QtDeclarative/QDeclarativeEngine>
17	#include <QtDeclarative/QDeclarativeContext>
18	#include <QApplication>	15	#include <QApplication>
		16	#include <QDeclarativeComponent>
		17	#include <QDeclarativeEngine>
		18	#include <QDeclarativeContext>
19		19
20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN	20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
21		21
@@ -57,17 +57,22 class QmlApplicationViewerPrivate
57		57
58	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)	58	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
59	{	59	{
60	#ifdef Q_OS_UNIX
61	#ifdef Q_OS_MAC	60	#ifdef Q_OS_MAC
62	if (!QDir::isAbsolutePath(path))	61	if (!QDir::isAbsolutePath(path))
63	return QString::fromLatin1("%1/../Resources/%2")	62	return QString::fromLatin1("%1/../Resources/%2")
64	.arg(QCoreApplication::applicationDirPath(), path);	63	.arg(QCoreApplication::applicationDirPath(), path);
65	#else	64	#elif defined(Q_OS_QNX)
66	const QString pathInInstallDir =	65	if (!QDir::isAbsolutePath(path))
		66	return QString::fromLatin1("app/native/%1").arg(path);
		67	#elif !defined(Q_OS_ANDROID)
		68	QString pathInInstallDir =
67	QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);	69	QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
68	if (QFileInfo(pathInInstallDir).exists())	70	if (QFileInfo(pathInInstallDir).exists())
69	return pathInInstallDir;	71	return pathInInstallDir;
70	#endif	72	pathInInstallDir =
		73	QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
		74	if (QFileInfo(pathInInstallDir).exists())
		75	return pathInInstallDir;
71	#endif	76	#endif
72	return path;	77	return path;
73	}	78	}
@@ -78,6 +83,7 QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
78	{	83	{
79	connect(engine(), SIGNAL(quit()), SLOT(close()));	84	connect(engine(), SIGNAL(quit()), SLOT(close()));
80	setResizeMode(QDeclarativeView::SizeRootObjectToView);	85	setResizeMode(QDeclarativeView::SizeRootObjectToView);
		86
81	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in	87	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
82	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800	88	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
83	#if !defined(NO_JSDEBUGGER)	89	#if !defined(NO_JSDEBUGGER)
@@ -102,7 +108,11 QmlApplicationViewer *QmlApplicationViewer::create()
102	void QmlApplicationViewer::setMainQmlFile(const QString &file)	108	void QmlApplicationViewer::setMainQmlFile(const QString &file)
103	{	109	{
104	d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);	110	d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
		111	#ifdef Q_OS_ANDROID
		112	setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
		113	#else
105	setSource(QUrl::fromLocalFile(d->mainQmlFile));	114	setSource(QUrl::fromLocalFile(d->mainQmlFile));
		115	#endif
106	}	116	}
107		117
108	void QmlApplicationViewer::addImportPath(const QString &path)	118	void QmlApplicationViewer::addImportPath(const QString &path)
@@ -110,54 +120,47 void QmlApplicationViewer::addImportPath(const QString &path)
110	engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));	120	engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
111	}	121	}
112		122
113	//void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)	123	void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
114	//{	124	{
115	//#if defined(Q_OS_SYMBIAN)	125	#if QT_VERSION < 0x050000
116	// // If the version of Qt on the device is < 4.7.2, that attribute won't work	126	Qt::WidgetAttribute attribute;
117	// if (orientation != ScreenOrientationAuto) {	127	switch (orientation) {
118	// const QStringList v = QString::fromLatin1(qVersion()).split(QLatin1Char('.'));	128	#if QT_VERSION < 0x040702
119	// if (v.count() == 3 && (v.at(0).toInt() << 16 \| v.at(1).toInt() << 8 \| v.at(2).toInt()) < 0x040702) {	129	// Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
120	// qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");	130	case ScreenOrientationLockPortrait:
121	// return;	131	attribute = static_cast<Qt::WidgetAttribute>(128);
122	// }	132	break;
123	// }	133	case ScreenOrientationLockLandscape:
124	//#endif // Q_OS_SYMBIAN	134	attribute = static_cast<Qt::WidgetAttribute>(129);
125		135	break;
126	// Qt::WidgetAttribute attribute;	136	default:
127	// switch (orientation) {	137	case ScreenOrientationAuto:
128	//#if QT_VERSION < 0x040702	138	attribute = static_cast<Qt::WidgetAttribute>(130);
129	// // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes	139	break;
130	// case ScreenOrientationLockPortrait:	140	#else // QT_VERSION < 0x040702
131	// attribute = static_cast<Qt::WidgetAttribute>(128);	141	case ScreenOrientationLockPortrait:
132	// break;	142	attribute = Qt::WA_LockPortraitOrientation;
133	// case ScreenOrientationLockLandscape:	143	break;
134	// attribute = static_cast<Qt::WidgetAttribute>(129);	144	case ScreenOrientationLockLandscape:
135	// break;	145	attribute = Qt::WA_LockLandscapeOrientation;
136	// default:	146	break;
137	// case ScreenOrientationAuto:	147	default:
138	// attribute = static_cast<Qt::WidgetAttribute>(130);	148	case ScreenOrientationAuto:
139	// break;	149	attribute = Qt::WA_AutoOrientation;
140	//#else // QT_VERSION < 0x040702	150	break;
141	// case ScreenOrientationLockPortrait:	151	#endif // QT_VERSION < 0x040702
142	// attribute = Qt::WA_LockPortraitOrientation;	152	};
143	// break;	153	setAttribute(attribute, true);
144	// case ScreenOrientationLockLandscape:	154	#else // QT_VERSION < 0x050000
145	// attribute = Qt::WA_LockLandscapeOrientation;	155	Q_UNUSED(orientation)
146	// break;	156	#endif // QT_VERSION < 0x050000
147	// default:	157	}
148	// case ScreenOrientationAuto:
149	// attribute = Qt::WA_AutoOrientation;
150	// break;
151	//#endif // QT_VERSION < 0x040702
152	// };
153	// setAttribute(attribute, true);
154	//}
155		158
156	void QmlApplicationViewer::showExpanded()	159	void QmlApplicationViewer::showExpanded()
157	{	160	{
158	#if defined(~~Q_OS_SYMBIAN) \|\| defined(~~MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)	161	#if defined(MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)
159	showFullScreen();	162	showFullScreen();
160	#elif defined(Q_WS_MAEMO_5)	163	#elif defined(Q_WS_MAEMO_5) \|\| defined(Q_OS_QNX)
161	showMaximized();	164	showMaximized();
162	#else	165	#else
163	show();	166	show();

demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.h +3 -3

-            // checksum 0x734b version 0x70013
+            // checksum 0xc67a version 0x80016
             /*
               This file was generated by the Qt Quick Application wizard of Qt Creator.
               QmlApplicationViewer is a convenience class containing mobile device specific
                 void setMainQmlFile(const QString &file);
                 void addImportPath(const QString &path);
-                // Note that this will only have an effect on Symbian and Fremantle.
+                // Note that this will only have an effect on Fremantle.
-                // void setOrientation(ScreenOrientation orientation);
+                void setOrientation(ScreenOrientation orientation);
                 void showExpanded();

demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri +29 -8

-            # checksum 0x5b42 version 0x70013
+            # checksum 0x77b version 0x80016
             # This file was generated by the Qt Quick Application wizard of Qt Creator.
             # The code below adds the QmlApplicationViewer to the project and handles the
             # activation of QML debugging.
                 DEFINES += HARMATTAN_BOOSTER
             }
             # This file was generated by an application wizard of Qt Creator.
-            # The code below handles deployment to Symbian and Maemo, aswell as copying
+            # The code below handles deployment to Android and Maemo, aswell as copying
             # of the application data to shadow build directories on desktop.
             # It is recommended not to modify this file, since newer versions of Qt Creator
             # may offer an updated version of it.
             defineTest(qtcAddDeployment) {
             for(deploymentfolder, DEPLOYMENTFOLDERS) {
                 item = item$${deploymentfolder}
-                itemsources = $${item}.sources
+                greaterThan(QT_MAJOR_VERSION, 4) {
+                    itemsources = $${item}.files
+                } else {
+                    itemsources = $${item}.sources
+                }
                 $$itemsources = $$eval($${deploymentfolder}.source)
                 itempath = $${item}.path
                 $$itempath= $$eval($${deploymentfolder}.target)
             MAINPROFILEPWD = $$PWD
-            symbian {
+            android {
-                isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
+                for(deploymentfolder, DEPLOYMENTFOLDERS) {
-                isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+                    item = item$${deploymentfolder}
+                    itemfiles = $${item}.files
+                    $$itemfiles = $$eval($${deploymentfolder}.source)
+                    itempath = $${item}.path
+                    $$itempath = /assets/$$eval($${deploymentfolder}.target)
+                    export($$itemfiles)
+                    export($$itempath)
+                    INSTALLS += $$item
+                }
+                x86 {
+                    target.path = /libs/x86
+                } else: armeabi-v7a {
+                    target.path = /libs/armeabi-v7a
+                } else {
+                    target.path = /libs/armeabi
+                }
+                export(target.path)
+                INSTALLS += target
             } else:win32 {
                 copyCommand =
                 for(deploymentfolder, DEPLOYMENTFOLDERS) {
             export (ICON)
             export (INSTALLS)
             export (DEPLOYMENT)
-            export (TARGET.EPOCHEAPSIZE)
-            export (TARGET.CAPABILITY)
             export (LIBS)
             export (QMAKE_EXTRA_TARGETS)
             }

examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.cpp +69 -92

@@ -1,4 +1,4
1	// checksum 0x~~78c~~ version 0x~~60010~~	1	// checksum 0xbd34 version 0x80016
2	/*	2	/*
3	This file was generated by the Qt Quick Application wizard of Qt Creator.	3	This file was generated by the Qt Quick Application wizard of Qt Creator.
4	QmlApplicationViewer is a convenience class containing mobile device specific	4	QmlApplicationViewer is a convenience class containing mobile device specific
@@ -10,12 +10,12
10		10
11	#include "qmlapplicationviewer.h"	11	#include "qmlapplicationviewer.h"
12		12
13	#include <Q~~tCore/Q~~Dir>	13	#include <QDir>
14	#include <Q~~tCore/Q~~FileInfo>	14	#include <QFileInfo>
15	#include <QtDeclarative/QDeclarativeComponent>
16	#include <QtDeclarative/QDeclarativeEngine>
17	#include <QtDeclarative/QDeclarativeContext>
18	#include <QApplication>	15	#include <QApplication>
		16	#include <QDeclarativeComponent>
		17	#include <QDeclarativeEngine>
		18	#include <QDeclarativeContext>
19		19
20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN	20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
21		21
@@ -50,63 +50,47 static QmlJsDebuggingEnabler enableDebuggingHelper;
50		50
51	class QmlApplicationViewerPrivate	51	class QmlApplicationViewerPrivate
52	{	52	{
53	QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
54
55	QString mainQmlFile;	53	QString mainQmlFile;
56	QDeclarativeView *view;
57	friend class QmlApplicationViewer;	54	friend class QmlApplicationViewer;
58	QString adjustPath(const QString &path);	55	static QString adjustPath(const QString &path);
59	};	56	};
60		57
61	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)	58	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
62	{	59	{
63	#ifdef Q_OS_UNIX
64	#ifdef Q_OS_MAC	60	#ifdef Q_OS_MAC
65	if (!QDir::isAbsolutePath(path))	61	if (!QDir::isAbsolutePath(path))
66	return QCoreApplication::applicationDirPath()	62	return QString::fromLatin1("%1/../Resources/%2")
67	+ QLatin1String("/../Resources/") + path;	63	.arg(QCoreApplication::applicationDirPath(), path);
68	#else	64	#elif defined(Q_OS_QNX)
69	QString pathInInstallDir;	65	if (!QDir::isAbsolutePath(path))
70	const QString applicationDirPath = QCoreApplication::applicationDirPath();	66	return QString::fromLatin1("app/native/%1").arg(path);
71	pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);	67	#elif !defined(Q_OS_ANDROID)
72		68	QString pathInInstallDir =
		69	QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
		70	if (QFileInfo(pathInInstallDir).exists())
		71	return pathInInstallDir;
		72	pathInInstallDir =
		73	QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
73	if (QFileInfo(pathInInstallDir).exists())	74	if (QFileInfo(pathInInstallDir).exists())
74	return pathInInstallDir;	75	return pathInInstallDir;
75	#endif
76	#endif	76	#endif
77	return path;	77	return path;
78	}	78	}
79		79
80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)	80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
81	: QDeclarativeView(parent)	81	: QDeclarativeView(parent)
82	, d(new QmlApplicationViewerPrivate(~~this~~))	82	, d(new QmlApplicationViewerPrivate())
83	{	83	{
84	connect(engine(), SIGNAL(quit()), SLOT(close()));	84	connect(engine(), SIGNAL(quit()), SLOT(close()));
85	setResizeMode(QDeclarativeView::SizeRootObjectToView);	85	setResizeMode(QDeclarativeView::SizeRootObjectToView);
86	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
87	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
88	#if !defined(NO_JSDEBUGGER)
89	new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
90	#endif
91	#if !defined(NO_QMLOBSERVER)
92	new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
93	#endif
94	#endif
95	}
96		86
97	QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView view, QWidget parent)
98	: QDeclarativeView(parent)
99	, d(new QmlApplicationViewerPrivate(view))
100	{
101	connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));
102	view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
103	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in	87	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
104	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800	88	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
105	#if !defined(NO_JSDEBUGGER)	89	#if !defined(NO_JSDEBUGGER)
106	new QmlJSDebugger::JSDebuggerAgent(d->~~view~~->engine());	90	new QmlJSDebugger::JSDebuggerAgent(engine());
107	#endif	91	#endif
108	#if !defined(NO_QMLOBSERVER)	92	#if !defined(NO_QMLOBSERVER)
109	new QmlJSDebugger::QDeclarativeViewObserver(d->~~view~~, d->~~view~~);	93	new QmlJSDebugger::QDeclarativeViewObserver(this, this);
110	#endif	94	#endif
111	#endif	95	#endif
112	}	96	}
@@ -118,75 +102,68 QmlApplicationViewer::~QmlApplicationViewer()
118		102
119	QmlApplicationViewer *QmlApplicationViewer::create()	103	QmlApplicationViewer *QmlApplicationViewer::create()
120	{	104	{
121	#ifdef HARMATTAN_BOOSTER
122	return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);
123	#else
124	return new QmlApplicationViewer();	105	return new QmlApplicationViewer();
125	#endif
126	}	106	}
127		107
128	void QmlApplicationViewer::setMainQmlFile(const QString &file)	108	void QmlApplicationViewer::setMainQmlFile(const QString &file)
129	{	109	{
130	d->mainQmlFile = d->adjustPath(file);	110	d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
131	d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));	111	#ifdef Q_OS_ANDROID
		112	setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
		113	#else
		114	setSource(QUrl::fromLocalFile(d->mainQmlFile));
		115	#endif
132	}	116	}
133		117
134	void QmlApplicationViewer::addImportPath(const QString &path)	118	void QmlApplicationViewer::addImportPath(const QString &path)
135	{	119	{
136	d->~~view~~->engine()->addImportPath(d->adjustPath(path));	120	engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
137	}	121	}
138		122
139	//void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)	123	void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
140	//{	124	{
141	//#if defined(Q_OS_SYMBIAN)	125	#if QT_VERSION < 0x050000
142	// // If the version of Qt on the device is < 4.7.2, that attribute won't work	126	Qt::WidgetAttribute attribute;
143	// if (orientation != ScreenOrientationAuto) {	127	switch (orientation) {
144	// const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));	128	#if QT_VERSION < 0x040702
145	// if (v.count() == 3 && (v.at(0).toInt() << 16 \| v.at(1).toInt() << 8 \| v.at(2).toInt()) < 0x040702) {	129	// Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
146	// qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");	130	case ScreenOrientationLockPortrait:
147	// return;	131	attribute = static_cast<Qt::WidgetAttribute>(128);
148	// }	132	break;
149	// }	133	case ScreenOrientationLockLandscape:
150	//#endif // Q_OS_SYMBIAN	134	attribute = static_cast<Qt::WidgetAttribute>(129);
151		135	break;
152	// Qt::WidgetAttribute attribute;	136	default:
153	// switch (orientation) {	137	case ScreenOrientationAuto:
154	//#if QT_VERSION < 0x040702	138	attribute = static_cast<Qt::WidgetAttribute>(130);
155	// // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes	139	break;
156	// case ScreenOrientationLockPortrait:	140	#else // QT_VERSION < 0x040702
157	// attribute = static_cast<Qt::WidgetAttribute>(128);	141	case ScreenOrientationLockPortrait:
158	// break;	142	attribute = Qt::WA_LockPortraitOrientation;
159	// case ScreenOrientationLockLandscape:	143	break;
160	// attribute = static_cast<Qt::WidgetAttribute>(129);	144	case ScreenOrientationLockLandscape:
161	// break;	145	attribute = Qt::WA_LockLandscapeOrientation;
162	// default:	146	break;
163	// case ScreenOrientationAuto:	147	default:
164	// attribute = static_cast<Qt::WidgetAttribute>(130);	148	case ScreenOrientationAuto:
165	// break;	149	attribute = Qt::WA_AutoOrientation;
166	//#else // QT_VERSION < 0x040702	150	break;
167	// case ScreenOrientationLockPortrait:	151	#endif // QT_VERSION < 0x040702
168	// attribute = Qt::WA_LockPortraitOrientation;	152	};
169	// break;	153	setAttribute(attribute, true);
170	// case ScreenOrientationLockLandscape:	154	#else // QT_VERSION < 0x050000
171	// attribute = Qt::WA_LockLandscapeOrientation;	155	Q_UNUSED(orientation)
172	// break;	156	#endif // QT_VERSION < 0x050000
173	// default:	157	}
174	// case ScreenOrientationAuto:
175	// attribute = Qt::WA_AutoOrientation;
176	// break;
177	//#endif // QT_VERSION < 0x040702
178	// };
179	// setAttribute(attribute, true);
180	//}
181		158
182	void QmlApplicationViewer::showExpanded()	159	void QmlApplicationViewer::showExpanded()
183	{	160	{
184	#if defined(~~Q_OS_SYMBIAN) \|\| defined(~~MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)	161	#if defined(MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)
185	d->~~view~~->showFullScreen();	162	showFullScreen();
186	#elif defined(Q_WS_MAEMO_5)	163	#elif defined(Q_WS_MAEMO_5) \|\| defined(Q_OS_QNX)
187	d->~~view~~->showMaximized();	164	showMaximized();
188	#else	165	#else
189	d->~~view~~->show();	166	show();
190	#endif	167	#endif
191	}	168	}
192		169

examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.h +4 -5

-            // checksum 0x82ed version 0x60010
+            // checksum 0xc67a version 0x80016
             /*
               This file was generated by the Qt Quick Application wizard of Qt Creator.
               QmlApplicationViewer is a convenience class containing mobile device specific
             #ifndef QMLAPPLICATIONVIEWER_H
             #define QMLAPPLICATIONVIEWER_H
-            #include <QtDeclarative/QDeclarativeView>
+            #include <QDeclarativeView>
             class QmlApplicationViewer : public QDeclarativeView
             {
                 void setMainQmlFile(const QString &file);
                 void addImportPath(const QString &path);
-                // Note that this will only have an effect on Symbian and Fremantle.
+                // Note that this will only have an effect on Fremantle.
-                // void setOrientation(ScreenOrientation orientation);
+                void setOrientation(ScreenOrientation orientation);
                 void showExpanded();
             private:
-                explicit QmlApplicationViewer(QDeclarativeView *view, QWidget *parent);
                 class QmlApplicationViewerPrivate *d;
             };

tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.cpp +69 -92

@@ -1,4 +1,4
1	// checksum 0x~~78c~~ version 0x~~60010~~	1	// checksum 0xbd34 version 0x80016
2	/*	2	/*
3	This file was generated by the Qt Quick Application wizard of Qt Creator.	3	This file was generated by the Qt Quick Application wizard of Qt Creator.
4	QmlApplicationViewer is a convenience class containing mobile device specific	4	QmlApplicationViewer is a convenience class containing mobile device specific
@@ -10,12 +10,12
10		10
11	#include "qmlapplicationviewer.h"	11	#include "qmlapplicationviewer.h"
12		12
13	#include <Q~~tCore/Q~~Dir>	13	#include <QDir>
14	#include <Q~~tCore/Q~~FileInfo>	14	#include <QFileInfo>
15	#include <QtDeclarative/QDeclarativeComponent>
16	#include <QtDeclarative/QDeclarativeEngine>
17	#include <QtDeclarative/QDeclarativeContext>
18	#include <QApplication>	15	#include <QApplication>
		16	#include <QDeclarativeComponent>
		17	#include <QDeclarativeEngine>
		18	#include <QDeclarativeContext>
19		19
20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN	20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
21		21
@@ -50,63 +50,47 static QmlJsDebuggingEnabler enableDebuggingHelper;
50		50
51	class QmlApplicationViewerPrivate	51	class QmlApplicationViewerPrivate
52	{	52	{
53	QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
54
55	QString mainQmlFile;	53	QString mainQmlFile;
56	QDeclarativeView *view;
57	friend class QmlApplicationViewer;	54	friend class QmlApplicationViewer;
58	QString adjustPath(const QString &path);	55	static QString adjustPath(const QString &path);
59	};	56	};
60		57
61	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)	58	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
62	{	59	{
63	#ifdef Q_OS_UNIX
64	#ifdef Q_OS_MAC	60	#ifdef Q_OS_MAC
65	if (!QDir::isAbsolutePath(path))	61	if (!QDir::isAbsolutePath(path))
66	return QCoreApplication::applicationDirPath()	62	return QString::fromLatin1("%1/../Resources/%2")
67	+ QLatin1String("/../Resources/") + path;	63	.arg(QCoreApplication::applicationDirPath(), path);
68	#else	64	#elif defined(Q_OS_QNX)
69	QString pathInInstallDir;	65	if (!QDir::isAbsolutePath(path))
70	const QString applicationDirPath = QCoreApplication::applicationDirPath();	66	return QString::fromLatin1("app/native/%1").arg(path);
71	pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);	67	#elif !defined(Q_OS_ANDROID)
72		68	QString pathInInstallDir =
		69	QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
		70	if (QFileInfo(pathInInstallDir).exists())
		71	return pathInInstallDir;
		72	pathInInstallDir =
		73	QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
73	if (QFileInfo(pathInInstallDir).exists())	74	if (QFileInfo(pathInInstallDir).exists())
74	return pathInInstallDir;	75	return pathInInstallDir;
75	#endif
76	#endif	76	#endif
77	return path;	77	return path;
78	}	78	}
79		79
80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)	80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
81	: QDeclarativeView(parent)	81	: QDeclarativeView(parent)
82	, d(new QmlApplicationViewerPrivate(~~this~~))	82	, d(new QmlApplicationViewerPrivate())
83	{	83	{
84	connect(engine(), SIGNAL(quit()), SLOT(close()));	84	connect(engine(), SIGNAL(quit()), SLOT(close()));
85	setResizeMode(QDeclarativeView::SizeRootObjectToView);	85	setResizeMode(QDeclarativeView::SizeRootObjectToView);
86	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
87	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
88	#if !defined(NO_JSDEBUGGER)
89	new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
90	#endif
91	#if !defined(NO_QMLOBSERVER)
92	new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
93	#endif
94	#endif
95	}
96		86
97	QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView view, QWidget parent)
98	: QDeclarativeView(parent)
99	, d(new QmlApplicationViewerPrivate(view))
100	{
101	connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));
102	view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
103	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in	87	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
104	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800	88	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
105	#if !defined(NO_JSDEBUGGER)	89	#if !defined(NO_JSDEBUGGER)
106	new QmlJSDebugger::JSDebuggerAgent(d->~~view~~->engine());	90	new QmlJSDebugger::JSDebuggerAgent(engine());
107	#endif	91	#endif
108	#if !defined(NO_QMLOBSERVER)	92	#if !defined(NO_QMLOBSERVER)
109	new QmlJSDebugger::QDeclarativeViewObserver(d->~~view~~, d->~~view~~);	93	new QmlJSDebugger::QDeclarativeViewObserver(this, this);
110	#endif	94	#endif
111	#endif	95	#endif
112	}	96	}
@@ -118,75 +102,68 QmlApplicationViewer::~QmlApplicationViewer()
118		102
119	QmlApplicationViewer *QmlApplicationViewer::create()	103	QmlApplicationViewer *QmlApplicationViewer::create()
120	{	104	{
121	#ifdef HARMATTAN_BOOSTER
122	return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);
123	#else
124	return new QmlApplicationViewer();	105	return new QmlApplicationViewer();
125	#endif
126	}	106	}
127		107
128	void QmlApplicationViewer::setMainQmlFile(const QString &file)	108	void QmlApplicationViewer::setMainQmlFile(const QString &file)
129	{	109	{
130	d->mainQmlFile = d->adjustPath(file);	110	d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
131	d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));	111	#ifdef Q_OS_ANDROID
		112	setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
		113	#else
		114	setSource(QUrl::fromLocalFile(d->mainQmlFile));
		115	#endif
132	}	116	}
133		117
134	void QmlApplicationViewer::addImportPath(const QString &path)	118	void QmlApplicationViewer::addImportPath(const QString &path)
135	{	119	{
136	d->~~view~~->engine()->addImportPath(d->adjustPath(path));	120	engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
137	}	121	}
138		122
139	//void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)	123	void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
140	//{	124	{
141	//#if defined(Q_OS_SYMBIAN)	125	#if QT_VERSION < 0x050000
142	// // If the version of Qt on the device is < 4.7.2, that attribute won't work	126	Qt::WidgetAttribute attribute;
143	// if (orientation != ScreenOrientationAuto) {	127	switch (orientation) {
144	// const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));	128	#if QT_VERSION < 0x040702
145	// if (v.count() == 3 && (v.at(0).toInt() << 16 \| v.at(1).toInt() << 8 \| v.at(2).toInt()) < 0x040702) {	129	// Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
146	// qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");	130	case ScreenOrientationLockPortrait:
147	// return;	131	attribute = static_cast<Qt::WidgetAttribute>(128);
148	// }	132	break;
149	// }	133	case ScreenOrientationLockLandscape:
150	//#endif // Q_OS_SYMBIAN	134	attribute = static_cast<Qt::WidgetAttribute>(129);
151		135	break;
152	// Qt::WidgetAttribute attribute;	136	default:
153	// switch (orientation) {	137	case ScreenOrientationAuto:
154	//#if QT_VERSION < 0x040702	138	attribute = static_cast<Qt::WidgetAttribute>(130);
155	// // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes	139	break;
156	// case ScreenOrientationLockPortrait:	140	#else // QT_VERSION < 0x040702
157	// attribute = static_cast<Qt::WidgetAttribute>(128);	141	case ScreenOrientationLockPortrait:
158	// break;	142	attribute = Qt::WA_LockPortraitOrientation;
159	// case ScreenOrientationLockLandscape:	143	break;
160	// attribute = static_cast<Qt::WidgetAttribute>(129);	144	case ScreenOrientationLockLandscape:
161	// break;	145	attribute = Qt::WA_LockLandscapeOrientation;
162	// default:	146	break;
163	// case ScreenOrientationAuto:	147	default:
164	// attribute = static_cast<Qt::WidgetAttribute>(130);	148	case ScreenOrientationAuto:
165	// break;	149	attribute = Qt::WA_AutoOrientation;
166	//#else // QT_VERSION < 0x040702	150	break;
167	// case ScreenOrientationLockPortrait:	151	#endif // QT_VERSION < 0x040702
168	// attribute = Qt::WA_LockPortraitOrientation;	152	};
169	// break;	153	setAttribute(attribute, true);
170	// case ScreenOrientationLockLandscape:	154	#else // QT_VERSION < 0x050000
171	// attribute = Qt::WA_LockLandscapeOrientation;	155	Q_UNUSED(orientation)
172	// break;	156	#endif // QT_VERSION < 0x050000
173	// default:	157	}
174	// case ScreenOrientationAuto:
175	// attribute = Qt::WA_AutoOrientation;
176	// break;
177	//#endif // QT_VERSION < 0x040702
178	// };
179	// setAttribute(attribute, true);
180	//}
181		158
182	void QmlApplicationViewer::showExpanded()	159	void QmlApplicationViewer::showExpanded()
183	{	160	{
184	#if defined(~~Q_OS_SYMBIAN) \|\| defined(~~MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)	161	#if defined(MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)
185	d->~~view~~->showFullScreen();	162	showFullScreen();
186	#elif defined(Q_WS_MAEMO_5)	163	#elif defined(Q_WS_MAEMO_5) \|\| defined(Q_OS_QNX)
187	d->~~view~~->showMaximized();	164	showMaximized();
188	#else	165	#else
189	d->~~view~~->show();	166	show();
190	#endif	167	#endif
191	}	168	}
192		169

tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.h +4 -5

-            // checksum 0x82ed version 0x60010
+            // checksum 0xc67a version 0x80016
             /*
               This file was generated by the Qt Quick Application wizard of Qt Creator.
               QmlApplicationViewer is a convenience class containing mobile device specific
             #ifndef QMLAPPLICATIONVIEWER_H
             #define QMLAPPLICATIONVIEWER_H
-            #include <QtDeclarative/QDeclarativeView>
+            #include <QDeclarativeView>
             class QmlApplicationViewer : public QDeclarativeView
             {
                 void setMainQmlFile(const QString &file);
                 void addImportPath(const QString &path);
-                // Note that this will only have an effect on Symbian and Fremantle.
+                // Note that this will only have an effect on Fremantle.
-                // void setOrientation(ScreenOrientation orientation);
+                void setOrientation(ScreenOrientation orientation);
                 void showExpanded();
             private:
-                explicit QmlApplicationViewer(QDeclarativeView *view, QWidget *parent);
                 class QmlApplicationViewerPrivate *d;
             };

tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.cpp +69 -92

@@ -1,4 +1,4
1	// checksum 0x~~78c~~ version 0x~~60010~~	1	// checksum 0xbd34 version 0x80016
2	/*	2	/*
3	This file was generated by the Qt Quick Application wizard of Qt Creator.	3	This file was generated by the Qt Quick Application wizard of Qt Creator.
4	QmlApplicationViewer is a convenience class containing mobile device specific	4	QmlApplicationViewer is a convenience class containing mobile device specific
@@ -10,12 +10,12
10		10
11	#include "qmlapplicationviewer.h"	11	#include "qmlapplicationviewer.h"
12		12
13	#include <Q~~tCore/Q~~Dir>	13	#include <QDir>
14	#include <Q~~tCore/Q~~FileInfo>	14	#include <QFileInfo>
15	#include <QtDeclarative/QDeclarativeComponent>
16	#include <QtDeclarative/QDeclarativeEngine>
17	#include <QtDeclarative/QDeclarativeContext>
18	#include <QApplication>	15	#include <QApplication>
		16	#include <QDeclarativeComponent>
		17	#include <QDeclarativeEngine>
		18	#include <QDeclarativeContext>
19		19
20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN	20	#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
21		21
@@ -50,63 +50,47 static QmlJsDebuggingEnabler enableDebuggingHelper;
50		50
51	class QmlApplicationViewerPrivate	51	class QmlApplicationViewerPrivate
52	{	52	{
53	QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
54
55	QString mainQmlFile;	53	QString mainQmlFile;
56	QDeclarativeView *view;
57	friend class QmlApplicationViewer;	54	friend class QmlApplicationViewer;
58	QString adjustPath(const QString &path);	55	static QString adjustPath(const QString &path);
59	};	56	};
60		57
61	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)	58	QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
62	{	59	{
63	#ifdef Q_OS_UNIX
64	#ifdef Q_OS_MAC	60	#ifdef Q_OS_MAC
65	if (!QDir::isAbsolutePath(path))	61	if (!QDir::isAbsolutePath(path))
66	return QCoreApplication::applicationDirPath()	62	return QString::fromLatin1("%1/../Resources/%2")
67	+ QLatin1String("/../Resources/") + path;	63	.arg(QCoreApplication::applicationDirPath(), path);
68	#else	64	#elif defined(Q_OS_QNX)
69	QString pathInInstallDir;	65	if (!QDir::isAbsolutePath(path))
70	const QString applicationDirPath = QCoreApplication::applicationDirPath();	66	return QString::fromLatin1("app/native/%1").arg(path);
71	pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);	67	#elif !defined(Q_OS_ANDROID)
72		68	QString pathInInstallDir =
		69	QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
		70	if (QFileInfo(pathInInstallDir).exists())
		71	return pathInInstallDir;
		72	pathInInstallDir =
		73	QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
73	if (QFileInfo(pathInInstallDir).exists())	74	if (QFileInfo(pathInInstallDir).exists())
74	return pathInInstallDir;	75	return pathInInstallDir;
75	#endif
76	#endif	76	#endif
77	return path;	77	return path;
78	}	78	}
79		79
80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)	80	QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
81	: QDeclarativeView(parent)	81	: QDeclarativeView(parent)
82	, d(new QmlApplicationViewerPrivate(~~this~~))	82	, d(new QmlApplicationViewerPrivate())
83	{	83	{
84	connect(engine(), SIGNAL(quit()), SLOT(close()));	84	connect(engine(), SIGNAL(quit()), SLOT(close()));
85	setResizeMode(QDeclarativeView::SizeRootObjectToView);	85	setResizeMode(QDeclarativeView::SizeRootObjectToView);
86	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
87	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
88	#if !defined(NO_JSDEBUGGER)
89	new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
90	#endif
91	#if !defined(NO_QMLOBSERVER)
92	new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
93	#endif
94	#endif
95	}
96		86
97	QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView view, QWidget parent)
98	: QDeclarativeView(parent)
99	, d(new QmlApplicationViewerPrivate(view))
100	{
101	connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));
102	view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
103	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in	87	// Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
104	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800	88	#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
105	#if !defined(NO_JSDEBUGGER)	89	#if !defined(NO_JSDEBUGGER)
106	new QmlJSDebugger::JSDebuggerAgent(d->~~view~~->engine());	90	new QmlJSDebugger::JSDebuggerAgent(engine());
107	#endif	91	#endif
108	#if !defined(NO_QMLOBSERVER)	92	#if !defined(NO_QMLOBSERVER)
109	new QmlJSDebugger::QDeclarativeViewObserver(d->~~view~~, d->~~view~~);	93	new QmlJSDebugger::QDeclarativeViewObserver(this, this);
110	#endif	94	#endif
111	#endif	95	#endif
112	}	96	}
@@ -118,75 +102,68 QmlApplicationViewer::~QmlApplicationViewer()
118		102
119	QmlApplicationViewer *QmlApplicationViewer::create()	103	QmlApplicationViewer *QmlApplicationViewer::create()
120	{	104	{
121	#ifdef HARMATTAN_BOOSTER
122	return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);
123	#else
124	return new QmlApplicationViewer();	105	return new QmlApplicationViewer();
125	#endif
126	}	106	}
127		107
128	void QmlApplicationViewer::setMainQmlFile(const QString &file)	108	void QmlApplicationViewer::setMainQmlFile(const QString &file)
129	{	109	{
130	d->mainQmlFile = d->adjustPath(file);	110	d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
131	d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));	111	#ifdef Q_OS_ANDROID
		112	setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
		113	#else
		114	setSource(QUrl::fromLocalFile(d->mainQmlFile));
		115	#endif
132	}	116	}
133		117
134	void QmlApplicationViewer::addImportPath(const QString &path)	118	void QmlApplicationViewer::addImportPath(const QString &path)
135	{	119	{
136	d->~~view~~->engine()->addImportPath(d->adjustPath(path));	120	engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
137	}	121	}
138		122
139	//void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)	123	void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
140	//{	124	{
141	//#if defined(Q_OS_SYMBIAN)	125	#if QT_VERSION < 0x050000
142	// // If the version of Qt on the device is < 4.7.2, that attribute won't work	126	Qt::WidgetAttribute attribute;
143	// if (orientation != ScreenOrientationAuto) {	127	switch (orientation) {
144	// const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));	128	#if QT_VERSION < 0x040702
145	// if (v.count() == 3 && (v.at(0).toInt() << 16 \| v.at(1).toInt() << 8 \| v.at(2).toInt()) < 0x040702) {	129	// Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
146	// qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");	130	case ScreenOrientationLockPortrait:
147	// return;	131	attribute = static_cast<Qt::WidgetAttribute>(128);
148	// }	132	break;
149	// }	133	case ScreenOrientationLockLandscape:
150	//#endif // Q_OS_SYMBIAN	134	attribute = static_cast<Qt::WidgetAttribute>(129);
151		135	break;
152	// Qt::WidgetAttribute attribute;	136	default:
153	// switch (orientation) {	137	case ScreenOrientationAuto:
154	//#if QT_VERSION < 0x040702	138	attribute = static_cast<Qt::WidgetAttribute>(130);
155	// // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes	139	break;
156	// case ScreenOrientationLockPortrait:	140	#else // QT_VERSION < 0x040702
157	// attribute = static_cast<Qt::WidgetAttribute>(128);	141	case ScreenOrientationLockPortrait:
158	// break;	142	attribute = Qt::WA_LockPortraitOrientation;
159	// case ScreenOrientationLockLandscape:	143	break;
160	// attribute = static_cast<Qt::WidgetAttribute>(129);	144	case ScreenOrientationLockLandscape:
161	// break;	145	attribute = Qt::WA_LockLandscapeOrientation;
162	// default:	146	break;
163	// case ScreenOrientationAuto:	147	default:
164	// attribute = static_cast<Qt::WidgetAttribute>(130);	148	case ScreenOrientationAuto:
165	// break;	149	attribute = Qt::WA_AutoOrientation;
166	//#else // QT_VERSION < 0x040702	150	break;
167	// case ScreenOrientationLockPortrait:	151	#endif // QT_VERSION < 0x040702
168	// attribute = Qt::WA_LockPortraitOrientation;	152	};
169	// break;	153	setAttribute(attribute, true);
170	// case ScreenOrientationLockLandscape:	154	#else // QT_VERSION < 0x050000
171	// attribute = Qt::WA_LockLandscapeOrientation;	155	Q_UNUSED(orientation)
172	// break;	156	#endif // QT_VERSION < 0x050000
173	// default:	157	}
174	// case ScreenOrientationAuto:
175	// attribute = Qt::WA_AutoOrientation;
176	// break;
177	//#endif // QT_VERSION < 0x040702
178	// };
179	// setAttribute(attribute, true);
180	//}
181		158
182	void QmlApplicationViewer::showExpanded()	159	void QmlApplicationViewer::showExpanded()
183	{	160	{
184	#if defined(~~Q_OS_SYMBIAN) \|\| defined(~~MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)	161	#if defined(MEEGO_EDITION_HARMATTAN) \|\| defined(Q_WS_SIMULATOR)
185	d->~~view~~->showFullScreen();	162	showFullScreen();
186	#elif defined(Q_WS_MAEMO_5)	163	#elif defined(Q_WS_MAEMO_5) \|\| defined(Q_OS_QNX)
187	d->~~view~~->showMaximized();	164	showMaximized();
188	#else	165	#else
189	d->~~view~~->show();	166	show();
190	#endif	167	#endif
191	}	168	}
192		169

tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.h +4 -5

-            // checksum 0x82ed version 0x60010
+            // checksum 0xc67a version 0x80016
             /*
               This file was generated by the Qt Quick Application wizard of Qt Creator.
               QmlApplicationViewer is a convenience class containing mobile device specific
             #ifndef QMLAPPLICATIONVIEWER_H
             #define QMLAPPLICATIONVIEWER_H
-            #include <QtDeclarative/QDeclarativeView>
+            #include <QDeclarativeView>
             class QmlApplicationViewer : public QDeclarativeView
             {
                 void setMainQmlFile(const QString &file);
                 void addImportPath(const QString &path);
-                // Note that this will only have an effect on Symbian and Fremantle.
+                // Note that this will only have an effect on Fremantle.
-                // void setOrientation(ScreenOrientation orientation);
+                void setOrientation(ScreenOrientation orientation);
                 void showExpanded();
             private:
-                explicit QmlApplicationViewer(QDeclarativeView *view, QWidget *parent);
                 class QmlApplicationViewerPrivate *d;
             };

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages