Commit 3b3178b9 authored by Aaron McCarthy's avatar Aaron McCarthy

[connectionagent] Remove unused Qt 4/5 ifdefs

Support for Qt 4 was removed, remove left over ifdefs.
parent 8c042c68
......@@ -18,7 +18,6 @@
#include "connectiond_adaptor.h"
#include "wakeupwatcher.h"
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <connman-qt5/useragent.h>
#include <connman-qt5/networkmanager.h>
#include <connman-qt5/networktechnology.h>
......@@ -29,17 +28,6 @@
#include <qofono-qt5/qofononetworkregistration.h>
#include <qofono-qt5/qofonomanager.h>
#else
#include <connman-qt/useragent.h>
#include <connman-qt/networkmanager.h>
#include <connman-qt/networktechnology.h>
#include <connman-qt/networkservice.h>
#include <connman-qt/sessionagent.h>
#include <qofono-qt/qofonoconnectioncontext.h>
#include <qofono-qt/qofonoconnectionmanager.h>
#include <qofono-qt/qofonomanager.h>
#endif
#include <QtDBus/QDBusConnection>
#include <QObject>
......
......@@ -57,7 +57,3 @@ void ConnectionagentpluginPlugin::registerTypes(const char *uri)
// @uri com.jolla.connection
qmlRegisterType<ConnectionAgentPlugin>(uri, 1, 0, "ConnectionAgent");
}
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(Connectionagentplugin, ConnectionagentpluginPlugin)
#endif
......@@ -18,25 +18,15 @@
#define CONNECTIONAGENTPLUGIN_PLUGIN_H
#include <QtPlugin>
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
# include <QtQml>
# include <QQmlEngine>
# include <QQmlExtensionPlugin>
# define QDeclarativeEngine QQmlEngine
# define QDeclarativeExtensionPlugin QQmlExtensionPlugin
#else
# include <QtDeclarative>
# include <QDeclarativeEngine>
# include <QDeclarativeExtensionPlugin>
#endif
#include <QtQml>
#include <QQmlEngine>
#include <QQmlExtensionPlugin>
class ConnectionagentpluginPlugin : public QDeclarativeExtensionPlugin
class ConnectionagentpluginPlugin : public QQmlExtensionPlugin
{
Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
#endif
public:
void registerTypes(const char *uri);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment