summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-08-07 14:33:55 +0200
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-08-07 12:43:50 +0000
commitdc00178c15372e1433811190faf004ec14ac6777 (patch)
treeb9a0eba9451b231b726e7080c76f3e55c2c336f7
parentbc53a10ef8b3f7efa3faf0aee6758df6be022311 (diff)
Minor changes to appease the Qt sanity botwip/mir
We don't need to mention that we've copied code from Qt when we're inside Qt. Qt code is allowed to contain Qt code ;) Change-Id: I1d449496e64be1cb5e8d4f692b7ccd6d50fcef66 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
-rw-r--r--src/plugins/platforms/mirclient/qmirclientbackingstore.cpp2
-rw-r--r--src/plugins/platforms/mirclient/qmirclientlogging.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/platforms/mirclient/qmirclientbackingstore.cpp b/src/plugins/platforms/mirclient/qmirclientbackingstore.cpp
index 8cff3bee9e..daa0b229ec 100644
--- a/src/plugins/platforms/mirclient/qmirclientbackingstore.cpp
+++ b/src/plugins/platforms/mirclient/qmirclientbackingstore.cpp
@@ -97,8 +97,6 @@ void QMirClientBackingStore::updateTexture()
QRegion fixed;
QRect imageRect = mImage.rect();
- /* Following code taken from QEGLPlatformBackingStore under the terms of the Lesser GPL v2.1 licence
- * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). */
Q_FOREACH (const QRect &rect, mDirty.rects()) {
// intersect with image rect to be sure
QRect r = imageRect & rect;
diff --git a/src/plugins/platforms/mirclient/qmirclientlogging.h b/src/plugins/platforms/mirclient/qmirclientlogging.h
index fe133d669a..80914d28b9 100644
--- a/src/plugins/platforms/mirclient/qmirclientlogging.h
+++ b/src/plugins/platforms/mirclient/qmirclientlogging.h
@@ -40,7 +40,7 @@
// Logging and assertion macros.
#define LOG(...) qDebug(__VA_ARGS__)
-#define LOG_IF(cond,...) do { if (cond) qDebug(__VA_ARGS__); } while(0)
+#define LOG_IF(cond,...) do { if (cond) qDebug(__VA_ARGS__); } while (0)
#define ASSERT(cond) ((!(cond)) ? qt_assert(#cond,__FILE__,__LINE__) : qt_noop())
#define NOT_REACHED() qt_assert("Not reached!",__FILE__,__LINE__)