[voicecall] Remove Qt 4 support.

Not needed anymore.
sailfishos · Sep 27, 2013 · 449d9d7 · 449d9d7
1 parent 8c08990
commit 449d9d7
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 200 deletions.
diff --git a/plugins/declarative/src/src.pro b/plugins/declarative/src/src.pro
@@ -1,12 +1,9 @@
 CONFIG += no_libvoicecall no_plugininstall
 include(../../plugin.pri)
-QT = core dbus
-equals(QT_MAJOR_VERSION, 4): QT += declarative
-equals(QT_MAJOR_VERSION, 5): QT += qml
+QT = core dbus qml
 
 TARGET = voicecall
-equals(QT_MAJOR_VERSION, 4): uri = stage.rubyx.voicecall
-equals(QT_MAJOR_VERSION, 5): uri = org.nemomobile.voicecall
+uri = org.nemomobile.voicecall
 
 #DEFINES += WANT_TRACE
 
@@ -35,8 +32,7 @@ OTHER_FILES += qmldir
 }
 
 qmldir.files = qmldir
-equals(QT_MAJOR_VERSION, 4): installPath = $$[QT_INSTALL_IMPORTS]/$$replace(uri, \\., /)
-equals(QT_MAJOR_VERSION, 5): installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
 qmldir.path = $$installPath
 target.path = $$installPath
 INSTALLS += target qmldir
diff --git a/plugins/declarative/src/voicecallmodel.cpp b/plugins/declarative/src/voicecallmodel.cpp
@@ -74,10 +74,6 @@ VoiceCallModel::VoiceCallModel(VoiceCallManager *manager)
     d_ptr->headerData.insert(ROLE_IS_MULTIPARTY, "isMultiparty");
     d_ptr->headerData.insert(ROLE_INSTANCE, "instance");
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    setRoleNames(d_ptr->headerData);
-#endif
-
     // Need to listen for signal on the manager, because it handles connectivity to VCM.
     QObject::connect(d->manager, SIGNAL(voiceCallsChanged()), SLOT(onVoiceCallsChanged()));
 }
@@ -89,13 +85,11 @@ VoiceCallModel::~VoiceCallModel()
     delete d;
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 QHash<int, QByteArray> VoiceCallModel::roleNames() const
 {
     Q_D(const VoiceCallModel);
     return d->headerData;
 }
-#endif
 
 int VoiceCallModel::count() const
 {

diff --git a/plugins/declarative/src/voicecallmodel.h b/plugins/declarative/src/voicecallmodel.h
@@ -74,10 +74,8 @@ public Q_SLOTS:
     VoiceCallHandler* instance(int instance) const;
     VoiceCallHandler* instance(const QString &handlerId) const;
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 protected:
     QHash<int, QByteArray> roleNames() const;
-#endif
 
 protected Q_SLOTS:
     void onVoiceCallsChanged();

diff --git a/plugins/declarative/src/voicecallplugin.cpp b/plugins/declarative/src/voicecallplugin.cpp
@@ -6,11 +6,7 @@
 #include "voicecallmodel.h"
 #include "voicecallprovidermodel.h"
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-# include <QtQml>
-#else
-# include <QtDeclarative>
-#endif
+#include <QtQml>
 
 void VoiceCallPlugin::registerTypes(const char *uri)
 {
@@ -21,6 +17,3 @@ void VoiceCallPlugin::registerTypes(const char *uri)
     qmlRegisterType<VoiceCallManager>(uri, 1, 0, "VoiceCallManager");
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(voicecall, VoiceCallPlugin)
-#endif
diff --git a/plugins/declarative/src/voicecallplugin.h b/plugins/declarative/src/voicecallplugin.h
@@ -3,20 +3,12 @@
 
 #include <QtGlobal>
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
- #include <QtQml/QQmlExtensionPlugin>
- #define QDeclarativeExtensionPlugin QQmlExtensionPlugin
-#else
-# include <QtDeclarative/QDeclarativeExtensionPlugin>
-#endif
+#include <QtQml/QQmlExtensionPlugin>
 
-class VoiceCallPlugin : public QDeclarativeExtensionPlugin
+class VoiceCallPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "org.nemomobile.voicecall")
-#endif
 
 public:
     void registerTypes(const char *uri);

diff --git a/plugins/declarative/src/voicecallprovidermodel.cpp b/plugins/declarative/src/voicecallprovidermodel.cpp
@@ -80,10 +80,6 @@ VoiceCallProviderModel::VoiceCallProviderModel(VoiceCallManager *manager)
     d_ptr->headerData.insert(ROLE_TYPE, "type");
     d_ptr->headerData.insert(ROLE_LABEL, "name");
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    setRoleNames(d_ptr->headerData);
-#endif
-
     QObject::connect(d->manager, SIGNAL(providersChanged()), SLOT(onProvidersChanged()));
 
     this->onProvidersChanged();
@@ -96,13 +92,11 @@ VoiceCallProviderModel::~VoiceCallProviderModel()
     delete d;
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 QHash<int, QByteArray> VoiceCallProviderModel::roleNames() const
 {
     Q_D(const VoiceCallProviderModel);
     return d->headerData;
 }
-#endif
 
 int VoiceCallProviderModel::count() const
 {

diff --git a/plugins/declarative/src/voicecallprovidermodel.h b/plugins/declarative/src/voicecallprovidermodel.h
@@ -68,10 +68,8 @@ public Q_SLOTS:
     QString type(int index) const;
     QString label(int index) const;
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 protected:
     QHash<int, QByteArray> roleNames() const;
-#endif
 
 protected Q_SLOTS:
     void onProvidersChanged();

diff --git a/plugins/plugins.pro b/plugins/plugins.pro
@@ -1,9 +1,2 @@
 TEMPLATE = subdirs
-
-# Qt 4 doesn't have the voicecall daemon, so the plugins for it aren't required
-# either. We do build the declarative voicecall plugin so that a Qt 4 UI can
-# interact with the daemon though.
-#
-# Qt 5's voiceall needs all plugins.
-equals(QT_MAJOR_VERSION, 4): SUBDIRS = declarative
-equals(QT_MAJOR_VERSION, 5): SUBDIRS = declarative providers ngf playback-manager
+SUBDIRS = declarative providers ngf playback-manager
diff --git a/rpm/voicecall.changes b/rpm/voicecall.changes
diff --git a/rpm/voicecall.spec b/rpm/voicecall.spec
diff --git a/rpm/voicecall.yaml b/rpm/voicecall.yaml
diff --git a/voicecall.pro b/voicecall.pro
@@ -1,15 +1,7 @@
 TEMPLATE = subdirs
+SUBDIRS += src lib plugins
 
-# daemon is only built for Qt 5
-equals(QT_MAJOR_VERSION, 5) {
-    SUBDIRS += src lib
-
-    # Qt 4 only builds the declarative plugin which does not use libvoicecall.
-    plugins.depends = lib
-}
-
-SUBDIRS += plugins
-
+plugins.depends = lib
 src.depends = lib
 
 OTHER_FILES = LICENSE makedist rpm/voicecall-qt5.spec