diff options
Diffstat (limited to 'examples')
32 files changed, 223 insertions, 182 deletions
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index eaa48cd901..cfa7923128 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -18,12 +18,3 @@ ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarati INSTALLS = sources ImageProviderCore_sources target -symbian:{ - CONFIG += qt_example - TARGET.EPOCALLOWDLLDATA = 1 - - importFiles.files = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir - importFiles.path = ImageProviderCore - DEPLOYMENT += importFiles -} -maemo5: CONFIG += qt_example diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index 03f7294131..bdcb62ca8a 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -23,8 +23,3 @@ target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins/com/nok INSTALLS += qdeclarativesources sources target -symbian { - CONFIG += qt_example - TARGET.EPOCALLOWDLLDATA = 1 -} -maemo5: CONFIG += qt_example diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index d3683fe376..883c0afe2d 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -9,9 +9,6 @@ SUBDIRS = \ tutorials \ script -# plugins uses a 'Time' class that conflicts with symbian e32std.h also defining a class of the same name -symbian:SUBDIRS -= plugins - # These examples contain no C++ and can simply be copied sources.files = \ animation \ diff --git a/examples/declarative/painteditem/smile/main.cpp b/examples/declarative/painteditem/smile/main.cpp index 1f0b3a3cb8..dc76e71185 100644 --- a/examples/declarative/painteditem/smile/main.cpp +++ b/examples/declarative/painteditem/smile/main.cpp @@ -43,16 +43,24 @@ #include <QtDeclarative/qdeclarative.h> #include <QtDeclarative/qquickview.h> #include <QtDeclarative/qquickpainteditem.h> - class MyPaintItem : public QQuickPaintedItem { Q_OBJECT + Q_PROPERTY(QString face READ face WRITE setFace NOTIFY faceChanged) public: - MyPaintItem() : QQuickPaintedItem() + MyPaintItem() + : QQuickPaintedItem() + , m_face(QLatin1String(":-)")) { setAntialiasing(true); } - + QString face() const {return m_face;} + void setFace(const QString &face) { + if (m_face != face) { + m_face = face; + emit faceChanged(); + } + } virtual void paint(QPainter *p) { QRectF rect(0, 0, width(), height()); @@ -62,8 +70,12 @@ public: p->drawEllipse(rect); p->setPen(Qt::black); p->setFont(QFont(QLatin1String("Times"), qRound(rect.height() / 2))); - p->drawText(rect, Qt::AlignCenter, QLatin1String(":-)")); + p->drawText(rect, Qt::AlignCenter, m_face); } +signals: + void faceChanged(); +private: + QString m_face; }; int main(int argc, char ** argv) diff --git a/examples/declarative/painteditem/smile/smile.pro b/examples/declarative/painteditem/smile/smile.pro index 5d7b9df074..3b9e4e0f62 100644 --- a/examples/declarative/painteditem/smile/smile.pro +++ b/examples/declarative/painteditem/smile/smile.pro @@ -9,6 +9,3 @@ SOURCES += main.cpp CONFIG += console -symbian { - TARGET.EPOCHEAPSIZE = 0x20000 0x5000000 -} diff --git a/examples/declarative/painteditem/smile/smile.qml b/examples/declarative/painteditem/smile/smile.qml index bc4bd2664b..e09d9b1fa8 100644 --- a/examples/declarative/painteditem/smile/smile.qml +++ b/examples/declarative/painteditem/smile/smile.qml @@ -42,16 +42,91 @@ import QtQuick 2.0 import MyModule 1.0 Rectangle { - width: 480 - height: 480 + width: 500 + height: 500 gradient: Gradient { GradientStop { position: 0.0; color: "#00249a" } GradientStop { position: 0.7; color: "#ffd94f" } GradientStop { position: 1.0; color: "#ffa322" } } MyPaintItem { - anchors.fill: parent + renderTarget:PaintedItem.Image + clip:true + width:240 + height:240 + anchors.left : parent.left + anchors.top :parent.top anchors.margins: 10 smooth: true + MouseArea { + anchors.fill:parent + onClicked: { + if (parent.face == ":-)") + parent.face = ":-("; + else + parent.face = ":-)"; + parent.update() + } + } } -} + MyPaintItem { + clip:true + renderTarget:PaintedItem.Image + width:240 + height:240 + anchors.right : parent.right + anchors.top :parent.top + anchors.margins: 10 + smooth: true + MouseArea { + anchors.fill:parent + onClicked: { + if (parent.face == ":-)") + parent.face = ":-("; + else + parent.face = ":-)"; + parent.update() + } + } + } + MyPaintItem { + clip:true + renderTarget:PaintedItem.Image + width:240 + height:240 + anchors.left : parent.left + anchors.bottom :parent.bottom + anchors.margins: 10 + smooth: true + MouseArea { + anchors.fill:parent + onClicked: { + if (parent.face == ":-)") + parent.face = ":-("; + else + parent.face = ":-)"; + parent.update() + } + } + } + MyPaintItem { + clip:true + renderTarget:PaintedItem.Image + width:240 + height:240 + anchors.right : parent.right + anchors.bottom :parent.bottom + anchors.margins: 10 + smooth: true + MouseArea { + anchors.fill:parent + onClicked: { + if (parent.face == ":-)") + parent.face = ":-("; + else + parent.face = ":-)"; + parent.update() + } + } + } +}
\ No newline at end of file diff --git a/examples/declarative/particles/affectors/customaffector.qml b/examples/declarative/particles/affectors/customaffector.qml index f3c14e2bb3..0defa54a62 100644 --- a/examples/declarative/particles/affectors/customaffector.qml +++ b/examples/declarative/particles/affectors/customaffector.qml @@ -124,7 +124,7 @@ Item { particle.vx = 0; else particle.vx = (particle.vx / xslow); - particle.update = 1; + particle.update = true; } } } diff --git a/examples/declarative/particles/affectors/gravity.qml b/examples/declarative/particles/affectors/gravity.qml index dc55324f3a..7509b119b0 100644 --- a/examples/declarative/particles/affectors/gravity.qml +++ b/examples/declarative/particles/affectors/gravity.qml @@ -84,7 +84,7 @@ Item { ParticleSystem { id: sys } Gravity { system: sys - acceleration: 32 + magnitude: 32 angle: ground.rotation + 90 } Emitter { diff --git a/examples/declarative/particles/imageparticle/sprites.qml b/examples/declarative/particles/imageparticle/sprites.qml index dfc4447e45..aba6454072 100644 --- a/examples/declarative/particles/imageparticle/sprites.qml +++ b/examples/declarative/particles/imageparticle/sprites.qml @@ -57,7 +57,8 @@ Rectangle { width: 250 height: 250 x: 20 - y: 20 + anchors.bottom: parent.bottom + anchors.bottomMargin: 20 z:4 } diff --git a/examples/declarative/script/shell/shell.pro b/examples/declarative/script/shell/shell.pro index 7ddc06b3c4..00191ab3d0 100644 --- a/examples/declarative/script/shell/shell.pro +++ b/examples/declarative/script/shell/shell.pro @@ -2,7 +2,6 @@ QT += declarative win32: CONFIG += console mac:CONFIG -= app_bundle -symbian: CONFIG += qt_example SOURCES += main.cpp diff --git a/examples/declarative/text/styledtext-layout.qml b/examples/declarative/text/styledtext-layout.qml new file mode 100644 index 0000000000..9ef30ef1ca --- /dev/null +++ b/examples/declarative/text/styledtext-layout.qml @@ -0,0 +1,109 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 + +Rectangle { + id: main + width: 1024; height: 1024 + focus: true + + property real offset: 0 + property real margin: 15 + + Keys.onLeftPressed: myText.horizontalAlignment = Text.AlignLeft + Keys.onUpPressed: myText.horizontalAlignment = Text.AlignHCenter + Keys.onRightPressed: myText.horizontalAlignment = Text.AlignRight + Keys.onDownPressed: myText.horizontalAlignment = Text.AlignJustify + + Text { + id: myText + anchors.fill: parent + anchors.margins: 20 + wrapMode: Text.WordWrap + font.family: "Times New Roman" + font.pixelSize: 18 + textFormat: Text.StyledText + horizontalAlignment: Text.AlignJustify + + text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer at ante dui sed eu egestas est facilis <a href=\"www.nokia.com\">www.nokia.com</a>.<br/>Curabitur ante est, pulvinar quis adipiscing a, iaculis id ipsum. Phasellus id neque id velit facilisis cursus ac sit amet nibh. Donec enim arcu, pharetra non semper nec, iaculis eget elit. Nunc blandit condimentum odio vel egestas.<br><ul type=\"bullet\"><li>Coffee<ol type=\"a\"><li>Espresso<li><b>Cappuccino</b><li><i>Flat White</i><li>Latte</ol><li>Juice<ol type=\"1\"><li>Orange</li><li>Apple</li><li>Pineapple</li><li>Tomato</li></ol></li></ul><p><font color=\"#434343\"><i>Proin consectetur <b>sapien</b> in ipsum lacinia sit amet mattis orci interdum. Quisque vitae accumsan lectus. Ut nisi turpis, sollicitudin ut dignissim id, fermentum ac est. Maecenas nec libero leo. Sed ac leo eget ipsum ultricies viverra sit amet eu orci. Praesent et tortor risus, viverra accumsan sapien. Sed faucibus eleifend lectus, sed euismod urna porta eu. Aenean ultricies lectus ut orci dictum quis convallis nisi ultrices. Nunc elit mi, iaculis a porttitor rutrum, venenatis malesuada nisi. Suspendisse turpis quam, euismod non imperdiet et, rutrum nec ligula. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam semper tristique metus eu sodales. Integer eget risus ipsum. Quisque ut risus ut nulla tristique volutpat at sit amet nisl. Aliquam pulvinar auctor diam nec bibendum. Quisque luctus sapien id arcu volutpat pharetra. Praesent pretium imperdiet euismod. Integer fringilla rhoncus condimentum. Quisque sit amet ornare nulla. Cras sapien augue, sagittis a dictum id, suscipit et nunc. Cras vitae augue in enim elementum venenatis sed nec risus. Sed nisi quam, mollis quis auctor ac, vestibulum in neque. Vivamus eu justo risus. Suspendisse vel mollis est. Vestibulum gravida interdum mi, in molestie neque gravida in.</i></font><br><br> Donec nibh odio, mattis facilisis vulputate et, scelerisque ut felis. Sed ornare eros nec odio aliquam eu varius augue adipiscing. Vivamus sit amet massa dapibus sapien pulvinar consectetur a sit amet felis. Cras non mi id libero dictum iaculis id dignissim eros. Praesent eget enim dui, sed bibendum neque. Ut interdum nisl id leo malesuada ornare.<br><br>Pellentesque id nisl eu odio volutpat posuere et at massa. Pellentesque nec lorem justo. Integer sem urna, pharetra sed sagittis vitae, condimentum ac felis. Ut vitae sapien ac tortor adipiscing pharetra. Cras tristique urna tempus ante volutpat eleifend non eu ligula. Mauris sodales nisl et lorem tristique sodales. Mauris arcu orci, vehicula semper cursus ac, dapibus ut mi. Cras orci ligula, lacinia non laoreet non, feugiat eget lorem. Duis commodo urna nunc. Ut eu diam quis magna volutpat auctor. Duis non nibh non leo aliquet gravida. <font color=\"green\">Aenean diam velit, eleifend sed porta eu, malesuada sed erat.</font> In hac habitasse platea dictumst. Ut nulla ligula, tincidunt ac volutpat nec, accumsan at risus. Donec eget ipsum sit amet nulla tempus auctor ut non massa. Donec enim purus, consectetur viverra congue vitae, vehicula eu sapien. Ut aliquam iaculis metus, a bibendum nisi fringilla ut. Maecenas ut libero augue, vitae tristique diam. Vivamus nec rhoncus ipsum. Maecenas rutrum, libero sit amet ultrices cursus, elit massa laoreet odio, in luctus elit quam eu quam. Sed non diam urna. Maecenas fringilla feugiat malesuada. In tellus nibh, gravida vitae cursus mollis, tincidunt eu urna. Cras turpis lorem, dictum in feugiat id, gravida eu nulla. In ultricies nisl in sapien consectetur eu ultricies nisl facilisis. Nam id mauris a leo pretium facilisis eget quis est. Fusce fermentum quam in metus facilisis semper." + + + onLineLaidOut: { + line.width = width / 2 - (2 * margin) + if (line.number === 40) { + main.offset = line.y + } + if (line.number >= 40) { + line.x = width / 2 + margin + line.y -= main.offset + } + if ((line.y + line.height) > rect.y && line.y < (rect.y + rect.height)) { + if (line.number < 40) + line.width = Math.min((rect.x - line.x), line.width) + else { + line.x = Math.max((rect.x + rect.width), width / 2 + margin) + line.width = Math.min((width - margin - line.x), line.width) + } + } + } + + Item { + id: rect + x: 280; y: 200 + width: 300; height: 300 + + Rectangle { + anchors { fill: parent; leftMargin: 15; rightMargin: 15 } + color: "lightsteelblue"; opacity: 0.3 + } + + MouseArea { + anchors.fill: parent + drag.target: rect + acceptedButtons: Qt.LeftButton | Qt.RightButton + onClicked: mouse.button == Qt.RightButton ? myText.font.pixelSize -= 1 : myText.font.pixelSize += 1 + onPositionChanged: myText.doLayout() + } + } + } + +} diff --git a/examples/embedded/qmlcalculator/deployment.pri b/examples/embedded/qmlcalculator/deployment.pri index a97498e91f..a3627b8fa2 100644 --- a/examples/embedded/qmlcalculator/deployment.pri +++ b/examples/embedded/qmlcalculator/deployment.pri @@ -1,8 +1,4 @@ qmlcalculator_src = $$PWD/../../declarative/calculator -symbian { - load(data_caging_paths) - qmlcalculator_uid3 = A000E3FB - qmlcalculator_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlcalculator_uid3 -} + qmlcalculator_files.files = $$qmlcalculator_src/calculator.qml $$qmlcalculator_src/Core DEPLOYMENT += qmlcalculator_files diff --git a/examples/embedded/qmlcalculator/qmlcalculator.cpp b/examples/embedded/qmlcalculator/qmlcalculator.cpp index bed579726c..94cb00f4a2 100644 --- a/examples/embedded/qmlcalculator/qmlcalculator.cpp +++ b/examples/embedded/qmlcalculator/qmlcalculator.cpp @@ -44,13 +44,6 @@ #include <QtDeclarative/QDeclarativeView> #include <QtDeclarative/QDeclarativeEngine> -#if defined(Q_OS_SYMBIAN) -#include <eikenv.h> -#include <eikappui.h> -#include <aknenv.h> -#include <aknappui.h> -#endif // Q_OS_SYMBIAN - int main(int argc, char *argv[]) { QApplication application(argc, argv); @@ -60,21 +53,11 @@ int main(int argc, char *argv[]) view.setSource(QUrl(mainQmlApp)); view.setResizeMode(QDeclarativeView::SizeRootObjectToView); QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); - + #if defined(QT_KEYPAD_NAVIGATION) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); #endif // QT_KEYPAD_NAVIGATION -#if defined(Q_OS_SYMBIAN) - CAknAppUi* appUi = dynamic_cast<CAknAppUi*> (CEikonEnv::Static()->AppUi()); - TRAPD(error, - if (appUi) - appUi->SetOrientationL(CAknAppUi::EAppUiOrientationPortrait) - ) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.show(); -#endif // Q_OS_SYMBIAN - return application.exec(); } diff --git a/examples/embedded/qmlcalculator/qmlcalculator.pro b/examples/embedded/qmlcalculator/qmlcalculator.pro index 72f45f56d1..25c16ca78a 100644 --- a/examples/embedded/qmlcalculator/qmlcalculator.pro +++ b/examples/embedded/qmlcalculator/qmlcalculator.pro @@ -1,12 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative SOURCES += $$PWD/qmlcalculator.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmlcalculator_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 - LIBS += -lcone -leikcore -lavkon # Screen orientation -} diff --git a/examples/embedded/qmlclocks/deployment.pri b/examples/embedded/qmlclocks/deployment.pri index 6c6704ccc7..771a4dba76 100644 --- a/examples/embedded/qmlclocks/deployment.pri +++ b/examples/embedded/qmlclocks/deployment.pri @@ -1,8 +1,4 @@ qmlclocks_src = $$PWD/../../../examples/declarative/toys/clocks -symbian { - load(data_caging_paths) - qmlclocks_uid3 = A000E3FC - qmlclocks_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlclocks_uid3 -} + qmlclocks_files.files = $$qmlclocks_src/clocks.qml $$qmlclocks_src/content DEPLOYMENT += qmlclocks_files diff --git a/examples/embedded/qmlclocks/qmlclocks.cpp b/examples/embedded/qmlclocks/qmlclocks.cpp index 75d0be0874..04366aa0ab 100644 --- a/examples/embedded/qmlclocks/qmlclocks.cpp +++ b/examples/embedded/qmlclocks/qmlclocks.cpp @@ -44,13 +44,6 @@ #include <QtDeclarative/QDeclarativeView> #include <QtDeclarative/QDeclarativeEngine> -#if defined(Q_OS_SYMBIAN) -#include <eikenv.h> -#include <eikappui.h> -#include <aknenv.h> -#include <aknappui.h> -#endif // Q_OS_SYMBIAN - int main(int argc, char *argv[]) { QApplication application(argc, argv); @@ -65,16 +58,6 @@ int main(int argc, char *argv[]) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); #endif // QT_KEYPAD_NAVIGATION -#if defined(Q_OS_SYMBIAN) - CAknAppUi* appUi = dynamic_cast<CAknAppUi*> (CEikonEnv::Static()->AppUi()); - TRAPD(error, - if (appUi) - appUi->SetOrientationL(CAknAppUi::EAppUiOrientationLandscape) - ) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.show(); -#endif // Q_OS_SYMBIAN - return application.exec(); } diff --git a/examples/embedded/qmlclocks/qmlclocks.pro b/examples/embedded/qmlclocks/qmlclocks.pro index 1b6cdad6be..8e9dcdf87c 100644 --- a/examples/embedded/qmlclocks/qmlclocks.pro +++ b/examples/embedded/qmlclocks/qmlclocks.pro @@ -1,12 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative SOURCES += $$PWD/qmlclocks.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmlclocks_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 - LIBS += -lcone -leikcore -lavkon # Screen orientation -} diff --git a/examples/embedded/qmldialcontrol/deployment.pri b/examples/embedded/qmldialcontrol/deployment.pri index a9784439a4..d845120923 100644 --- a/examples/embedded/qmldialcontrol/deployment.pri +++ b/examples/embedded/qmldialcontrol/deployment.pri @@ -1,8 +1,4 @@ qmldialcontrol_src = $$PWD/../../../examples/declarative/ui-components/dialcontrol -symbian { - load(data_caging_paths) - qmldialcontrol_uid3 = A000E3FD - qmldialcontrol_files.path = $$APP_PRIVATE_DIR_BASE/$$qmldialcontrol_uid3 -} + qmldialcontrol_files.files = $$qmldialcontrol_src/dialcontrol.qml $$qmldialcontrol_src/content DEPLOYMENT += qmldialcontrol_files diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp index 7cc4ed6668..6f9b0e574a 100644 --- a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp +++ b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp @@ -58,11 +58,6 @@ int main(int argc, char *argv[]) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); #endif // QT_KEYPAD_NAVIGATION -#if defined(Q_OS_SYMBIAN) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.show(); -#endif // Q_OS_SYMBIAN - return application.exec(); } diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.pro b/examples/embedded/qmldialcontrol/qmldialcontrol.pro index 3b2e88649e..08f876b926 100644 --- a/examples/embedded/qmldialcontrol/qmldialcontrol.pro +++ b/examples/embedded/qmldialcontrol/qmldialcontrol.pro @@ -1,11 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative SOURCES += $$PWD/qmldialcontrol.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmldialcontrol_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} diff --git a/examples/embedded/qmleasing/deployment.pri b/examples/embedded/qmleasing/deployment.pri index 946fcd9d89..7a5d0401cb 100644 --- a/examples/embedded/qmleasing/deployment.pri +++ b/examples/embedded/qmleasing/deployment.pri @@ -1,8 +1,4 @@ qmleasing_src = $$PWD/../../../examples/declarative/animation/easing -symbian { - load(data_caging_paths) - qmleasing_uid3 = A000E3FE - qmleasing_files.path = $$APP_PRIVATE_DIR_BASE/$$qmleasing_uid3 -} + qmleasing_files.files = $$qmleasing_src/easing.qml $$qmleasing_src/content DEPLOYMENT += qmleasing_files diff --git a/examples/embedded/qmleasing/qmleasing.cpp b/examples/embedded/qmleasing/qmleasing.cpp index 38c457d376..3e24546b4a 100644 --- a/examples/embedded/qmleasing/qmleasing.cpp +++ b/examples/embedded/qmleasing/qmleasing.cpp @@ -58,11 +58,6 @@ int main(int argc, char *argv[]) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); #endif // QT_KEYPAD_NAVIGATION -#if defined(Q_OS_SYMBIAN) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.show(); -#endif // Q_OS_SYMBIAN - return application.exec(); } diff --git a/examples/embedded/qmleasing/qmleasing.pro b/examples/embedded/qmleasing/qmleasing.pro index bf332aa07d..c9f008d42e 100644 --- a/examples/embedded/qmleasing/qmleasing.pro +++ b/examples/embedded/qmleasing/qmleasing.pro @@ -1,11 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative SOURCES += $$PWD/qmleasing.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmleasing_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} diff --git a/examples/embedded/qmlflickr/deployment.pri b/examples/embedded/qmlflickr/deployment.pri index a38dc95f8c..0d76ddc1db 100644 --- a/examples/embedded/qmlflickr/deployment.pri +++ b/examples/embedded/qmlflickr/deployment.pri @@ -1,8 +1,4 @@ qmlflickr_src = $$PWD/../../declarative/flickr -symbian { - load(data_caging_paths) - qmlflickr_uid3 = A000E3FF - qmlflickr_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlflickr_uid3 -} + qmlflickr_files.files = $$qmlflickr_src/flickr.qml $$qmlflickr_src/common $$qmlflickr_src/mobile DEPLOYMENT += qmlflickr_files diff --git a/examples/embedded/qmlflickr/qmlflickr.cpp b/examples/embedded/qmlflickr/qmlflickr.cpp index 052d11c48a..dc7b5ee397 100644 --- a/examples/embedded/qmlflickr/qmlflickr.cpp +++ b/examples/embedded/qmlflickr/qmlflickr.cpp @@ -97,13 +97,8 @@ int main(int argc, char *argv[]) view.setSource(QUrl(mainQmlApp)); view.setResizeMode(QDeclarativeView::SizeRootObjectToView); QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); - -#if defined(Q_OS_SYMBIAN) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.setGeometry(QRect(100, 100, 360, 640)); view.show(); -#endif // Q_OS_SYMBIAN return application.exec(); } diff --git a/examples/embedded/qmlflickr/qmlflickr.pro b/examples/embedded/qmlflickr/qmlflickr.pro index 60abe31333..869d651b05 100644 --- a/examples/embedded/qmlflickr/qmlflickr.pro +++ b/examples/embedded/qmlflickr/qmlflickr.pro @@ -1,13 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative network SOURCES += $$PWD/qmlflickr.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmlflickr_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.CAPABILITY = NetworkServices - # Maximum heap size set to 128 MB in order to allow loading large images. - TARGET.EPOCHEAPSIZE = 0x20000 0x8000000 -} diff --git a/examples/embedded/qmlphotoviewer/deployment.pri b/examples/embedded/qmlphotoviewer/deployment.pri index 23882e3686..504373914a 100644 --- a/examples/embedded/qmlphotoviewer/deployment.pri +++ b/examples/embedded/qmlphotoviewer/deployment.pri @@ -1,8 +1,4 @@ qmlphotoviewer_src = $$PWD/../../declarative/photoviewer -symbian { - load(data_caging_paths) - qmlphotoviewer_uid3 = A000E400 - qmlphotoviewer_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlphotoviewer_uid3 -} + qmlphotoviewer_files.files = $$qmlphotoviewer_src/photoviewer.qml $$qmlphotoviewer_src/PhotoViewerCore DEPLOYMENT += qmlphotoviewer_files diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp index 89a0902373..16135a7851 100644 --- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp +++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp @@ -97,13 +97,8 @@ int main(int argc, char *argv[]) view.setResizeMode(QDeclarativeView::SizeRootObjectToView); QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); - -#if defined(Q_OS_SYMBIAN) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.setGeometry(QRect(100, 100, 360, 640)); view.show(); -#endif // Q_OS_SYMBIAN return application.exec(); } diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro index b97bf269d3..9941b2e226 100644 --- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro +++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro @@ -1,12 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative network SOURCES += $$PWD/qmlphotoviewer.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmlphotoviewer_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.CAPABILITY = NetworkServices - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} diff --git a/examples/embedded/qmltwitter/deployment.pri b/examples/embedded/qmltwitter/deployment.pri index 3edc0e527c..a3c045ca54 100644 --- a/examples/embedded/qmltwitter/deployment.pri +++ b/examples/embedded/qmltwitter/deployment.pri @@ -1,8 +1,4 @@ qmltwitter_src = $$PWD/../../declarative/twitter -symbian { - load(data_caging_paths) - qmltwitter_uid3 = A000E401 - qmltwitter_files.path = $$APP_PRIVATE_DIR_BASE/$$qmltwitter_uid3 -} + qmltwitter_files.files = $$qmltwitter_src/twitter.qml $$qmltwitter_src/TwitterCore DEPLOYMENT += qmltwitter_files diff --git a/examples/embedded/qmltwitter/qmltwitter.cpp b/examples/embedded/qmltwitter/qmltwitter.cpp index f63f9055ef..5485028aff 100644 --- a/examples/embedded/qmltwitter/qmltwitter.cpp +++ b/examples/embedded/qmltwitter/qmltwitter.cpp @@ -96,13 +96,8 @@ int main(int argc, char *argv[]) view.setSource(QUrl(mainQmlApp)); view.setResizeMode(QDeclarativeView::SizeRootObjectToView); QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); - -#if defined(Q_OS_SYMBIAN) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.setGeometry(QRect(100, 100, 360, 640)); view.show(); -#endif // Q_OS_SYMBIAN return application.exec(); } diff --git a/examples/embedded/qmltwitter/qmltwitter.pro b/examples/embedded/qmltwitter/qmltwitter.pro index 79e25de287..ce40cd7489 100644 --- a/examples/embedded/qmltwitter/qmltwitter.pro +++ b/examples/embedded/qmltwitter/qmltwitter.pro @@ -1,12 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative network SOURCES += $$PWD/qmltwitter.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmltwitter_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.CAPABILITY = NetworkServices - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} |