Mark unused parameters as Q_UNUSED
authorUlf Hermann <ulf.hermann@theqtcompany.com>
Thu, 11 Jun 2015 15:54:32 +0000 (17:54 +0200)
committerSimon Hausmann <simon.hausmann@theqtcompany.com>
Sun, 14 Jun 2015 18:08:56 +0000 (18:08 +0000)
Change-Id: I4f859916debfb39d822a9c2a9c8bdf675d70d702
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
src/qml/qml/qqmlimport.cpp
src/quick/items/qquicktextedit.cpp
src/quick/items/qquicktextinput.cpp

index 5a54609..cb23042 100644 (file)
@@ -995,6 +995,13 @@ bool QQmlImportsPrivate::importExtension(const QString &qmldirFilePath,
     }
 
 #else
+    Q_UNUSED(qmldirFilePath);
+    Q_UNUSED(uri);
+    Q_UNUSED(vmaj);
+    Q_UNUSED(vmin);
+    Q_UNUSED(database);
+    Q_UNUSED(qmldir);
+    Q_UNUSED(errors);
     return false;
 #endif // QT_NO_LIBRARY
     return true;
@@ -1931,6 +1938,12 @@ bool QQmlImportDatabase::importStaticPlugin(QObject *instance, const QString &ba
 
     return true;
 #else
+    Q_UNUSED(instance);
+    Q_UNUSED(basePath);
+    Q_UNUSED(uri);
+    Q_UNUSED(typeNamespace);
+    Q_UNUSED(vmaj);
+    Q_UNUSED(errors);
     return false;
 #endif
 }
@@ -2011,6 +2024,11 @@ bool QQmlImportDatabase::importDynamicPlugin(const QString &filePath, const QStr
 
     return true;
 #else
+    Q_UNUSED(filePath);
+    Q_UNUSED(uri);
+    Q_UNUSED(typeNamespace);
+    Q_UNUSED(vmaj);
+    Q_UNUSED(errors);
     return false;
 #endif
 }
index 7c00da7..6f4b262 100644 (file)
@@ -1714,6 +1714,8 @@ void QQuickTextEdit::mousePressEvent(QMouseEvent *event)
 #ifndef QT_NO_IM
         if (hasActiveFocus() && hadActiveFocus && !isReadOnly())
             qGuiApp->inputMethod()->show();
+#else
+        Q_UNUSED(hadActiveFocus);
 #endif
     }
     if (!event->isAccepted())
index 4b6034e..8a8d96d 100644 (file)
@@ -1705,6 +1705,8 @@ void QQuickTextInput::ensureActiveFocus()
     // re-open input panel on press if already focused
     if (hasActiveFocus() && hadActiveFocus && !d->m_readOnly)
         qGuiApp->inputMethod()->show();
+#else
+    Q_UNUSED(hadActiveFocus);
 #endif
 }