diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-01-28 12:13:39 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-01-28 12:38:34 +0000 |
| commit | e1cdfc5529b0ca5ac5872a9c12ff3a4612d9b356 (patch) | |
| tree | e8efdbd5adb786ccc23ef8b65a26858e5e3b731f | |
| parent | 6ef40175e50599a9c19d25cd1e2d3a658a61b494 (diff) | |
Make Qt for Android compile when using errors for warnings
In file included from kernel/qsystemsemaphore_android.cpp:35:0:
kernel/qsystemsemaphore_p.h: In constructor 'QSystemSemaphorePrivate::QSystemSemaphorePrivate()':
kernel/qsystemsemaphore_p.h:104:10: error: 'QSystemSemaphorePrivate::createdSemaphore' will be initialized after [-Werror=reorder]
bool createdSemaphore;
^
kernel/qsystemsemaphore_p.h:101:11: error: 'key_t QSystemSemaphorePrivate::unix_key' [-Werror=reorder]
key_t unix_key;
^
kernel/qsystemsemaphore_android.cpp:43:1: error: when initialized here [-Werror=reorder]
QSystemSemaphorePrivate::QSystemSemaphorePrivate() :
^
widgets/qdockwidget.cpp:208:6: error: unused parameter 'floating' [-Werror=unused-parameter]
bool QDockWidgetLayout::nativeWindowDeco(bool floating) const
^
cc1plus: all warnings being treated as errors
Change-Id: I69af3ba3883b4311477f0e4e991b5cc0900fb71b
Reviewed-by: BogDan Vatra <bogdan@kde.org>
| -rw-r--r-- | src/corelib/kernel/qsystemsemaphore_android.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/widgets/qdockwidget.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/kernel/qsystemsemaphore_android.cpp b/src/corelib/kernel/qsystemsemaphore_android.cpp index 8ff47960f8..f80bb8e548 100644 --- a/src/corelib/kernel/qsystemsemaphore_android.cpp +++ b/src/corelib/kernel/qsystemsemaphore_android.cpp @@ -41,8 +41,8 @@ QT_BEGIN_NAMESPACE QSystemSemaphorePrivate::QSystemSemaphorePrivate() : - semaphore(-1), createdFile(false), - createdSemaphore(false), unix_key(-1), error(QSystemSemaphore::NoError) + unix_key(-1), semaphore(-1), createdFile(false), + createdSemaphore(false), error(QSystemSemaphore::NoError) { } diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 4121074e2e..37355a3712 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -208,6 +208,7 @@ static bool isXcb() bool QDockWidgetLayout::nativeWindowDeco(bool floating) const { #if defined(Q_OS_WINCE) || defined(Q_OS_ANDROID) + Q_UNUSED(floating) return false; #else return !isXcb() && (floating && item_list[QDockWidgetLayout::TitleBar] == 0); |