qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix warnings about constructor initialization order in tst_QObject. 

tst_qobject.cpp: In constructor 'DispatcherWatcher::DispatcherWatcher(QEventLoop&, int*, int*)':
tst_qobject.cpp:5871:10: warning: 'DispatcherWatcher::m_statusAboutToBlock' will be initialized after [-Wreorder]
tst_qobject.cpp:5870:10: warning:   'int* DispatcherWatcher::m_statusAwake' [-Wreorder]
tst_qobject.cpp:5815:5: warning:   when initialized here [-Wreorder]
tst_qobject.cpp:5870:10: warning: 'DispatcherWatcher::m_statusAwake' will be initialized after [-Wreorder]
tst_qobject.cpp:5869:17: warning:   'QEventLoop* DispatcherWatcher::m_eventLoop' [-Wreorder]

Amends change c5d4972577.

Task-number: QTBUG-18434
Task-number: QTBUG-32859
Task-number: QTBUG-36434
Change-Id: I03a9c872469334741a26b4dc1783a36d48f1556f
Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Friedemann Kleint 2016-02-26 10:16:28 +01:00
parent 9c63ad562b
commit bc5917a10a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/corelib/kernel/qobject/tst_qobject.cpp
View File

@ -5813,9 +5813,9 @@ class DispatcherWatcher : public QObject
Q_OBJECT
public:
DispatcherWatcher(QEventLoop &e, int *statusAwake, int *statusAboutToBlock) :
m_statusAboutToBlock(statusAboutToBlock),
m_statusAwake(statusAwake),
m_eventLoop(&e),
m_statusAwake(statusAwake),
m_statusAboutToBlock(statusAboutToBlock),
m_aboutToBlocks(0),
m_awakes(0)
{