diff options
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/folderlistmodel/folderlistmodel.pro | 10 | ||||
-rw-r--r-- | src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp | 2 | ||||
-rw-r--r-- | src/imports/gestures/gestures.pro | 10 | ||||
-rw-r--r-- | src/imports/particles/particles.pro | 10 | ||||
-rw-r--r-- | src/imports/qimportbase.pri | 6 | ||||
-rw-r--r-- | src/imports/shaders/shadereffectitem.cpp | 4 | ||||
-rw-r--r-- | src/imports/shaders/shaders.pro | 8 |
7 files changed, 1 insertions, 49 deletions
diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index 6b9bf1d6..526417ed 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -15,14 +15,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 17adc943..805f466f 100644 --- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp @@ -245,7 +245,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 3b9a1d5b..9bc82bf5 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -15,14 +15,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 f249a069..b4ce049d 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -19,14 +19,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 9329d44b..81c737af 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/qimportbase.pri @@ -1,4 +1,3 @@ -symbian:include(../plugins/qpluginbase.pri) TEMPLATE = lib CONFIG += qt plugin @@ -29,8 +28,3 @@ include(../qt_targets.pri) wince*:LIBS += $$QMAKE_LIBS_GUI -symbian: { - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = All -Tcb - load(armcc_warnings) -} diff --git a/src/imports/shaders/shadereffectitem.cpp b/src/imports/shaders/shadereffectitem.cpp index 10dee401..c9f760a1 100644 --- a/src/imports/shaders/shadereffectitem.cpp +++ b/src/imports/shaders/shadereffectitem.cpp @@ -200,10 +200,6 @@ Rectangle { */ -#ifdef Q_OS_SYMBIAN -#define OBSERVE_GL_CONTEXT_LOSS 1 -#endif - ShaderEffectItem::ShaderEffectItem(QDeclarativeItem *parent) : QDeclarativeItem(parent) , m_program(0) diff --git a/src/imports/shaders/shaders.pro b/src/imports/shaders/shaders.pro index 5fe70d6c..ae9cb8b1 100644 --- a/src/imports/shaders/shaders.pro +++ b/src/imports/shaders/shaders.pro @@ -29,12 +29,4 @@ target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH -symbian:{ - TARGET.UID3 = 0x20034907 - isEmpty(DESTDIR):importFiles.sources = qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir - else:importFiles.sources = $$DESTDIR/qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir - importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH - DEPLOYMENT += importFiles -} - INSTALLS += target qmldir |