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 /src/networksettings/connman/connmancommon.h | |
| 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
Diffstat (limited to 'src/networksettings/connman/connmancommon.h')
| -rw-r--r-- | src/networksettings/connman/connmancommon.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |