diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-26 10:43:29 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-26 10:43:29 +0200 |
commit | 6c5de416c9e77433b20b95621c75666a47fbffbd (patch) | |
tree | 313690f41f9d6a1d8dd569b47156305463e3d615 /src/plugins/bearer/connman/qconnmanengine.h | |
parent | 091e61b3525c700ce4198086bbd0d95a59fcb31f (diff) | |
parent | 8ea6e8d525b9dd8703ebdd0938706bd9785858a4 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/io/qtemporarydir.cpp
One side encapsulated a repeated piece of #if-ery in a local define;
the other added to the #if-ery. Made its addition to the other's.
src/corelib/kernel/qeventdispatcher_unix_p.h
One side moved some members into a struct; this collided with a #undef
check that neither side now has. Discarded the #undef part.
src/gui/opengl/qopengltexturehelper_p.h
5.7 deleted a bunch of methods; not clear why merge got confused.
src/tools/moc/moc.cpp
One added a name to the copyright header; another changed its URL.
Change-Id: I9e9032b819f030d67f1915445acf2793e98713fa
Diffstat (limited to 'src/plugins/bearer/connman/qconnmanengine.h')
-rw-r--r-- | src/plugins/bearer/connman/qconnmanengine.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/bearer/connman/qconnmanengine.h b/src/plugins/bearer/connman/qconnmanengine.h index 3827ea167f..23c158ac34 100644 --- a/src/plugins/bearer/connman/qconnmanengine.h +++ b/src/plugins/bearer/connman/qconnmanengine.h @@ -100,7 +100,7 @@ private Q_SLOTS: void updateServices(const ConnmanMapList &changed, const QList<QDBusObjectPath> &removed); void servicesReady(const QStringList &); - void finishedScan(); + void finishedScan(bool error); void changedModem(); void serviceStateChanged(const QString &state); void configurationChange(QConnmanServiceInterface * service); |