diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2012-09-14 15:33:20 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-18 08:46:36 +0200 |
commit | 5120eec7fc741921318a5538fe15fbcb6bc73f7c (patch) | |
tree | ba45750be59a10c1d69521512d9372fc88207d83 /src | |
parent | 5f7494513e35c92f802ff9fdca4baa6ad2246003 (diff) |
Remove Symbian platform
Change-Id: Iad770614f7c1c890febeee662d0ce9370dcb17e3
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativemousearea.cpp | 5 | ||||
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit_p_p.h | 5 | ||||
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput_p_p.h | 6 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 49 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativetypeloader.cpp | 4 | ||||
-rw-r--r-- | src/declarative/qml/qperformancetimer.cpp | 28 | ||||
-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 | ||||
-rw-r--r-- | src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro | 2 | ||||
-rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro | 2 | ||||
-rw-r--r-- | src/plugins/qpluginbase.pri | 26 |
16 files changed, 5 insertions, 172 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp index 96f8a82b..30c91246 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp +++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp @@ -655,10 +655,7 @@ void QDeclarativeMouseArea::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) void QDeclarativeMouseArea::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { bool acceptsContextMenuButton; -#if defined(Q_OS_SYMBIAN) - // In Symbian a Long Tap on the screen will trigger. See QSymbianControl::HandleLongTapEventL(). - acceptsContextMenuButton = acceptedButtons() & Qt::LeftButton; -#elif defined(Q_WS_WINCE) +#if defined(Q_WS_WINCE) // ### WinCE can trigger context menu event with a gesture in the left button or a // click with the right button. Since we have no way here to differentiate them when // event happens, accepting either of the them will block the event. diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h index f73413b6..abc382cf 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h @@ -76,11 +76,6 @@ public: mouseSelectionMode(QDeclarativeTextEdit::SelectCharacters), selectByMouse(false), canPaste(false), yoff(0) { -#ifdef Q_OS_SYMBIAN - if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_1) { - showInputPanelOnFocus = false; - } -#endif } void init(); diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h index f91ed5af..375f4dcd 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h @@ -79,12 +79,6 @@ public: autoScroll(true), selectByMouse(false), canPaste(false), hAlignImplicit(true), selectPressed(false) { -#ifdef Q_OS_SYMBIAN - if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_1) { - showInputPanelOnFocus = false; - } -#endif - } ~QDeclarativeTextInputPrivate() diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index c4324207..9856695f 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -52,10 +52,6 @@ #include <private/qdeclarativetypenamecache_p.h> #include <private/qdeclarativeengine_p.h> -#ifdef Q_OS_SYMBIAN -#include "private/qcore_symbian_p.h" -#endif - QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE) @@ -377,13 +373,6 @@ bool QDeclarativeImportsPrivate::importExtension(const QString &absoluteFilePath foreach (const QDeclarativeDirParser::Plugin &plugin, qmldirParser->plugins()) { QString resolvedFilePath = database->resolvePlugin(dir, plugin.path, plugin.name); -#if defined(QT_LIBINFIX) && defined(Q_OS_SYMBIAN) - if (resolvedFilePath.isEmpty()) { - // In case of libinfixed build, attempt to load libinfixed version, too. - QString infixedPluginName = plugin.name + QLatin1String(QT_LIBINFIX); - resolvedFilePath = database->resolvePlugin(dir, plugin.path, infixedPluginName); - } -#endif if (!resolvedFilePath.isEmpty()) { if (!database->importPlugin(resolvedFilePath, uri, errorString)) { if (errorString) @@ -721,42 +710,12 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath) + QString::fromLatin1("/QtQuick1"); -#if defined(Q_OS_SYMBIAN) - // Append imports path for all available drives in Symbian - if (installImportsPath.at(1) != QChar(QLatin1Char(':'))) { - QString tempPath = installImportsPath; - if (tempPath.at(tempPath.length() - 1) != QDir::separator()) { - tempPath += QDir::separator(); - } - RFs& fs = qt_s60GetRFs(); - TPtrC tempPathPtr(reinterpret_cast<const TText*> (tempPath.constData())); - // Symbian searches should start from Y:. Fix start drive otherwise TFindFile starts from the session drive - _LIT(KStartDir, "Y:"); - TFileName dirPath(KStartDir); - dirPath.Append(tempPathPtr); - TFindFile finder(fs); - TInt err = finder.FindByDir(tempPathPtr, dirPath); - while (err == KErrNone) { - QString foundDir(reinterpret_cast<const QChar *>(finder.File().Ptr()), - finder.File().Length()); - foundDir = QDir(foundDir).canonicalPath(); - addImportPath(foundDir); - err = finder.Find(); - } - // TFindFile found the directories in the order we want, but addImportPath reverses it. - // Reverse the order again to get it right. - QAlgorithmsPrivate::qReverse(fileImportPath.begin(), fileImportPath.end()); - } else { - addImportPath(installImportsPath); - } -#else addImportPath(installImportsPath); -#endif // env import paths QByteArray envImportPath = qgetenv("QML_IMPORT_PATH"); if (!envImportPath.isEmpty()) { -#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN) QLatin1Char pathSep(';'); #else QLatin1Char pathSep(':'); @@ -869,7 +828,6 @@ QString QDeclarativeImportDatabase::resolvePlugin(const QDir &qmldirPath, const \row \li AIX \li \c .a \row \li HP-UX \li \c .sl, \c .so (HP-UXi) \row \li Mac OS X \li \c .dylib, \c .bundle, \c .so - \row \li Symbian \li \c .dll \endtable Version number on unix are ignored. @@ -884,11 +842,6 @@ QString QDeclarativeImportDatabase::resolvePlugin(const QDir &qmldirPath, const << QLatin1String("d.dll") // try a qmake-style debug build first # endif << QLatin1String(".dll")); -#elif defined(Q_OS_SYMBIAN) - return resolvePlugin(qmldirPath, qmldirPluginPath, baseName, - QStringList() - << QLatin1String(".dll") - << QLatin1String(".qtplugin")); #else # if defined(Q_OS_DARWIN) diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp index 1c624224..c3b2c5b5 100644 --- a/src/declarative/qml/qdeclarativetypeloader.cpp +++ b/src/declarative/qml/qdeclarativetypeloader.cpp @@ -71,7 +71,7 @@ static QSet<QString> *qmlFilesInDirectory(const QString &path) if (fileName == QLatin1String("qmldir") || fileName.endsWith(QLatin1String(".qml")) || fileName.endsWith(QLatin1String(".js"))) { -#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined(Q_OS_DARWIN) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined(Q_OS_DARWIN) fileName = fileName.toLower(); #endif files->insert(fileName); @@ -767,7 +767,7 @@ QString QDeclarativeTypeLoader::absoluteFilePath(const QString &path) QFileInfo fileInfo(path); return fileInfo.isFile() ? fileInfo.absoluteFilePath() : QString(); } -#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined(Q_OS_DARWIN) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined(Q_OS_DARWIN) QString lowPath(path.toLower()); #else QString lowPath(path); diff --git a/src/declarative/qml/qperformancetimer.cpp b/src/declarative/qml/qperformancetimer.cpp index c7c96498..70f0d004 100644 --- a/src/declarative/qml/qperformancetimer.cpp +++ b/src/declarative/qml/qperformancetimer.cpp @@ -45,11 +45,6 @@ #include <sys/time.h> #include <unistd.h> #include <mach/mach_time.h> -#elif defined(Q_OS_SYMBIAN) -#include <e32std.h> -#include <sys/time.h> -#include <hal.h> -#include <hal_data.h> #elif defined(Q_OS_UNIX) #include <sys/time.h> #include <time.h> @@ -85,29 +80,6 @@ qint64 QPerformanceTimer::elapsed() const return absoluteToNSecs(cpu_time - t1); } -////////////////////////////// Symbian ////////////////////////////// -#elif defined(Q_OS_SYMBIAN) - -static qint64 getTimeFromTick(quint64 elapsed) -{ - static TInt freq = 0; - if (!freq) - HAL::Get(HALData::EFastCounterFrequency, freq); - - return (elapsed * 1000000000) / freq; -} - -void QPerformanceTimer::start() -{ - t1 = User::FastCounter(); -} - -qint64 QPerformanceTimer::elapsed() const -{ - return getTimeFromTick(User::FastCounter() - t1); -} - - ////////////////////////////// Unix ////////////////////////////// #elif defined(Q_OS_UNIX) 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 diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index 1bf986ce..9e62390e 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -48,5 +48,3 @@ OTHER_FILES += qtquick1plugin.json target.path += $$[QT_INSTALL_PLUGINS]/qmltooling INSTALLS += target - -symbian:TARGET.UID3=0x20031E90 diff --git a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro index ea52c063..a479cf93 100644 --- a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro +++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro @@ -15,5 +15,3 @@ OTHER_FILES += qtcpserverconnection.json target.path += $$[QT_INSTALL_PLUGINS]/qmltooling INSTALLS += target - -symbian:TARGET.UID3=0x20031E90 diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri index bcf473f1..51fd2c3b 100644 --- a/src/plugins/qpluginbase.pri +++ b/src/plugins/qpluginbase.pri @@ -13,29 +13,3 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols include(../qt_targets.pri) wince*:LIBS += $$QMAKE_LIBS_GUI - -symbian: { - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = All -Tcb - TARGET = $${TARGET}$${QT_LIBINFIX} - load(armcc_warnings) - - # Make partial upgrade SIS file for Qt plugin dll's - # Partial upgrade SIS file - vendorinfo = \ - "; Localised Vendor name" \ - "%{\"Nokia\"}" \ - " " \ - "; Unique Vendor name" \ - ":\"Nokia, Qt\"" \ - " " - isEmpty(QT_LIBINFIX): PARTIAL_UPGRADE_UID = 0x2001E61C - else: PARTIAL_UPGRADE_UID = 0xE001E61C - - pu_header = "; Partial upgrade package for testing $${TARGET} changes without reinstalling everything" \ - "$${LITERAL_HASH}{\"$${TARGET}\"}, ($$PARTIAL_UPGRADE_UID), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU" - partial_upgrade.pkg_prerules = pu_header vendorinfo - partial_upgrade.files = $$QMAKE_LIBDIR_QT/$${TARGET}.dll - partial_upgrade.path = c:/sys/bin - DEPLOYMENT += partial_upgrade -} |