diff options
| -rw-r--r-- | src/libs/installer/keepaliveobject.h | 2 | ||||
| -rw-r--r-- | tests/downloadspeed/main.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/installer/keepaliveobject.h b/src/libs/installer/keepaliveobject.h index f8c20ce86..41e5d9a3f 100644 --- a/src/libs/installer/keepaliveobject.h +++ b/src/libs/installer/keepaliveobject.h @@ -60,7 +60,7 @@ private slots: private: QTimer *m_timer; - volatile bool m_quit; + QAtomicInt m_quit; }; } // namespace QInstaller diff --git a/tests/downloadspeed/main.cpp b/tests/downloadspeed/main.cpp index ff741c421..d510eb0fa 100644 --- a/tests/downloadspeed/main.cpp +++ b/tests/downloadspeed/main.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Installer Framework. @@ -126,7 +126,7 @@ public slots: } private: - volatile bool m_downloadFinished; + bool m_downloadFinished; }; |