Merge remote-tracking branch 'origin/4.6'

Change-Id: I724da8f761275865e735e7dce10c3b2b2d99fe94

src/plugins/qmlprofiler/inputeventsmodel.cpp

@@ -29,6 +29,8 @@
 
 #include <timeline/timelineformattime.h>
 
+#include <utils/qtcfallthrough.h>
+
 #include <QKeyEvent>
 #include <QMouseEvent>
 #include <QMetaEnum>
@@ -84,7 +86,7 @@ QVariantMap InputEventsModel::details(int index) const
     switch (event.type) {
     case InputKeyPress:
         type = tr("Key Press");
-        // fallthrough
+        Q_FALLTHROUGH();
     case InputKeyRelease:
         if (type.isEmpty())
             type = tr("Key Release");
@@ -98,11 +100,11 @@ QVariantMap InputEventsModel::details(int index) const
         break;
     case InputMouseDoubleClick:
         type = tr("Double Click");
-        // fallthrough
+        Q_FALLTHROUGH();
     case InputMousePress:
         if (type.isEmpty())
             type = tr("Mouse Press");
-        // fallthrough
+        Q_FALLTHROUGH();
     case InputMouseRelease:
         if (type.isEmpty())
             type = tr("Mouse Release");