From f7aaff01de9d5555e333cedcbbc07236cd653d0a Mon Sep 17 00:00:00 2001
From: David Faure <david.faure@kdab.com>
Date: Sun, 2 Jul 2017 18:10:39 +0200
Subject: Fix Qt5DBusMacros.cmake for CMake 3.9

CMake gained support for running AUTOMOC on generated headers,
so we need to mark them with SKIP_AUTOMOC since we're generating
moc files for those already. Otherwise we get duplicated symbols.

Change-Id: Iabd387832cfc74809fc5e6ff4782f4fc83cc07d8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Reviewed-by: Stephen Kelly <steveire@gmail.com>
---
 src/dbus/Qt5DBusMacros.cmake | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/dbus')

diff --git a/src/dbus/Qt5DBusMacros.cmake b/src/dbus/Qt5DBusMacros.cmake
index ef3eb73276..0bd7364637 100644
--- a/src/dbus/Qt5DBusMacros.cmake
+++ b/src/dbus/Qt5DBusMacros.cmake
@@ -62,6 +62,7 @@ function(QT5_ADD_DBUS_INTERFACE _sources _interface _basename)
         DEPENDS ${_infile} VERBATIM)
 
     set_source_files_properties("${_impl}" PROPERTIES SKIP_AUTOMOC TRUE)
+    set_source_files_properties("${_header}" PROPERTIES SKIP_AUTOMOC TRUE)
 
     qt5_generate_moc("${_header}" "${_moc}")
 
@@ -147,6 +148,7 @@ function(QT5_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optio
 
     qt5_generate_moc("${_header}" "${_moc}")
     set_source_files_properties("${_impl}" PROPERTIES SKIP_AUTOMOC TRUE)
+    set_source_files_properties("${_header}" PROPERTIES SKIP_AUTOMOC TRUE)
     macro_add_file_dependencies("${_impl}" "${_moc}")
 
     list(APPEND ${_sources} "${_impl}" "${_header}" "${_moc}")
-- 
cgit v1.2.3


From 9db09b47000301bc3589278b076abdc111276304 Mon Sep 17 00:00:00 2001
From: Kevin Funk <kevin.funk@kdab.com>
Date: Tue, 4 Jul 2017 11:36:34 +0200
Subject: Fix modernize-use-bool-literals issues

Reported by clang-tidy. Skipped fixes in implementation files, only
changed headers.

Change-Id: I5cfd266b3d4046f90baebc0c538b1b6ab03a02d2
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/dbus/qdbusthreaddebug_p.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/dbus')

diff --git a/src/dbus/qdbusthreaddebug_p.h b/src/dbus/qdbusthreaddebug_p.h
index 866e777be6..96f389fa49 100644
--- a/src/dbus/qdbusthreaddebug_p.h
+++ b/src/dbus/qdbusthreaddebug_p.h
@@ -211,14 +211,14 @@ struct QDBusDispatchLocker: QDBusMutexLocker
     QDBusLockerBase::reportThreadAction(action, QDBusLockerBase::BeforeAcquire, this); \
     sem.acquire();                                                      \
     QDBusLockerBase::reportThreadAction(action, QDBusLockerBase::AfterAcquire, this); \
-    } while (0)
+    } while (false)
 
 # define SEM_RELEASE(action, sem)                                       \
     do {                                                                \
     QDBusLockerBase::reportThreadAction(action, QDBusLockerBase::BeforeRelease, that); \
     sem.release();                                                      \
     QDBusLockerBase::reportThreadAction(action, QDBusLockerBase::AfterRelease, that); \
-    } while (0)
+    } while (false)
 
 #else
 # define SEM_ACQUIRE(action, sem)       sem.acquire()
-- 
cgit v1.2.3