diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-12-19 11:53:05 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-12-19 11:57:48 +0200 |
commit | 44d7f1865af8a8b4491f2d272f9e8e16f09c741b (patch) | |
tree | ab9b7cd2d5986e9707dad18f8447be3cc469d468 | |
parent | 34ed89b61c06c4674260aa6f5f3139aa6310aee5 (diff) | |
parent | b5eea82532059738a7da751222ebef68539508f1 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
* origin/5.10:
Merge remote-tracking branch 'origin/5.9' into 5.10
Fix compilation with namespaces
Import only available modules
Update license headers
Verify that Qtdbus module is available
tests: add tests.pro for CI
Doc: Bump version to 5.9.3
Conflicts:
src/bluetoothsettings/discoverymodel.cpp
src/localesettings/localefiltermodel.cpp
src/localesettings/localemodel.cpp
src/timedatesettings/timezonefiltermodel.cpp
Change-Id: Iabf7f372c634abea2734c97d748b3e836394ddb1
65 files changed, 393 insertions, 103 deletions
diff --git a/src/bluetoothsettings/bluetoothdevice.cpp b/src/bluetoothsettings/bluetoothdevice.cpp index 0facf27..442a31c 100644 --- a/src/bluetoothsettings/bluetoothdevice.cpp +++ b/src/bluetoothsettings/bluetoothdevice.cpp @@ -30,6 +30,8 @@ #include "bluetoothdevice.h" #include "bluetoothdevice_p.h" +QT_BEGIN_NAMESPACE + BluetoothDevice::BluetoothDevice(QObject *parent) : QObject(parent) ,d_ptr(new BluetoothDevicePrivate(this)) { @@ -51,7 +53,7 @@ void BluetoothDevice::setPowered(const bool& aPowered) DiscoveryModel* BluetoothDevice::deviceModel() const { Q_D(const BluetoothDevice); - return d->m_deviceModel; + return d->deviceModel(); } bool BluetoothDevice::scanning() const @@ -89,3 +91,5 @@ bool BluetoothDevice::available() const Q_D(const BluetoothDevice); return d->available(); } + +QT_END_NAMESPACE diff --git a/src/bluetoothsettings/bluetoothdevice.h b/src/bluetoothsettings/bluetoothdevice.h index 03ea961..1c51b87 100644 --- a/src/bluetoothsettings/bluetoothdevice.h +++ b/src/bluetoothsettings/bluetoothdevice.h @@ -32,11 +32,11 @@ #include <QObject> #include "discoverymodel.h" -QT_BEGIN_NAMESPACE - QT_FORWARD_DECLARE_CLASS(DiscoveryModel) QT_FORWARD_DECLARE_CLASS(BluetoothDevicePrivate) +QT_BEGIN_NAMESPACE + class Q_DECL_EXPORT BluetoothDevice : public QObject { Q_OBJECT diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp b/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp index 48e6695..8850f14 100644 --- a/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp +++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp @@ -35,6 +35,8 @@ #include "connman_technology_interface.h" #include "connmancommon.h" +QT_BEGIN_NAMESPACE + BluetoothDevicePrivate::BluetoothDevicePrivate(BluetoothDevice *parent) : QObject(parent) ,q_ptr(parent) ,m_localDevice(Q_NULLPTR) @@ -265,3 +267,5 @@ OrgBluezDevice1Interface* BluetoothDevicePrivate::findPeerDevice(const QString & } return NULL; } + +QT_END_NAMESPACE diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.h b/src/bluetoothsettings/bluez/bluetoothdevice_p.h index c3cc3f3..0c32a2f 100644 --- a/src/bluetoothsettings/bluez/bluetoothdevice_p.h +++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.h @@ -45,10 +45,13 @@ #include <QtDBus> #include "bluetoothdevice.h" +// Automatically generated classes in global namespace class OrgBluezDevice1Interface; class OrgFreedesktopDBusObjectManagerInterface; class NetConnmanTechnologyInterface; +QT_BEGIN_NAMESPACE + class BluetoothDevicePrivate : public QObject { Q_OBJECT @@ -92,6 +95,6 @@ private: NetConnmanTechnologyInterface *m_technology; }; - +QT_END_NAMESPACE #endif // BLUETOOTHDEVICE__P_H diff --git a/src/bluetoothsettings/discoverymodel.cpp b/src/bluetoothsettings/discoverymodel.cpp index ad174c7..31cf972 100644 --- a/src/bluetoothsettings/discoverymodel.cpp +++ b/src/bluetoothsettings/discoverymodel.cpp @@ -29,6 +29,8 @@ #include <QBluetoothAddress> #include "discoverymodel.h" +QT_BEGIN_NAMESPACE + BtDeviceItem::BtDeviceItem(const QBluetoothDeviceInfo& bt, QObject *parent) : QObject(parent) ,m_name(bt.name()) @@ -264,3 +266,5 @@ void DiscoveryModel::clearDeviceList() m_items.clear(); endResetModel(); } + +QT_END_NAMESPACE diff --git a/src/displaysettings/displaysettings.cpp b/src/displaysettings/displaysettings.cpp index 128c8df..bf15884 100644 --- a/src/displaysettings/displaysettings.cpp +++ b/src/displaysettings/displaysettings.cpp @@ -29,6 +29,8 @@ #include "displaysettings.h" #include "displaysettings_p.h" +QT_BEGIN_NAMESPACE + DisplaySettings::DisplaySettings(QObject *parent) : QObject(parent) ,d_ptr(new DisplaySettingsPrivate(this)) @@ -112,3 +114,5 @@ void DisplaySettings::setPhysicalScreenSizeOverride(bool enable) Q_D(DisplaySettings); d->setPhysicalScreenSizeOverride(enable); } + +QT_END_NAMESPACE diff --git a/src/displaysettings/displaysettings_p.cpp b/src/displaysettings/displaysettings_p.cpp index c0a512d..e62fca7 100644 --- a/src/displaysettings/displaysettings_p.cpp +++ b/src/displaysettings/displaysettings_p.cpp @@ -30,6 +30,8 @@ #include <QDirIterator> #include "displaysettings_p.h" +QT_BEGIN_NAMESPACE + DisplaySettingsPrivate::DisplaySettingsPrivate(DisplaySettings *qq) :q_ptr(qq) ,m_brightness(255) @@ -272,3 +274,5 @@ void PhysicalScreenSize::setEnabled(bool enable) // Rewrite appcontroller.conf with or without the physical width/height lines. write(enable); } + +QT_END_NAMESPACE diff --git a/src/displaysettings/displaysettings_p.h b/src/displaysettings/displaysettings_p.h index 089777c..91825e8 100644 --- a/src/displaysettings/displaysettings_p.h +++ b/src/displaysettings/displaysettings_p.h @@ -43,6 +43,8 @@ #include <QTimer> #include "displaysettings.h" +QT_BEGIN_NAMESPACE + class PhysicalScreenSize : public QObject { Q_OBJECT @@ -112,4 +114,6 @@ private: PhysicalScreenSize *m_physScreenSize; }; +QT_END_NAMESPACE + #endif // DISPLAYSETTINGSPRIVATE_H diff --git a/src/doc/src/external-resources.qdoc b/src/doc/src/external-resources.qdoc index 2edf436..38e9654 100644 --- a/src/doc/src/external-resources.qdoc +++ b/src/doc/src/external-resources.qdoc @@ -1,18 +1,27 @@ /**************************************************************************** ** ** Copyright (C) 2017 The Qt Company Ltd. -** All rights reserved. -** For any questions to The Qt Company, please use the contact form at -** http://www.qt.io/contact-us +** Contact: https://www.qt.io/licensing/ ** -** This file is part of Qt for Device Creation. +** This file is part of the Device Utilities module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ ** ****************************************************************************/ /*! diff --git a/src/doc/src/qtdeviceutilities.qdoc b/src/doc/src/qtdeviceutilities.qdoc index 9e692fe..9c7c5d5 100644 --- a/src/doc/src/qtdeviceutilities.qdoc +++ b/src/doc/src/qtdeviceutilities.qdoc @@ -1,18 +1,27 @@ /**************************************************************************** ** ** Copyright (C) 2017 The Qt Company Ltd. -** All rights reserved. -** For any questions to The Qt Company, please use the contact form at -** http://www.qt.io/contact-us +** Contact: https://www.qt.io/licensing/ ** -** This file is part of Qt for Device Creation. +** This file is part of the Device Utilities module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ ** ****************************************************************************/ /*! diff --git a/src/doc/src/wifiexample.qdoc b/src/doc/src/wifiexample.qdoc index 6e28099..ce5d43c 100644 --- a/src/doc/src/wifiexample.qdoc +++ b/src/doc/src/wifiexample.qdoc @@ -1,18 +1,27 @@ /**************************************************************************** ** ** Copyright (C) 2017 The Qt Company Ltd. -** All rights reserved. -** For any questions to The Qt Company, please use the contact form at -** http://www.qt.io/contact-us +** Contact: https://www.qt.io/licensing/ ** -** This file is part of Qt for Device Creation. +** This file is part of the Device Utilities module of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ ** ****************************************************************************/ /*! diff --git a/src/imports/bluetoothsettings/plugin.cpp b/src/imports/bluetoothsettings/plugin.cpp index cd2cfcf..6c5fcf1 100644 --- a/src/imports/bluetoothsettings/plugin.cpp +++ b/src/imports/bluetoothsettings/plugin.cpp @@ -107,6 +107,9 @@ \sa requestConnect() */ + +QT_BEGIN_NAMESPACE + template <typename T> QObject *instance(QQmlEngine *engine, QJSEngine *) { T *t = new T(engine); @@ -128,4 +131,6 @@ public: } }; +QT_END_NAMESPACE + #include "plugin.moc" diff --git a/src/imports/displaysettings/plugin.cpp b/src/imports/displaysettings/plugin.cpp index 366ab0b..fd88a1a 100644 --- a/src/imports/displaysettings/plugin.cpp +++ b/src/imports/displaysettings/plugin.cpp @@ -84,6 +84,8 @@ used or not. */ +QT_BEGIN_NAMESPACE + template <typename T> QObject *instance(QQmlEngine *engine, QJSEngine *) { T *t = new T(engine); @@ -104,4 +106,6 @@ public: } }; +QT_END_NAMESPACE + #include "plugin.moc" diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 8c10510..c39e30f 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,8 +1,9 @@ TEMPLATE = subdirs -SUBDIRS += networksettings \ - localesettings \ - timedatesettings \ - localdevice \ + +SUBDIRS += localdevice \ displaysettings -qtHaveModule(bluetooth): SUBDIRS += bluetoothsettings +qtHaveModule(bluetoothsettings): SUBDIRS += bluetoothsettings +qtHaveModule(networksettings): SUBDIRS += networksettings +qtHaveModule(localesettings): SUBDIRS += localesettings +qtHaveModule(timedatesettings): SUBDIRS += timedatesettings diff --git a/src/imports/localdevice/plugin.cpp b/src/imports/localdevice/plugin.cpp index ca9fe68..785b364 100644 --- a/src/imports/localdevice/plugin.cpp +++ b/src/imports/localdevice/plugin.cpp @@ -85,6 +85,8 @@ \sa reboot() */ +QT_BEGIN_NAMESPACE + static QObject *module_api_factory(QQmlEngine *engine, QJSEngine *scriptEngine) { Q_UNUSED(engine) @@ -111,4 +113,6 @@ public: } }; +QT_END_NAMESPACE + #include "plugin.moc" diff --git a/src/imports/localesettings/plugin.cpp b/src/imports/localesettings/plugin.cpp index 60c19c1..db90003 100644 --- a/src/imports/localesettings/plugin.cpp +++ b/src/imports/localesettings/plugin.cpp @@ -148,6 +148,8 @@ from a list. */ +QT_BEGIN_NAMESPACE + template <typename T> QObject *instance(QQmlEngine *engine, QJSEngine *) { T *t = new T(engine); @@ -168,4 +170,6 @@ public: } }; +QT_END_NAMESPACE + #include "plugin.moc" diff --git a/src/imports/networksettings/plugin.cpp b/src/imports/networksettings/plugin.cpp index 431a099..419b685 100644 --- a/src/imports/networksettings/plugin.cpp +++ b/src/imports/networksettings/plugin.cpp @@ -160,6 +160,8 @@ This signal is emitted when the connection failed due to invalid user credentials. */ +QT_BEGIN_NAMESPACE + template <typename T> QObject *instance(QQmlEngine *engine, QJSEngine *) { T *t = new T(engine); @@ -184,3 +186,5 @@ void NetworksettingspluginPlugin::registerTypes(const char *uri) qmlRegisterSingletonType<QNetworkSettingsManager>(uri, 1, 0, "NetworkSettingsManager", &instance<QNetworkSettingsManager>); } + +QT_END_NAMESPACE diff --git a/src/imports/networksettings/plugin.h b/src/imports/networksettings/plugin.h index 61f148c..e5c7bc7 100644 --- a/src/imports/networksettings/plugin.h +++ b/src/imports/networksettings/plugin.h @@ -31,6 +31,8 @@ #include <QQmlExtensionPlugin> +QT_BEGIN_NAMESPACE + class NetworksettingspluginPlugin : public QQmlExtensionPlugin { Q_OBJECT @@ -40,5 +42,7 @@ public: void registerTypes(const char *uri); }; +QT_END_NAMESPACE + #endif // NETWORKSETTINGSPLUGIN_PLUGIN_H diff --git a/src/imports/timedatesettings/plugin.cpp b/src/imports/timedatesettings/plugin.cpp index 9ebe945..0ddfed4 100644 --- a/src/imports/timedatesettings/plugin.cpp +++ b/src/imports/timedatesettings/plugin.cpp @@ -138,6 +138,9 @@ {TimeManager.timeZone}, when the user selects a time zone from a list. */ + +QT_BEGIN_NAMESPACE + template <typename T> QObject *instance(QQmlEngine *engine, QJSEngine *) { T *t = new T(engine); @@ -158,4 +161,6 @@ public: } }; +QT_END_NAMESPACE + #include "plugin.moc" diff --git a/src/localdevice/qlocaldevice.cpp b/src/localdevice/qlocaldevice.cpp index d778f20..f6b2c2b 100644 --- a/src/localdevice/qlocaldevice.cpp +++ b/src/localdevice/qlocaldevice.cpp @@ -30,6 +30,8 @@ #include <unistd.h> #include <sys/reboot.h> +QT_BEGIN_NAMESPACE + QLocalDevice::QLocalDevice(QObject *parent) : QObject(parent) { @@ -64,3 +66,4 @@ void QLocalDevice::powerOff() qWarning("powerOff returned"); } +QT_END_NAMESPACE diff --git a/src/localdevice/qlocaldevice.h b/src/localdevice/qlocaldevice.h index c9918f0..4a0071a 100644 --- a/src/localdevice/qlocaldevice.h +++ b/src/localdevice/qlocaldevice.h @@ -31,6 +31,8 @@ #include <qobject.h> +QT_BEGIN_NAMESPACE + class Q_DECL_EXPORT QLocalDevice : public QObject { Q_OBJECT @@ -44,4 +46,6 @@ public Q_SLOTS: void powerOff(); }; +QT_END_NAMESPACE + #endif // QLOCALDEVICE_H diff --git a/src/localesettings/localefiltermodel.cpp b/src/localesettings/localefiltermodel.cpp index b0535f5..997a316 100644 --- a/src/localesettings/localefiltermodel.cpp +++ b/src/localesettings/localefiltermodel.cpp @@ -29,6 +29,8 @@ #include "localemodel.h" #include "localefiltermodel.h" +QT_BEGIN_NAMESPACE + LocaleFilterModel::LocaleFilterModel(QObject* parent) :QSortFilterProxyModel(parent) { @@ -89,7 +91,6 @@ QVariant LocaleFilterModel::itemFromRow(const int row) const return QVariant(); } - int LocaleFilterModel::indexForCountry(const QString &country) const { QAbstractItemModel *model = this->sourceModel(); @@ -98,3 +99,5 @@ int LocaleFilterModel::indexForCountry(const QString &country) const QModelIndex ret = mapFromSource(i); return ret.row(); } + +QT_END_NAMESPACE diff --git a/src/localesettings/localemodel.cpp b/src/localesettings/localemodel.cpp index a5249e8..6925a02 100644 --- a/src/localesettings/localemodel.cpp +++ b/src/localesettings/localemodel.cpp @@ -33,6 +33,7 @@ #include <QtConcurrent/QtConcurrentRun> #include "localemodel.h" +QT_BEGIN_NAMESPACE LocaleItem::LocaleItem(const QLocale& locale, QObject *parent) :QObject(parent) @@ -172,3 +173,5 @@ QModelIndex LocaleModel::indexForCountry(const QString &country) const } return QModelIndex(); } + +QT_END_NAMESPACE diff --git a/src/localesettings/systemlocale.cpp b/src/localesettings/systemlocale.cpp index 37f157b..e6de431 100644 --- a/src/localesettings/systemlocale.cpp +++ b/src/localesettings/systemlocale.cpp @@ -30,6 +30,8 @@ #include "systemlocale.h" #include "systemlocale_p.h" +QT_BEGIN_NAMESPACE + SystemLocale::SystemLocale(QObject *parent) :QObject(parent) ,d_ptr(new SystemLocalePrivate(this)) @@ -48,3 +50,5 @@ void SystemLocale::setLocale(const QString& aLocale) d->setLocale(aLocale); emit localeChanged(); } + +QT_END_NAMESPACE diff --git a/src/localesettings/systemlocale_p.h b/src/localesettings/systemlocale_p.h index 96af3c1..a3d1a5f 100644 --- a/src/localesettings/systemlocale_p.h +++ b/src/localesettings/systemlocale_p.h @@ -43,6 +43,8 @@ #include "systemlocale.h" #include "locale_interface.h" +QT_BEGIN_NAMESPACE + class SystemLocalePrivate { Q_DECLARE_PUBLIC(SystemLocale) @@ -88,4 +90,6 @@ private: SystemLocale *q_ptr; }; +QT_END_NAMESPACE + #endif // LOCALE_P_H diff --git a/src/networksettings/connman/connmancommon.cpp b/src/networksettings/connman/connmancommon.cpp index 572c564..887af48 100644 --- a/src/networksettings/connman/connmancommon.cpp +++ b/src/networksettings/connman/connmancommon.cpp @@ -28,6 +28,8 @@ ****************************************************************************/ #include "connmancommon.h" +QT_BEGIN_NAMESPACE + //Conversion operations for datatypes const QDBusArgument &operator>>(const QDBusArgument &argument, ConnmanMapStruct &obj) { @@ -91,3 +93,5 @@ const QString &operator>>(const QString &argument, QNetworkSettingsState &obj) } return argument; } + +QT_END_NAMESPACE diff --git a/src/networksettings/connman/connmancommon.h b/src/networksettings/connman/connmancommon.h index 8153507..442730f 100644 --- a/src/networksettings/connman/connmancommon.h +++ b/src/networksettings/connman/connmancommon.h @@ -66,9 +66,9 @@ const QString &operator>>(const QString &argument, QNetworkSettingsState &obj); typedef QList<ConnmanMapStruct> ConnmanMapStructList; +QT_END_NAMESPACE + Q_DECLARE_METATYPE( ConnmanMapStruct ) Q_DECLARE_METATYPE( ConnmanMapStructList ) -QT_END_NAMESPACE - #endif // CONNMANCOMMON_H diff --git a/src/networksettings/connman/qnetworksettingsinterface_p.cpp b/src/networksettings/connman/qnetworksettingsinterface_p.cpp index b5a8c38..5a64c15 100644 --- a/src/networksettings/connman/qnetworksettingsinterface_p.cpp +++ b/src/networksettings/connman/qnetworksettingsinterface_p.cpp @@ -31,6 +31,8 @@ #include "connman_technology_interface.h" #include "connmancommon.h" +QT_BEGIN_NAMESPACE + QNetworkSettingsInterfacePrivate::QNetworkSettingsInterfacePrivate(QNetworkSettingsInterface* parent) : QObject(parent) , m_technology(Q_NULLPTR) @@ -100,3 +102,5 @@ void QNetworkSettingsInterfacePrivate::scan() else qDebug() << "Tried to scan while not powered"; } + +QT_END_NAMESPACE diff --git a/src/networksettings/connman/qnetworksettingsinterface_p.h b/src/networksettings/connman/qnetworksettingsinterface_p.h index 37aceaf..728e64a 100644 --- a/src/networksettings/connman/qnetworksettingsinterface_p.h +++ b/src/networksettings/connman/qnetworksettingsinterface_p.h @@ -47,6 +47,8 @@ class NetConnmanTechnologyInterface; +QT_BEGIN_NAMESPACE + class QNetworkSettingsInterfacePrivate : public QObject { Q_OBJECT @@ -57,6 +59,10 @@ public: void setPowered(const bool power); void setState(QNetworkSettingsState::States aState); void scan(); + QString name() const {return m_name;} + QNetworkSettingsType::Types type() const {return m_type.type();} + QNetworkSettingsState::States state() const {return m_state.state();} + bool powered() const {return m_powered;} public slots: void updateProperty(const QString &name, const QDBusVariant &value); @@ -93,4 +99,7 @@ public: } }; + +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSINTERFACEPRIVATE_H diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index d666b10..b3373ee 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -34,6 +34,8 @@ #include "qnetworksettingsservicemodel.h" #include "qnetworksettingsuseragent.h" +QT_BEGIN_NAMESPACE + QNetworkSettingsManagerPrivate::QNetworkSettingsManagerPrivate(QNetworkSettingsManager *parent) :QObject(parent) ,q_ptr(parent) @@ -195,3 +197,5 @@ void QNetworkSettingsManagerPrivate::serviceReady() } } + +QT_END_NAMESPACE diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.h b/src/networksettings/connman/qnetworksettingsmanager_p.h index 933f69c..579d857 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.h +++ b/src/networksettings/connman/qnetworksettingsmanager_p.h @@ -46,10 +46,13 @@ #include "qnetworksettingsmanager.h" #include "qnetworksettingsinterfacemodel.h" +// Automatically generated class in global namespace class NetConnmanManagerInterface; -class QNetworkSettingsServiceModel; -class QNetworkSettingsServiceFilter; -class QNetworkSettingsService; +QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceModel) +QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceFilter) +QT_FORWARD_DECLARE_CLASS(QNetworkSettingsService) + +QT_BEGIN_NAMESPACE class QNetworkSettingsManagerPrivate : public QObject { @@ -59,7 +62,11 @@ public: explicit QNetworkSettingsManagerPrivate(QNetworkSettingsManager *parent); QNetworkSettingsManager *q_ptr; void setUserAgent(QNetworkSettingsUserAgent *agent); - QNetworkSettingsUserAgent *userAgent() {return m_agent;} + QNetworkSettingsUserAgent *userAgent() const {return m_agent;} + QNetworkSettingsInterfaceModel* interfaceModel() {return &m_interfaceModel;} + QNetworkSettingsServiceModel* serviceModel() const {return m_serviceModel;} + QNetworkSettingsServiceFilter* serviceFilter() const {return m_serviceFilter;} + public slots: void getServicesFinished(QDBusPendingCallWatcher *watcher); void getTechnologiesFinished(QDBusPendingCallWatcher *watcher); @@ -77,4 +84,6 @@ private: QNetworkSettingsUserAgent *m_agent; }; +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSMANAGERPRIVATE_H diff --git a/src/networksettings/connman/qnetworksettingsservice_p.cpp b/src/networksettings/connman/qnetworksettingsservice_p.cpp index f5876e7..f7e6ef1 100644 --- a/src/networksettings/connman/qnetworksettingsservice_p.cpp +++ b/src/networksettings/connman/qnetworksettingsservice_p.cpp @@ -31,6 +31,8 @@ #include "connmancommon.h" #include <QHostAddress> +QT_BEGIN_NAMESPACE + const QString PropertyIPv4(QStringLiteral("IPv4")); const QString PropertyQNetworkSettingsIPv4(QStringLiteral("IPv4.Configuration")); const QString PropertyIPv6(QStringLiteral("IPv6")); @@ -430,3 +432,4 @@ void QNetworkSettingsServicePrivate::setupConfiguration(const QVariantMap &prope } } +QT_END_NAMESPACE diff --git a/src/networksettings/connman/qnetworksettingsservice_p.h b/src/networksettings/connman/qnetworksettingsservice_p.h index 76b5182..2e12179 100644 --- a/src/networksettings/connman/qnetworksettingsservice_p.h +++ b/src/networksettings/connman/qnetworksettingsservice_p.h @@ -43,10 +43,14 @@ #include "qnetworksettingsservice.h" #include "qnetworksettings.h" -class QDBusPendingCallWatcher; -class QDBusVariant; +QT_FORWARD_DECLARE_CLASS(QDBusPendingCallWatcher) +QT_FORWARD_DECLARE_CLASS(QDBusVariant) + +// Automatically generated class in global namespace class NetConnmanServiceInterface; +QT_BEGIN_NAMESPACE + class QNetworkSettingsServicePrivate : public QObject { Q_OBJECT @@ -89,4 +93,6 @@ protected: bool m_placeholderState; }; +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSSERVICEPRIVATE_H diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp index ede5095..e9e8063 100644 --- a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp +++ b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp @@ -29,6 +29,8 @@ #include "qnetworksettingsuseragent_p.h" #include "connmancommon.h" +QT_BEGIN_NAMESPACE + const QString PropertyPassphrase(QStringLiteral("Passphrase")); QNetworkSettingsUserAgentPrivate::QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent *parent) @@ -101,3 +103,5 @@ void QNetworkSettingsUserAgentPrivate::setPassphrase(const QString& passphrase) m_pendingReply = false; QDBusConnection::systemBus().send(reply); } + +QT_END_NAMESPACE diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.h b/src/networksettings/connman/qnetworksettingsuseragent_p.h index 248b9ad..180eea5 100644 --- a/src/networksettings/connman/qnetworksettingsuseragent_p.h +++ b/src/networksettings/connman/qnetworksettingsuseragent_p.h @@ -51,7 +51,6 @@ template<class Key, class Value> class QMap; class QString; class QStringList; class QVariant; -QT_END_NAMESPACE const QString AgentPath(QStringLiteral("/ConnmanAgent")); @@ -63,6 +62,7 @@ class QNetworkSettingsUserAgentPrivate : public QDBusAbstractAdaptor public: QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent *parent = Q_NULLPTR); void setPassphrase(const QString &passphrase); + QString passphrase() const {return m_passphrase;} void cancel(); void release(); public Q_SLOTS: // Dbus methods @@ -77,4 +77,6 @@ private: QString m_passphrase; }; +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSUSERAGENTPRIVATE_H diff --git a/src/networksettings/qnetworksettings.cpp b/src/networksettings/qnetworksettings.cpp index fae1b7d..66a9ba2 100644 --- a/src/networksettings/qnetworksettings.cpp +++ b/src/networksettings/qnetworksettings.cpp @@ -28,6 +28,8 @@ ****************************************************************************/ #include "qnetworksettings.h" +QT_BEGIN_NAMESPACE + QNetworkSettingsState::QNetworkSettingsState(States state, QObject *parent) : QObject(parent) , m_state(state) @@ -257,3 +259,4 @@ bool QNetworkSettingsWireless::outOfRange() const { return m_isOutOfRange; } +QT_END_NAMESPACE diff --git a/src/networksettings/qnetworksettingsaddressmodel.cpp b/src/networksettings/qnetworksettingsaddressmodel.cpp index 5b72d46..d86318b 100644 --- a/src/networksettings/qnetworksettingsaddressmodel.cpp +++ b/src/networksettings/qnetworksettingsaddressmodel.cpp @@ -28,6 +28,8 @@ ****************************************************************************/ #include "qnetworksettingsaddressmodel.h" +QT_BEGIN_NAMESPACE + QNetworkSettingsAddressModel::QNetworkSettingsAddressModel(QObject *parent) :QStringListModel(parent) { @@ -74,3 +76,5 @@ void QNetworkSettingsAddressModel::resetChanges() { QStringListModel::setStringList(m_addresses); } + +QT_END_NAMESPACE diff --git a/src/networksettings/qnetworksettingsinterface.cpp b/src/networksettings/qnetworksettingsinterface.cpp index fcde01a..9fb0147 100644 --- a/src/networksettings/qnetworksettingsinterface.cpp +++ b/src/networksettings/qnetworksettingsinterface.cpp @@ -30,6 +30,8 @@ #include "qnetworksettingsinterface_p.h" #include "qnetworksettings.h" +QT_BEGIN_NAMESPACE + /*! \qmltype NetworkInterface \inqmlmodule QtDeviceUtilities.NetworkSettings @@ -59,7 +61,7 @@ QNetworkSettingsInterface::QNetworkSettingsInterface(QObject *parent) : QString QNetworkSettingsInterface::name() const { Q_D(const QNetworkSettingsInterface); - return d->m_name; + return d->name(); } /*! @@ -96,7 +98,7 @@ QString QNetworkSettingsInterface::name() const QNetworkSettingsState::States QNetworkSettingsInterface::state() { Q_D(QNetworkSettingsInterface); - return d->m_state.state(); + return d->state(); } /*! @@ -114,7 +116,7 @@ QNetworkSettingsState::States QNetworkSettingsInterface::state() QNetworkSettingsType::Types QNetworkSettingsInterface::type() { Q_D(QNetworkSettingsInterface); - return d->m_type.type(); + return d->type(); } /*! @@ -124,7 +126,7 @@ QNetworkSettingsType::Types QNetworkSettingsInterface::type() bool QNetworkSettingsInterface::powered() const { Q_D(const QNetworkSettingsInterface); - return d->m_powered; + return d->powered(); } void QNetworkSettingsInterface::setPowered(const bool powered) @@ -142,3 +144,5 @@ void QNetworkSettingsInterface::scanServices() Q_D(QNetworkSettingsInterface); d->scan(); } + +QT_END_NAMESPACE diff --git a/src/networksettings/qnetworksettingsinterface.h b/src/networksettings/qnetworksettingsinterface.h index 3961d22..20c1187 100644 --- a/src/networksettings/qnetworksettingsinterface.h +++ b/src/networksettings/qnetworksettingsinterface.h @@ -32,10 +32,10 @@ #include <QObject> #include <QtNetworkSettings/qnetworksettings.h> -QT_BEGIN_NAMESPACE - QT_FORWARD_DECLARE_CLASS(QNetworkSettingsInterfacePrivate) +QT_BEGIN_NAMESPACE + class Q_DECL_EXPORT QNetworkSettingsInterface : public QObject { Q_OBJECT Q_PROPERTY(QString name READ name NOTIFY nameChanged) diff --git a/src/networksettings/qnetworksettingsinterfacemodel.cpp b/src/networksettings/qnetworksettingsinterfacemodel.cpp index 700db10..8854d5f 100644 --- a/src/networksettings/qnetworksettingsinterfacemodel.cpp +++ b/src/networksettings/qnetworksettingsinterfacemodel.cpp @@ -29,6 +29,8 @@ #include "qnetworksettingsinterfacemodel.h" #include "qnetworksettingsinterface.h" +QT_BEGIN_NAMESPACE + QNetworkSettingsInterfaceModel::QNetworkSettingsInterfaceModel(QObject *parent) : QAbstractListModel(parent) { @@ -104,3 +106,5 @@ QList<QNetworkSettingsInterface*> QNetworkSettingsInterfaceModel::getModel() { return m_items; } + +QT_END_NAMESPACE diff --git a/src/networksettings/qnetworksettingsmanager.cpp b/src/networksettings/qnetworksettingsmanager.cpp index eb687d1..71aa081 100644 --- a/src/networksettings/qnetworksettingsmanager.cpp +++ b/src/networksettings/qnetworksettingsmanager.cpp @@ -34,6 +34,8 @@ #include "qnetworksettingsmanager_p.h" #include <QStringListModel> +QT_BEGIN_NAMESPACE + QNetworkSettingsManager::QNetworkSettingsManager(QObject *parent) : QObject(parent) ,d_ptr(new QNetworkSettingsManagerPrivate(this)) @@ -43,20 +45,20 @@ QNetworkSettingsManager::QNetworkSettingsManager(QObject *parent) : QNetworkSettingsServiceFilter *QNetworkSettingsManager::services() { Q_D(QNetworkSettingsManager); - return d->m_serviceFilter; + return d->serviceFilter(); } QNetworkSettingsInterfaceModel *QNetworkSettingsManager::interfaces() { Q_D(QNetworkSettingsManager); - return &d->m_interfaceModel; + return d->interfaceModel(); } QNetworkSettingsService* QNetworkSettingsManager::service(const QString& name, int type) { Q_D(QNetworkSettingsManager); - foreach (QNetworkSettingsService* service, d->m_serviceModel->getModel()) { + foreach (QNetworkSettingsService* service, d->serviceModel()->getModel()) { if (service->name() == name && service->type() == type) { return service; } @@ -91,3 +93,5 @@ QNetworkSettingsUserAgent* QNetworkSettingsManager::userAgent() Q_D(QNetworkSettingsManager); return d->userAgent(); } + +QT_END_NAMESPACE diff --git a/src/networksettings/qnetworksettingsservice.cpp b/src/networksettings/qnetworksettingsservice.cpp index e910bc3..39ad53d 100644 --- a/src/networksettings/qnetworksettingsservice.cpp +++ b/src/networksettings/qnetworksettingsservice.cpp @@ -29,6 +29,8 @@ #include "qnetworksettingsservice.h" #include "qnetworksettingsservice_p.h" +QT_BEGIN_NAMESPACE + /*! \qmltype NetworkService \inqmlmodule QtDeviceUtilities.NetworkSettings @@ -335,3 +337,5 @@ void QNetworkSettingsService::disconnectService() Q_D(QNetworkSettingsService); d->disconnectService(); } + +QT_END_NAMESPACE diff --git a/src/networksettings/qnetworksettingsservicemodel.cpp b/src/networksettings/qnetworksettingsservicemodel.cpp index a85883e..3040dab 100644 --- a/src/networksettings/qnetworksettingsservicemodel.cpp +++ b/src/networksettings/qnetworksettingsservicemodel.cpp @@ -29,6 +29,8 @@ #include "qnetworksettingsservicemodel.h" #include "qnetworksettings.h" +QT_BEGIN_NAMESPACE + QNetworkSettingsServiceModel::QNetworkSettingsServiceModel(QObject *parent) : QAbstractListModel(parent) { @@ -299,3 +301,5 @@ void QNetworkSettingsServiceFilter::setWiredNetworksAvailable(bool wiredNetworks m_wiredNetworksAvailable = wiredNetworksAvailable; emit wiredNetworksAvailableChanged(); } + +QT_END_NAMESPACE diff --git a/src/networksettings/qnetworksettingsuseragent.cpp b/src/networksettings/qnetworksettingsuseragent.cpp index b29cdf4..8740cf4 100644 --- a/src/networksettings/qnetworksettingsuseragent.cpp +++ b/src/networksettings/qnetworksettingsuseragent.cpp @@ -29,6 +29,8 @@ #include "qnetworksettingsuseragent.h" #include "qnetworksettingsuseragent_p.h" +QT_BEGIN_NAMESPACE + QNetworkSettingsUserAgent::QNetworkSettingsUserAgent(QObject *parent) :QObject(parent) ,d_ptr(new QNetworkSettingsUserAgentPrivate(this)) @@ -50,5 +52,7 @@ void QNetworkSettingsUserAgent::cancelInput() QString QNetworkSettingsUserAgent::passphrase() const { Q_D(const QNetworkSettingsUserAgent); - return d->m_passphrase; + return d->passphrase(); } + +QT_END_NAMESPACE diff --git a/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.cpp b/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.cpp index a2440a1..7db5c61 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.cpp +++ b/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.cpp @@ -30,6 +30,8 @@ #include "qnetworksettingsmanager_p.h" #include "qwifidevice.h" +QT_BEGIN_NAMESPACE + QNetworkSettingsInterfacePrivate::QNetworkSettingsInterfacePrivate(QNetworkSettingsInterface* parent) :QObject(parent) ,q_ptr(parent) @@ -61,3 +63,5 @@ void QNetworkSettingsInterfacePrivate::scan() { m_manager->call(QStringLiteral("SCAN")); } + +QT_END_NAMESPACE diff --git a/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h b/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h index 7016bf4..0c07c9c 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h +++ b/src/networksettings/wpasupplicant/qnetworksettingsinterface_p.h @@ -45,6 +45,8 @@ #include "qnetworksettingsinterface.h" #include "qnetworksettingsmanager_p.h" +QT_BEGIN_NAMESPACE + class QNetworkSettingsInterfacePrivate : public QObject { Q_OBJECT @@ -88,5 +90,7 @@ public: } }; +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSINTERFACEPRIVATE_H diff --git a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp index 8721257..d1baffa 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp @@ -34,6 +34,8 @@ #include "qnetworksettingsuseragent.h" #include "qwifisupplicant_p.h" +QT_BEGIN_NAMESPACE + QNetworkSettingsManagerPrivate::QNetworkSettingsManagerPrivate(QNetworkSettingsManager *parent) :QObject(parent) ,q_ptr(parent) @@ -431,3 +433,5 @@ void QNetworkSettingsManagerPrivate::parseScanResults(const QString &results) } } } + +QT_END_NAMESPACE diff --git a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h index 4881166..eb894f4 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h +++ b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.h @@ -47,7 +47,9 @@ #include "qnetworksettingsservicemodel.h" #include "qwificontroller_p.h" -class WpaSupplicantService; +QT_FORWARD_DECLARE_CLASS(WpaSupplicantService) + +QT_BEGIN_NAMESPACE class QNetworkSettingsManagerPrivate : public QObject { @@ -95,5 +97,6 @@ private: QString m_currentSSID; }; +QT_END_NAMESPACE #endif // QNETWORKSETTINGSMANAGERPRIVATE_H diff --git a/src/networksettings/wpasupplicant/qnetworksettingsservice_p.cpp b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.cpp index 974f85b..78b6c72 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsservice_p.cpp +++ b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.cpp @@ -29,6 +29,8 @@ #include "qnetworksettingsservice_p.h" #include "qnetworksettingsmanager_p.h" +QT_BEGIN_NAMESPACE + QNetworkSettingsServicePrivate::QNetworkSettingsServicePrivate(const QString& bssid, QNetworkSettingsService *parent) : QObject(parent) ,q_ptr(parent) @@ -118,3 +120,5 @@ void WpaSupplicantService::setState(QNetworkSettingsState::States aState) d->m_state.setState(aState); emit stateChanged(); } + +QT_EMD_NAMESPACE diff --git a/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h index 98652a9..0232663 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h +++ b/src/networksettings/wpasupplicant/qnetworksettingsservice_p.h @@ -44,7 +44,9 @@ #include "qnetworksettings.h" #include "qnetworksettingsservice.h" -class QNetworkSettingsManagerPrivate; +QT_FORWARD_DECLARE_CLASS(QNetworkSettingsManagerPrivate) + +QT_BEGIN_NAMESPACE class QNetworkSettingsServicePrivate : public QObject { @@ -88,4 +90,6 @@ public: void setState(QNetworkSettingsState::States aState); }; +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSSERVICEPRIVATE_H diff --git a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp index 4d49127..22960c0 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp +++ b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp @@ -28,6 +28,8 @@ ****************************************************************************/ #include "qnetworksettingsuseragent_p.h" +QT_BEGIN_NAMESPACE + QNetworkSettingsUserAgentPrivate::QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent* parent) :QObject(parent) ,q_ptr(parent) @@ -47,3 +49,5 @@ void QNetworkSettingsUserAgentPrivate::cancel() Q_Q(QNetworkSettingsUserAgent); emit q->ready(true); } + +QT_END_NAMESPACE diff --git a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h index f2051c2..8f1d36a 100644 --- a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h +++ b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h @@ -43,6 +43,8 @@ #include <QObject> #include "qnetworksettingsuseragent.h" +QT_BEGIN_NAMESPACE + class QNetworkSettingsUserAgentPrivate : public QObject { Q_OBJECT @@ -56,4 +58,6 @@ public: QNetworkSettingsUserAgent *q_ptr; }; +QT_END_NAMESPACE + #endif // QNETWORKSETTINGSUSERAGENTPRIVATE_H diff --git a/src/settingsui/settingsuiplugin/icons/generate_icons.sh b/src/settingsui/settingsuiplugin/icons/generate_icons.sh index 55867b8..7218df0 100755 --- a/src/settingsui/settingsuiplugin/icons/generate_icons.sh +++ b/src/settingsui/settingsuiplugin/icons/generate_icons.sh @@ -1,19 +1,29 @@ ############################################################################ ## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## -## This file is part of Qt Enterprise Embedded. +## This file is part of the Device Utilities module of the Qt Toolkit. ## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. ## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ ## ############################################################################# #!/bin/bash diff --git a/src/settingsui/settingsuiplugin/icons/scripts/cimage.sh b/src/settingsui/settingsuiplugin/icons/scripts/cimage.sh index ae73622..adbbb7f 100755 --- a/src/settingsui/settingsuiplugin/icons/scripts/cimage.sh +++ b/src/settingsui/settingsuiplugin/icons/scripts/cimage.sh @@ -1,19 +1,29 @@ ############################################################################ ## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## -## This file is part of Qt Enterprise Embedded. +## This file is part of the Device Utilities module of the Qt Toolkit. ## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. ## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ ## ############################################################################# #!/bin/bash diff --git a/src/settingsui/settingsuiplugin/icons/scripts/cimages.sh b/src/settingsui/settingsuiplugin/icons/scripts/cimages.sh index 94ac1cd..db1ad04 100755 --- a/src/settingsui/settingsuiplugin/icons/scripts/cimages.sh +++ b/src/settingsui/settingsuiplugin/icons/scripts/cimages.sh @@ -1,19 +1,29 @@ ############################################################################ ## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## -## This file is part of Qt Enterprise Embedded. +## This file is part of the Device Utilities module of the Qt Toolkit. ## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. ## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ ## ############################################################################# #!/bin/bash diff --git a/src/settingsui/settingsuiplugin/icons/scripts/rimage.sh b/src/settingsui/settingsuiplugin/icons/scripts/rimage.sh index d98088f..69b65a3 100755 --- a/src/settingsui/settingsuiplugin/icons/scripts/rimage.sh +++ b/src/settingsui/settingsuiplugin/icons/scripts/rimage.sh @@ -1,19 +1,29 @@ ############################################################################ ## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## -## This file is part of Qt Enterprise Embedded. +## This file is part of the Device Utilities module of the Qt Toolkit. ## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. ## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ ## ############################################################################# #!/bin/bash diff --git a/src/settingsui/settingsuiplugin/icons/scripts/rimages.sh b/src/settingsui/settingsuiplugin/icons/scripts/rimages.sh index 7b76da8..e9e01b0 100755 --- a/src/settingsui/settingsuiplugin/icons/scripts/rimages.sh +++ b/src/settingsui/settingsuiplugin/icons/scripts/rimages.sh @@ -1,19 +1,29 @@ ############################################################################ ## -## Copyright (C) 2015 Digia Plc -## All rights reserved. -## For any questions to Digia, please use the contact form at -## http://www.qt.io +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## -## This file is part of Qt Enterprise Embedded. +## This file is part of the Device Utilities module of the Qt Toolkit. ## -## Licensees holding valid Qt Enterprise licenses may use this file in -## accordance with the Qt Enterprise License Agreement provided with the +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and Digia. +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. ## -## If you have questions regarding the use of this file, please use -## the contact form at http://www.qt.io +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ ## ############################################################################# #!/bin/bash diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp index f428916..b985e31 100644 --- a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp +++ b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp @@ -72,9 +72,13 @@ to declare a custom settings UI, unless specifically required. */ +QT_BEGIN_NAMESPACE + void SettingsuipluginPlugin::registerTypes(const char *uri) { // @uri QtDeviceUtilities.SettingsUI Q_ASSERT(uri == QLatin1String("QtDeviceUtilities.SettingsUI")); qmlRegisterType(QUrl("qrc:/pluginMain.qml"), uri, 1, 0, "SettingsUI"); } + +QT_END_NAMESPACE diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h index 4ab42ad..32a92b5 100644 --- a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h +++ b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h @@ -31,6 +31,8 @@ #include <QQmlExtensionPlugin> +QT_BEGIN_NAMESPACE + class SettingsuipluginPlugin : public QQmlExtensionPlugin { Q_OBJECT @@ -40,4 +42,6 @@ public: void registerTypes(const char *uri); }; +QT_END_NAMESPACE + #endif // SETTINGSUIPLUGIN_PLUGIN_H diff --git a/src/src.pro b/src/src.pro index de260b9..d7ace46 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,13 +1,16 @@ TEMPLATE = subdirs CONFIG += ordered -qtHaveModule(bluetooth): SUBDIRS += bluetoothsettings +qtHaveModule(dbus) { + qtHaveModule(bluetooth): SUBDIRS += bluetoothsettings + SUBDIRS += \ + networksettings \ + localesettings \ + timedatesettings \ +} SUBDIRS += \ - networksettings \ - localesettings \ displaysettings \ - timedatesettings \ localdevice \ settingsui/settingsuiplugin \ settingsui/qtbuttonimageproviderplugin \ diff --git a/src/timedatesettings/systemtime.cpp b/src/timedatesettings/systemtime.cpp index 32e6e51..ce97899 100644 --- a/src/timedatesettings/systemtime.cpp +++ b/src/timedatesettings/systemtime.cpp @@ -29,6 +29,8 @@ #include "systemtime.h" #include "systemtime_p.h" +QT_BEGIN_NAMESPACE + SystemTime::SystemTime(QObject *parent) : QObject(parent) ,d_ptr(new SystemTimePrivate(this)) @@ -76,3 +78,5 @@ QDateTime SystemTime::time() const { return QDateTime::currentDateTime(); } + +QT_END_NAMESPACE diff --git a/src/timedatesettings/systemtime_p.h b/src/timedatesettings/systemtime_p.h index 7cdb135..a6ab646 100644 --- a/src/timedatesettings/systemtime_p.h +++ b/src/timedatesettings/systemtime_p.h @@ -43,6 +43,8 @@ #include "systemtime.h" #include "timedated_interface.h" +QT_BEGIN_NAMESPACE + class SystemTimePrivate { Q_DECLARE_PUBLIC(SystemTime) @@ -88,5 +90,6 @@ private: SystemTime *q_ptr; }; +QT_END_NAMESPACE #endif // SYSTEMTIME_P_H diff --git a/src/timedatesettings/timezonefiltermodel.cpp b/src/timedatesettings/timezonefiltermodel.cpp index 6825c14..b566624 100644 --- a/src/timedatesettings/timezonefiltermodel.cpp +++ b/src/timedatesettings/timezonefiltermodel.cpp @@ -29,6 +29,8 @@ #include "timezonemodel.h" #include "timezonefiltermodel.h" +QT_BEGIN_NAMESPACE + TimezoneFilterModel::TimezoneFilterModel(QObject* parent) :QSortFilterProxyModel(parent) { @@ -112,3 +114,5 @@ int TimezoneFilterModel::indexForTimezone(const QString &timezone) const return -1; } + +QT_END_NAMESPACE diff --git a/src/timedatesettings/timezonemodel.cpp b/src/timedatesettings/timezonemodel.cpp index 58837ba..8983a49 100644 --- a/src/timedatesettings/timezonemodel.cpp +++ b/src/timedatesettings/timezonemodel.cpp @@ -33,6 +33,8 @@ #include <QtConcurrent/QtConcurrentRun> #include "timezonemodel.h" +QT_BEGIN_NAMESPACE + TimezoneItem::TimezoneItem(const QByteArray& id, QObject *parent) :QObject(parent) { @@ -134,3 +136,5 @@ QVariant TimezoneModel::data(const QModelIndex & index, int role) const return QVariant(); } } + +QT_END_NAMESPACE diff --git a/tests/tests.pro b/tests/tests.pro new file mode 100644 index 0000000..9671085 --- /dev/null +++ b/tests/tests.pro @@ -0,0 +1 @@ +TEMPLATE = subdirs |