From 4ae7aecb68b506f21bd5411bf92a1e8d9fe807bb Mon Sep 17 00:00:00 2001
From: Damian Jansen <damian.jansen@nokia.com>
Date: Wed, 19 Oct 2011 15:04:15 +1000
Subject: Remove Q_WS_*, symbian and maemo code in QtDeclarative

Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
---
 src/imports/folderlistmodel/folderlistmodel.pro         | 10 ----------
 .../folderlistmodel/qdeclarativefolderlistmodel.cpp     |  2 +-
 src/imports/gestures/gestures.pro                       | 10 ----------
 src/imports/particles/particles.pro                     | 10 ----------
 src/imports/qimportbase.pri                             |  7 -------
 src/imports/testlib/testlib.pro                         | 17 -----------------
 6 files changed, 1 insertion(+), 55 deletions(-)

(limited to 'src/imports')

diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro
index 63f75d9254..26efc654b8 100644
--- a/src/imports/folderlistmodel/folderlistmodel.pro
+++ b/src/imports/folderlistmodel/folderlistmodel.pro
@@ -13,14 +13,4 @@ target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 qmldir.files += $$PWD/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
-symbian:{
-    TARGET.UID3 = 0x20021320
-
-    isEmpty(DESTDIR):importFiles.files = qmlfolderlistmodelplugin$${QT_LIBINFIX}.dll qmldir
-    else:importFiles.files = $$DESTDIR/qmlfolderlistmodelplugin$${QT_LIBINFIX}.dll qmldir
-    importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
-    
-    DEPLOYMENT = importFiles
-}
-
 INSTALLS += target qmldir
diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
index 88675d4ae0..a6c9f97a96 100644
--- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
@@ -269,7 +269,7 @@ QUrl QDeclarativeFolderListModel::parentFolder() const
     QString localFile = d->folder.toLocalFile();
     if (!localFile.isEmpty()) {
         QDir dir(localFile);
-#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN)
+#if defined(Q_OS_WIN)
         if (dir.isRoot())
             dir.setPath("");
         else
diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro
index e7095956b2..36244a1d71 100644
--- a/src/imports/gestures/gestures.pro
+++ b/src/imports/gestures/gestures.pro
@@ -13,14 +13,4 @@ target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 qmldir.files += $$PWD/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
-symbian:{
-    TARGET.UID3 = 0x2002131F
-    
-    isEmpty(DESTDIR):importFiles.files = qmlgesturesplugin$${QT_LIBINFIX}.dll qmldir
-    else:importFiles.files = $$DESTDIR/qmlgesturesplugin$${QT_LIBINFIX}.dll qmldir
-    importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
-    
-    DEPLOYMENT = importFiles
-}
-
 INSTALLS += target qmldir
diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro
index 74dab8dcf3..3c523aca4a 100644
--- a/src/imports/particles/particles.pro
+++ b/src/imports/particles/particles.pro
@@ -20,14 +20,4 @@ target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 qmldir.files += $$PWD/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
-symbian:{
-    TARGET.UID3 = 0x2002131E
-    
-    isEmpty(DESTDIR):importFiles.files = qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir
-    else:importFiles.files = $$DESTDIR/qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir
-    importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
-    
-    DEPLOYMENT = importFiles
-}
-
 INSTALLS += target qmldir
diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri
index 5807425e3c..110d145e94 100644
--- a/src/imports/qimportbase.pri
+++ b/src/imports/qimportbase.pri
@@ -1,6 +1,5 @@
 load(qt_module)
 
-symbian:load(qt_plugin)
 TEMPLATE = lib
 CONFIG += qt plugin
 
@@ -30,9 +29,3 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 load(qt_targets)
 
 wince*:LIBS += $$QMAKE_LIBS_GUI
-
-symbian: {
-    TARGET.EPOCALLOWDLLDATA=1
-    TARGET.CAPABILITY = All -Tcb
-    load(armcc_warnings)
-}
diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro
index da072d34b1..dbe45fb6fa 100644
--- a/src/imports/testlib/testlib.pro
+++ b/src/imports/testlib/testlib.pro
@@ -2,25 +2,8 @@ TARGET  = qmltestplugin
 TARGETPATH = QtTest
 include(../qimportbase.pri)
 
-
 CONFIG += qt plugin
 
-symbian {
-    CONFIG += epocallowdlldata
-    contains(QT_EDITION, OpenSource) {
-        TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData
-    } else {
-        TARGET.CAPABILITY = All -Tcb
-    }
-
-    isEmpty(DESTDIR):importFiles.files = qmltestplugin$${QT_LIBINFIX}.dll qmldir
-    else:importFiles.files = $$DESTDIR/qmltestplugin$${QT_LIBINFIX}.dll qmldir
-    importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
-
-    DEPLOYMENT = importFiles
-
-}
-
 QT += declarative qmltest qmltest-private v8-private declarative-private core-private testlib
 
 SOURCES += main.cpp
-- 
cgit v1.2.3