diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:21 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:21 +0100 |
commit | e04be34b5b019df2c7e6009268833462c325c992 (patch) | |
tree | 763b96e1e56e6c513438ff88e6eeef881ac9dacd | |
parent | 00b89659758ab852a5a6fc18d3f211055f760212 (diff) | |
parent | a6df9c84a667e89bcdf215c7ac21b943b07991bd (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ib68cfcf088db801f0437b740e3dfc5cfe8a5e8e5
29 files changed, 65 insertions, 65 deletions
diff --git a/src/remoteobjects/qconnection_local_backend_p.h b/src/remoteobjects/qconnection_local_backend_p.h index 2ebba6e..2f18df6 100644 --- a/src/remoteobjects/qconnection_local_backend_p.h +++ b/src/remoteobjects/qconnection_local_backend_p.h @@ -53,8 +53,8 @@ #include "qconnectionfactories_p.h" -#include <QLocalServer> -#include <QLocalSocket> +#include <QtNetwork/qlocalserver.h> +#include <QtNetwork/qlocalsocket.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qconnection_qnx_global_p.h b/src/remoteobjects/qconnection_qnx_global_p.h index 3010b8d..cf108ee 100644 --- a/src/remoteobjects/qconnection_qnx_global_p.h +++ b/src/remoteobjects/qconnection_qnx_global_p.h @@ -57,7 +57,7 @@ #include <unistd.h> // provides SETIOV #include <sys/netmgr.h> //FOR ND_LOCAL_NODE #include <errno.h> -#include <QThread> +#include <QtCore/qthread.h> #ifdef USE_HAM # include <ha/ham.h> #endif diff --git a/src/remoteobjects/qconnection_qnx_qiodevices.h b/src/remoteobjects/qconnection_qnx_qiodevices.h index 7a59a72..fc28ba3 100644 --- a/src/remoteobjects/qconnection_qnx_qiodevices.h +++ b/src/remoteobjects/qconnection_qnx_qiodevices.h @@ -40,7 +40,7 @@ #ifndef QQNXNATIVEIO_H #define QQNXNATIVEIO_H -#include <QAbstractSocket> +#include <QtNetwork/qabstractsocket.h> #include <QtRemoteObjects/qtremoteobjectglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qconnection_qnx_qiodevices_p.h b/src/remoteobjects/qconnection_qnx_qiodevices_p.h index 5c3d28a..207eb18 100644 --- a/src/remoteobjects/qconnection_qnx_qiodevices_p.h +++ b/src/remoteobjects/qconnection_qnx_qiodevices_p.h @@ -54,8 +54,8 @@ #include "qconnection_qnx_qiodevices.h" #include "qconnection_qnx_global_p.h" -#include <QReadWriteLock> -#include <QScopedPointer> +#include <QtCore/qreadwritelock.h> +#include <QtCore/qscopedpointer.h> #include "private/qiodevice_p.h" #include "private/qringbuffer_p.h" diff --git a/src/remoteobjects/qconnection_qnx_server_p.h b/src/remoteobjects/qconnection_qnx_server_p.h index 5913d3d..dc0cb1d 100644 --- a/src/remoteobjects/qconnection_qnx_server_p.h +++ b/src/remoteobjects/qconnection_qnx_server_p.h @@ -55,9 +55,9 @@ #include "qconnection_qnx_server.h" #include "qconnection_qnx_global_p.h" -#include <QAtomicInt> -#include <QMutex> -#include <QSharedPointer> +#include <QtCore/qatomic.h> +#include <QtCore/qmutex.h> +#include <QtCore/qsharedpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qconnection_tcpip_backend.cpp b/src/remoteobjects/qconnection_tcpip_backend.cpp index 54f5fb3..41f9742 100644 --- a/src/remoteobjects/qconnection_tcpip_backend.cpp +++ b/src/remoteobjects/qconnection_tcpip_backend.cpp @@ -39,7 +39,7 @@ #include "qconnection_tcpip_backend_p.h" -#include <QHostInfo> +#include <QtNetwork/qhostinfo.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qconnection_tcpip_backend_p.h b/src/remoteobjects/qconnection_tcpip_backend_p.h index 7561733..fd3873e 100644 --- a/src/remoteobjects/qconnection_tcpip_backend_p.h +++ b/src/remoteobjects/qconnection_tcpip_backend_p.h @@ -53,8 +53,8 @@ #include "qconnectionfactories_p.h" -#include <QTcpServer> -#include <QTcpSocket> +#include <QtNetwork/qtcpserver.h> +#include <QtNetwork/qtcpsocket.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qconnectionfactories_p.h b/src/remoteobjects/qconnectionfactories_p.h index 3d71895..f0384ec 100644 --- a/src/remoteobjects/qconnectionfactories_p.h +++ b/src/remoteobjects/qconnectionfactories_p.h @@ -51,10 +51,10 @@ // We mean it. // -#include <QAbstractSocket> -#include <QDataStream> -#include <QIODevice> -#include <QPointer> +#include <QtNetwork/qabstractsocket.h> +#include <QtCore/qdatastream.h> +#include <QtCore/qiodevice.h> +#include <QtCore/qpointer.h> #include <QtRemoteObjects/qtremoteobjectglobal.h> diff --git a/src/remoteobjects/qremoteobjectabstractitemmodeladapter.cpp b/src/remoteobjects/qremoteobjectabstractitemmodeladapter.cpp index b78602e..861a9aa 100644 --- a/src/remoteobjects/qremoteobjectabstractitemmodeladapter.cpp +++ b/src/remoteobjects/qremoteobjectabstractitemmodeladapter.cpp @@ -39,7 +39,7 @@ #include "qremoteobjectabstractitemmodeladapter_p.h" -#include <QItemSelectionModel> +#include <QtCore/qitemselectionmodel.h> // consider evaluating performance difference with item data inline QVariantList collectData(const QModelIndex &index, const QAbstractItemModel *model, const QVector<int> &roles) diff --git a/src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h b/src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h index 4c9a972..8eff2c5 100644 --- a/src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h +++ b/src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h @@ -54,7 +54,7 @@ #include "qremoteobjectabstractitemmodeltypes.h" #include "qremoteobjectsource.h" -#include <QSize> +#include <QtCore/qsize.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp b/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp index 5b13081..6e643e2 100644 --- a/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp +++ b/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp @@ -42,9 +42,9 @@ #include "qremoteobjectnode.h" -#include <QDebug> -#include <QRect> -#include <QPoint> +#include <QtCore/qdebug.h> +#include <QtCore/qrect.h> +#include <QtCore/qpoint.h> QT_BEGIN_NAMESPACE @@ -600,10 +600,12 @@ void QAbstractItemModelReplicaImplementation::fetchPendingData() const ModelIndex resStart(std::min(curIndStart.row, dataIndStart.row), std::min(curIndStart.column, dataIndStart.column)); const ModelIndex resEnd(std::max(curIndEnd.row, dataIndEnd.row), std::max(curIndEnd.column, dataIndEnd.column)); QVector<int> roles = curData.roles; - if (!curData.roles.isEmpty()) - Q_FOREACH (int role, data.roles) + if (!curData.roles.isEmpty()) { + Q_FOREACH (int role, data.roles) { if (!curData.roles.contains(role)) roles.append(role); + } + } QRect firstRect( QPoint(curIndStart.row, curIndStart.column), QPoint(curIndEnd.row, curIndEnd.column)); QRect secondRect( QPoint(dataIndStart.row, dataIndStart.column), QPoint(dataIndEnd.row, dataIndEnd.column)); diff --git a/src/remoteobjects/qremoteobjectdynamicreplica.cpp b/src/remoteobjects/qremoteobjectdynamicreplica.cpp index bb1feba..de22ff3 100644 --- a/src/remoteobjects/qremoteobjectdynamicreplica.cpp +++ b/src/remoteobjects/qremoteobjectdynamicreplica.cpp @@ -40,7 +40,7 @@ #include "qremoteobjectdynamicreplica.h" #include "qremoteobjectreplica_p.h" -#include <QMetaProperty> +#include <QtCore/qmetaobject.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qremoteobjectnode.cpp b/src/remoteobjects/qremoteobjectnode.cpp index 038d68e..46d9fc1 100644 --- a/src/remoteobjects/qremoteobjectnode.cpp +++ b/src/remoteobjects/qremoteobjectnode.cpp @@ -50,7 +50,7 @@ #include "qremoteobjectsource_p.h" #include "qremoteobjectabstractitemmodelreplica_p.h" #include "qremoteobjectabstractitemmodeladapter_p.h" -#include <QAbstractItemModel> +#include <QtCore/qabstractitemmodel.h> #include <memory> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qremoteobjectnode_p.h b/src/remoteobjects/qremoteobjectnode_p.h index 2f30fc1..17642b6 100644 --- a/src/remoteobjects/qremoteobjectnode_p.h +++ b/src/remoteobjects/qremoteobjectnode_p.h @@ -56,8 +56,8 @@ #include "qremoteobjectreplica.h" #include "qremoteobjectnode.h" -#include <QBasicTimer> -#include <QMutex> +#include <QtCore/qbasictimer.h> +#include <QtCore/qmutex.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qremoteobjectpacket.cpp b/src/remoteobjects/qremoteobjectpacket.cpp index a751824..f160df4 100644 --- a/src/remoteobjects/qremoteobjectpacket.cpp +++ b/src/remoteobjects/qremoteobjectpacket.cpp @@ -39,7 +39,7 @@ #include "qremoteobjectpacket_p.h" -#include <QAbstractItemModel> +#include <QtCore/qabstractitemmodel.h> #include "qremoteobjectpendingcall.h" #include "qremoteobjectsource.h" diff --git a/src/remoteobjects/qremoteobjectpacket_p.h b/src/remoteobjects/qremoteobjectpacket_p.h index 4a73cb8..549cb68 100644 --- a/src/remoteobjects/qremoteobjectpacket_p.h +++ b/src/remoteobjects/qremoteobjectpacket_p.h @@ -55,12 +55,12 @@ #include "qremoteobjectsource.h" #include "qconnectionfactories_p.h" -#include <QtCore/QHash> -#include <QtCore/QMap> -#include <QtCore/QPair> -#include <QtCore/QUrl> -#include <QtCore/QVariant> -#include <QtCore/QLoggingCategory> +#include <QtCore/qhash.h> +#include <QtCore/qmap.h> +#include <QtCore/qpair.h> +#include <QtCore/qurl.h> +#include <QtCore/qvariant.h> +#include <QtCore/qloggingcategory.h> #include <cstdlib> diff --git a/src/remoteobjects/qremoteobjectpendingcall.cpp b/src/remoteobjects/qremoteobjectpendingcall.cpp index 94decf0..5393f12 100644 --- a/src/remoteobjects/qremoteobjectpendingcall.cpp +++ b/src/remoteobjects/qremoteobjectpendingcall.cpp @@ -42,7 +42,7 @@ #include "qremoteobjectreplica_p.h" -#include <QCoreApplication> +#include <QtCore/qcoreapplication.h> #include <private/qobject_p.h> diff --git a/src/remoteobjects/qremoteobjectpendingcall.h b/src/remoteobjects/qremoteobjectpendingcall.h index 41a18a7..322b031 100644 --- a/src/remoteobjects/qremoteobjectpendingcall.h +++ b/src/remoteobjects/qremoteobjectpendingcall.h @@ -42,7 +42,7 @@ #include <QtRemoteObjects/qtremoteobjectglobal.h> -#include <QVariant> +#include <QtCore/qvariant.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qremoteobjectpendingcall_p.h b/src/remoteobjects/qremoteobjectpendingcall_p.h index 9a19d9b..97b37fd 100644 --- a/src/remoteobjects/qremoteobjectpendingcall_p.h +++ b/src/remoteobjects/qremoteobjectpendingcall_p.h @@ -53,7 +53,7 @@ #include "qremoteobjectpendingcall.h" -#include <QMutex> +#include <QtCore/qmutex.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qremoteobjectregistry.cpp b/src/remoteobjects/qremoteobjectregistry.cpp index 890c7e0..71856a2 100644 --- a/src/remoteobjects/qremoteobjectregistry.cpp +++ b/src/remoteobjects/qremoteobjectregistry.cpp @@ -41,8 +41,8 @@ #include "qremoteobjectreplica_p.h" #include <private/qobject_p.h> -#include <QSet> -#include <QDataStream> +#include <QtCore/qset.h> +#include <QtCore/qdatastream.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qremoteobjectregistrysource.cpp b/src/remoteobjects/qremoteobjectregistrysource.cpp index 0aed2a0..1e1a2f4 100644 --- a/src/remoteobjects/qremoteobjectregistrysource.cpp +++ b/src/remoteobjects/qremoteobjectregistrysource.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qremoteobjectregistrysource_p.h" -#include <QDataStream> +#include <QtCore/qdatastream.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qremoteobjectreplica.cpp b/src/remoteobjects/qremoteobjectreplica.cpp index d0bad9a..031b6b7 100644 --- a/src/remoteobjects/qremoteobjectreplica.cpp +++ b/src/remoteobjects/qremoteobjectreplica.cpp @@ -47,11 +47,11 @@ #include "qconnectionfactories_p.h" #include "qremoteobjectsource_p.h" -#include <QCoreApplication> -#include <QDataStream> -#include <QElapsedTimer> -#include <QVariant> -#include <QThread> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qdatastream.h> +#include <QtCore/qelapsedtimer.h> +#include <QtCore/qvariant.h> +#include <QtCore/qthread.h> #include <limits> diff --git a/src/remoteobjects/qremoteobjectreplica_p.h b/src/remoteobjects/qremoteobjectreplica_p.h index 471964c..e724dae 100644 --- a/src/remoteobjects/qremoteobjectreplica_p.h +++ b/src/remoteobjects/qremoteobjectreplica_p.h @@ -57,11 +57,11 @@ #include "qremoteobjectpacket_p.h" -#include <QPointer> -#include <QVector> -#include <QDataStream> -#include <qcompilerdetection.h> -#include <QTimer> +#include <QtCore/qpointer.h> +#include <QtCore/qvector.h> +#include <QtCore/qdatastream.h> +#include <QtCore/qcompilerdetection.h> +#include <QtCore/qtimer.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qremoteobjectsettingsstore.cpp b/src/remoteobjects/qremoteobjectsettingsstore.cpp index 97e6cdc..83e29de 100644 --- a/src/remoteobjects/qremoteobjectsettingsstore.cpp +++ b/src/remoteobjects/qremoteobjectsettingsstore.cpp @@ -42,7 +42,7 @@ #include "qremoteobjectnode_p.h" #include <QtCore/private/qobject_p.h> -#include <QSettings> +#include <QtCore/qsettings.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qremoteobjectsource.cpp b/src/remoteobjects/qremoteobjectsource.cpp index 5cbc195..cae5f31 100644 --- a/src/remoteobjects/qremoteobjectsource.cpp +++ b/src/remoteobjects/qremoteobjectsource.cpp @@ -45,9 +45,9 @@ #include "qremoteobjectsourceio_p.h" #include "qremoteobjectabstractitemmodeladapter_p.h" -#include <QMetaProperty> -#include <QVarLengthArray> -#include <QAbstractItemModel> +#include <QtCore/qmetaobject.h> +#include <QtCore/qvarlengtharray.h> +#include <QtCore/qabstractitemmodel.h> #include <algorithm> #include <iterator> diff --git a/src/remoteobjects/qremoteobjectsource_p.h b/src/remoteobjects/qremoteobjectsource_p.h index 2961e5c..e5087f7 100644 --- a/src/remoteobjects/qremoteobjectsource_p.h +++ b/src/remoteobjects/qremoteobjectsource_p.h @@ -51,11 +51,10 @@ // We mean it. // -#include <QObject> -#include <QMetaObject> -#include <QMetaProperty> -#include <QVector> -#include <QPointer> +#include <QtCore/qobject.h> +#include <QtCore/qmetaobject.h> +#include <QtCore/qvector.h> +#include <QtCore/qpointer.h> #include "qremoteobjectsource.h" #include "qremoteobjectpacket_p.h" diff --git a/src/remoteobjects/qremoteobjectsourceio.cpp b/src/remoteobjects/qremoteobjectsourceio.cpp index c5bf36e..0b9cfc1 100644 --- a/src/remoteobjects/qremoteobjectsourceio.cpp +++ b/src/remoteobjects/qremoteobjectsourceio.cpp @@ -44,7 +44,7 @@ #include "qremoteobjectnode_p.h" #include "qtremoteobjectglobal.h" -#include <QStringList> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qremoteobjectsourceio_p.h b/src/remoteobjects/qremoteobjectsourceio_p.h index 59f9888..15c5004 100644 --- a/src/remoteobjects/qremoteobjectsourceio_p.h +++ b/src/remoteobjects/qremoteobjectsourceio_p.h @@ -55,8 +55,8 @@ #include "qtremoteobjectglobal.h" #include "qremoteobjectpacket_p.h" -#include <QIODevice> -#include <QScopedPointer> +#include <QtCore/qiodevice.h> +#include <QtCore/qscopedpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/remoteobjects/qtremoteobjectglobal.cpp b/src/remoteobjects/qtremoteobjectglobal.cpp index 513a01c..dc39fe6 100644 --- a/src/remoteobjects/qtremoteobjectglobal.cpp +++ b/src/remoteobjects/qtremoteobjectglobal.cpp @@ -39,9 +39,8 @@ #include "qtremoteobjectglobal.h" -#include <QDataStream> -#include <QMetaObject> -#include <QMetaProperty> +#include <QtCore/qdatastream.h> +#include <QtCore/qmetaobject.h> QT_BEGIN_NAMESPACE |