summaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-09-14 15:33:20 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-18 08:46:36 +0200
commit5120eec7fc741921318a5538fe15fbcb6bc73f7c (patch)
treeba45750be59a10c1d69521512d9372fc88207d83 /tests/manual
parent5f7494513e35c92f802ff9fdca4baa6ad2246003 (diff)
Remove Symbian platform
Change-Id: Iad770614f7c1c890febeee662d0ce9370dcb17e3 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.cpp32
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.pri7
-rw-r--r--tests/manual/declarative/qmlshadersplugin/qmlshadersplugin.pro5
3 files changed, 6 insertions, 38 deletions
diff --git a/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.cpp b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.cpp
index cb70d1be..28793014 100644
--- a/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -56,13 +56,6 @@
#include <qdeclarativeviewobserver.h>
#endif
-#if defined(Q_OS_SYMBIAN) && defined(ORIENTATIONLOCK)
-#include <eikenv.h>
-#include <eikappui.h>
-#include <aknenv.h>
-#include <aknappui.h>
-#endif // Q_OS_SYMBIAN && ORIENTATIONLOCK
-
class QmlApplicationViewerPrivate
{
QString mainQmlFile;
@@ -121,22 +114,7 @@ void QmlApplicationViewer::addImportPath(const QString &path)
void QmlApplicationViewer::setOrientation(Orientation orientation)
{
-#ifdef Q_OS_SYMBIAN
- if (orientation != Auto) {
-#if defined(ORIENTATIONLOCK)
- const CAknAppUiBase::TAppUiOrientation uiOrientation =
- (orientation == LockPortrait) ? CAknAppUi::EAppUiOrientationPortrait
- : CAknAppUi::EAppUiOrientationLandscape;
- CAknAppUi* appUi = dynamic_cast<CAknAppUi*> (CEikonEnv::Static()->AppUi());
- TRAPD(error,
- if (appUi)
- appUi->SetOrientationL(uiOrientation);
- );
-#else // ORIENTATIONLOCK
- qWarning("'ORIENTATIONLOCK' needs to be defined on Symbian when locking the orientation.");
-#endif // ORIENTATIONLOCK
- }
-#elif defined(Q_WS_MAEMO_5)
+#if defined(Q_WS_MAEMO_5)
Qt::WidgetAttribute attribute;
switch (orientation) {
case LockPortrait:
@@ -151,16 +129,14 @@ void QmlApplicationViewer::setOrientation(Orientation orientation)
break;
}
setAttribute(attribute, true);
-#else // Q_OS_SYMBIAN
+#else
Q_UNUSED(orientation);
-#endif // Q_OS_SYMBIAN
+#endif
}
void QmlApplicationViewer::show()
{
-#ifdef Q_OS_SYMBIAN
- showFullScreen();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
showMaximized();
#else
QDeclarativeView::show();
diff --git a/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.pri b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.pri
index 7446f1fc..06e4d270 100644
--- a/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -22,7 +22,7 @@ contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) {
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 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.
@@ -41,10 +41,7 @@ for(deploymentfolder, DEPLOYMENTFOLDERS) {
MAINPROFILEPWD = $$PWD
-symbian {
- isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
- isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-} else:win32 {
+win32 {
copyCommand =
for(deploymentfolder, DEPLOYMENTFOLDERS) {
source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
diff --git a/tests/manual/declarative/qmlshadersplugin/qmlshadersplugin.pro b/tests/manual/declarative/qmlshadersplugin/qmlshadersplugin.pro
index e6e687ad..764f1770 100644
--- a/tests/manual/declarative/qmlshadersplugin/qmlshadersplugin.pro
+++ b/tests/manual/declarative/qmlshadersplugin/qmlshadersplugin.pro
@@ -11,11 +11,6 @@ QML_IMPORT_PATH =
# Avoid auto screen rotation
#DEFINES += ORIENTATIONLOCK
-# Needs to be defined for Symbian
-#DEFINES += NETWORKACCESS
-
-symbian:TARGET.UID3 = 0xE40472A7
-
# Define QMLJSDEBUGGER to enable basic debugging (setting breakpoints etc)
# Define QMLOBSERVER for advanced features (requires experimental QmlInspector plugin!)
#DEFINES += QMLJSDEBUGGER