From ae23d50576ac076aeb22a3d56abdb5e2c1d9b327 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 22 Aug 2012 13:27:25 +0200 Subject: Removal of Symbian support Qt Creator's support for Symbian was at its peak in version 2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6. It is most likely rotten. Let's remove it! Also, the Symbian support code was spread throughout the whole Qt Creator code base. The plugin interfaces evolved in the meantime and target platforms like Android or QNX have 99% of their code in separate plugins. In case anyone wants to revive Symbian support in Qt Creator, please create a plugin for it. Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be Reviewed-by: Alessandro Portale --- src/libs/3rdparty/cplusplus/Control.cpp | 11 ---- src/libs/libs.pro | 1 - src/libs/qmldebug/qmldebug.pri | 2 - src/libs/qmldebug/qmldebug.pro | 1 - src/libs/qmldebug/qmldebug.qbs | 2 - src/libs/qmldebug/qmldebugclient.cpp | 37 +----------- src/libs/qmldebug/qmldebugclient.h | 1 - .../styleitem/qdeclarativefolderlistmodel.cpp | 7 +-- src/libs/symbianutils/symbianutils.pri | 2 - src/libs/symbianutils/symbianutils.pro | 5 -- src/libs/symbianutils/symbianutils.qbs | 69 ---------------------- src/libs/utils/fileinprojectfinder.cpp | 1 - 12 files changed, 2 insertions(+), 137 deletions(-) delete mode 100644 src/libs/symbianutils/symbianutils.pri delete mode 100644 src/libs/symbianutils/symbianutils.pro delete mode 100644 src/libs/symbianutils/symbianutils.qbs (limited to 'src/libs') diff --git a/src/libs/3rdparty/cplusplus/Control.cpp b/src/libs/3rdparty/cplusplus/Control.cpp index 6864b8aaa41..96e744a6b22 100644 --- a/src/libs/3rdparty/cplusplus/Control.cpp +++ b/src/libs/3rdparty/cplusplus/Control.cpp @@ -173,16 +173,6 @@ public: } // end of anonymous namespace -#ifdef Q_OS_SYMBIAN -//Symbian compiler has some difficulties to understand the templates. -static void delete_array_entries(std::vector vt) -{ - std::vector::iterator it; - for (it = vt.begin(); it != vt.end(); ++it) { - delete *it; - } -} -#else template static void delete_array_entries(_Iterator first, _Iterator last) { @@ -193,7 +183,6 @@ static void delete_array_entries(_Iterator first, _Iterator last) template static void delete_array_entries(const _Array &a) { delete_array_entries(a.begin(), a.end()); } -#endif class Control::Data { diff --git a/src/libs/libs.pro b/src/libs/libs.pro index b8a7e4e7427..5eaf4715852 100644 --- a/src/libs/libs.pro +++ b/src/libs/libs.pro @@ -9,7 +9,6 @@ SUBDIRS = \ utils \ utils/process_stub.pro \ languageutils \ - symbianutils \ cplusplus \ qmljs \ qmldebug \ diff --git a/src/libs/qmldebug/qmldebug.pri b/src/libs/qmldebug/qmldebug.pri index d953e5e4c7d..c2b270a3566 100644 --- a/src/libs/qmldebug/qmldebug.pri +++ b/src/libs/qmldebug/qmldebug.pri @@ -1,3 +1 @@ -include(../symbianutils/symbianutils.pri) - LIBS *= -l$$qtLibraryName(QmlDebug) diff --git a/src/libs/qmldebug/qmldebug.pro b/src/libs/qmldebug/qmldebug.pro index 5356482713f..26a1a408566 100644 --- a/src/libs/qmldebug/qmldebug.pro +++ b/src/libs/qmldebug/qmldebug.pro @@ -3,7 +3,6 @@ TARGET = QmlDebug QT += network include(../../qtcreatorlibrary.pri) -include(../symbianutils/symbianutils.pri) include(qmldebug-lib.pri) OTHER_FILES += \ diff --git a/src/libs/qmldebug/qmldebug.qbs b/src/libs/qmldebug/qmldebug.qbs index d3ee4bfa5ef..45fb5ecfa9a 100644 --- a/src/libs/qmldebug/qmldebug.qbs +++ b/src/libs/qmldebug/qmldebug.qbs @@ -14,7 +14,6 @@ QtcLibrary { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["gui", "network"] } - Depends { name: "symbianutils" } files: [ "baseenginedebugclient.cpp", @@ -48,7 +47,6 @@ QtcLibrary { ProductModule { Depends { name: "cpp" } - Depends { name: "symbianutils" } cpp.includePaths: ["."] } } diff --git a/src/libs/qmldebug/qmldebugclient.cpp b/src/libs/qmldebug/qmldebugclient.cpp index bbe0fd9777f..7f168eb8fac 100644 --- a/src/libs/qmldebug/qmldebugclient.cpp +++ b/src/libs/qmldebug/qmldebugclient.cpp @@ -34,7 +34,6 @@ #include #include #include -#include namespace QmlDebug { @@ -60,7 +59,7 @@ public: QmlDebugConnectionPrivate(QmlDebugConnection *c); QmlDebugConnection *q; QPacketProtocol *protocol; - QIODevice *device; // Currently either a QTcpSocket or a SymbianUtils::OstChannel + QIODevice *device; // Currently a QTcpSocket bool gotHello; QHash serverPlugins; @@ -295,18 +294,6 @@ QAbstractSocket::SocketState QmlDebugConnection::state() const if (socket) return socket->state(); - SymbianUtils::OstChannel *ost = qobject_cast(d->device); - if (ost) { - //TODO we need some handshaking here - /* - if (ost->hasReceivedData()) - return QAbstractSocket::ConnectedState; - else if (ost->isOpen()) - return QAbstractSocket::ConnectingState; - */ - if (ost->isOpen()) return QAbstractSocket::ConnectedState; - } - return QAbstractSocket::UnconnectedState; } @@ -317,12 +304,6 @@ void QmlDebugConnection::flush() socket->flush(); return; } - - SymbianUtils::OstChannel *ost = qobject_cast(d->device); - if (ost) { - ost->flush(); - return; - } } void QmlDebugConnection::connectToHost(const QString &hostName, quint16 port) @@ -339,22 +320,6 @@ void QmlDebugConnection::connectToHost(const QString &hostName, quint16 port) QIODevice::open(ReadWrite | Unbuffered); } -void QmlDebugConnection::connectToOst(const QString &port) -{ - SymbianUtils::OstChannel *ost = SymbianUtils::SymbianDeviceManager::instance()->getOstChannel(port, KQmlOstProtocolId); - if (ost) { - ost->setParent(d); - d->device = ost; - d->connectDeviceSignals(); - d->gotHello = false; - QIODevice::open(ReadWrite | Unbuffered); - emit stateChanged(QAbstractSocket::ConnectedState); - emit connected(); - } else { - emit error(QAbstractSocket::HostNotFoundError); - } -} - void QmlDebugConnectionPrivate::connectDeviceSignals() { connect(device, SIGNAL(bytesWritten(qint64)), q, SIGNAL(bytesWritten(qint64))); diff --git a/src/libs/qmldebug/qmldebugclient.h b/src/libs/qmldebug/qmldebugclient.h index 156b53394f7..743dbba3bfd 100644 --- a/src/libs/qmldebug/qmldebugclient.h +++ b/src/libs/qmldebug/qmldebugclient.h @@ -45,7 +45,6 @@ public: ~QmlDebugConnection(); void connectToHost(const QString &hostName, quint16 port); - void connectToOst(const QString &port); qint64 bytesAvailable() const; bool isConnected() const; diff --git a/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp index 494e06d1c36..58908f699de 100644 --- a/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp +++ b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp @@ -233,12 +233,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 (dir.isRoot()) - dir.setPath(""); - else -#endif - dir.cdUp(); + dir.cdUp(); localFile = dir.path(); } else { int pos = d->folder.path().lastIndexOf(QLatin1Char('/')); diff --git a/src/libs/symbianutils/symbianutils.pri b/src/libs/symbianutils/symbianutils.pri deleted file mode 100644 index e6b59799fde..00000000000 --- a/src/libs/symbianutils/symbianutils.pri +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDEPATH *= $$PWD/../../shared/symbianutils $$PWD/../../shared/json -LIBS *= -l$$qtLibraryName(symbianutils) diff --git a/src/libs/symbianutils/symbianutils.pro b/src/libs/symbianutils/symbianutils.pro deleted file mode 100644 index a9ab5d5c0f8..00000000000 --- a/src/libs/symbianutils/symbianutils.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = lib -TARGET = symbianutils -DEFINES += SYMBIANUTILS_BUILD_LIB JSON_BUILD_LIB -include(../../qtcreatorlibrary.pri) -include(../../shared/symbianutils/symbianutils.pri) diff --git a/src/libs/symbianutils/symbianutils.qbs b/src/libs/symbianutils/symbianutils.qbs deleted file mode 100644 index be98849bd81..00000000000 --- a/src/libs/symbianutils/symbianutils.qbs +++ /dev/null @@ -1,69 +0,0 @@ -import qbs.base 1.0 -import "../QtcLibrary.qbs" as QtcLibrary - -QtcLibrary { - name: "symbianutils" - - cpp.includePaths: [ - ".", - "..", - "../../shared/symbianutils", - "../../shared/json" - ] - cpp.defines: [ - "SYMBIANUTILS_BUILD_LIB", - "JSON_BUILD_LIB", - "JSON_INCLUDE_PRI", - "JSON_BUILD_LIB", - "HAS_SERIALPORT" - ] - cpp.optimization: "fast" - - Depends { name: "cpp" } - Depends { name: "Qt.network" } - Depends { name: "Utils" } - - Group { - condition: qbs.targetOS == "linux" || qbs.targetOS == "mac" - files: [ - "../../shared/symbianutils/virtualserialdevice_posix.cpp" - ] - } - - Group { - condition: qbs.targetOS == "windows" - files: [ - "../../shared/symbianutils/virtualserialdevice_win.cpp" - ] - } - - files: [ - "../../shared/symbianutils/callback.h", - "../../shared/symbianutils/codadevice.cpp", - "../../shared/symbianutils/codadevice.h", - "../../shared/symbianutils/codamessage.cpp", - "../../shared/symbianutils/codamessage.h", - "../../shared/symbianutils/codautils.cpp", - "../../shared/symbianutils/codautils.h", - "../../shared/symbianutils/codautils_p.h", - "../../shared/symbianutils/symbiandevicemanager.cpp", - "../../shared/symbianutils/symbiandevicemanager.h", - "../../shared/symbianutils/symbianutils_global.h", - "../../shared/symbianutils/virtualserialdevice.cpp", - "../../shared/symbianutils/virtualserialdevice.h", - "../../shared/json/json_global.h", - "../../shared/json/json.h", - "../../shared/json/json.cpp" - ] - - ProductModule { - Depends { name: "cpp" } - cpp.includePaths: [ - "../../shared/symbianutils", - "../../shared/json", - "." - ] - cpp.defines: "JSON_INCLUDE_PRI" - } -} - diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp index 7e699365421..703f5e74660 100644 --- a/src/libs/utils/fileinprojectfinder.cpp +++ b/src/libs/utils/fileinprojectfinder.cpp @@ -50,7 +50,6 @@ namespace Utils { E.g. following file paths: \list \i C:/app-build-desktop/qml/app/main.qml (shadow build directory) - \i C:/Private/e3026d63/qml/app/main.qml (Application data folder on Symbian device) \i /Users/x/app-build-desktop/App.app/Contents/Resources/qml/App/main.qml (folder on Mac OS X) \endlist -- cgit v1.2.3