Mark unused parameters with Q_UNUSED
This prevents compiler warnings on less common branches of certain ifdefs. Change-Id: I89bae68491151b21cf6887a854cc4c9f68838cf9 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>bb10
parent
e593891b15
commit
0ff3bbe293
|
|
@ -65,6 +65,9 @@ HB_UChar16 HB_GetMirroredChar(HB_UChar16 ch)
|
|||
void (*HB_Library_Resolve(const char *library, int version, const char *symbol))()
|
||||
{
|
||||
#ifdef QT_NO_LIBRARY
|
||||
Q_UNUSED(library);
|
||||
Q_UNUSED(version);
|
||||
Q_UNUSED(symbol);
|
||||
return 0;
|
||||
#else
|
||||
return QLibrary::resolve(QLatin1String(library), version, symbol);
|
||||
|
|
|
|||
|
|
@ -1346,6 +1346,8 @@ void QGuiApplicationPrivate::init()
|
|||
qCritical() << "Library qttestability load failed:" << testLib.errorString();
|
||||
}
|
||||
}
|
||||
#else
|
||||
Q_UNUSED(loadTestability);
|
||||
#endif // QT_NO_LIBRARY
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -72,6 +72,12 @@ QPlatformIntegration *QPlatformIntegrationFactory::create(const QString &platfor
|
|||
}
|
||||
if (QPlatformIntegration *ret = loadIntegration(loader(), platform, paramList, argc, argv))
|
||||
return ret;
|
||||
#else
|
||||
Q_UNUSED(platform);
|
||||
Q_UNUSED(paramList);
|
||||
Q_UNUSED(argc);
|
||||
Q_UNUSED(argv);
|
||||
Q_UNUSED(platformPluginPath);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -102,6 +108,7 @@ QStringList QPlatformIntegrationFactory::keys(const QString &platformPluginPath)
|
|||
list.append(loader()->keyMap().values());
|
||||
return list;
|
||||
#else
|
||||
Q_UNUSED(platformPluginPath);
|
||||
return QStringList();
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,6 +63,9 @@ QPlatformTheme *QPlatformThemeFactory::create(const QString& key, const QString
|
|||
}
|
||||
if (QPlatformTheme *ret = qLoadPlugin1<QPlatformTheme, QPlatformThemePlugin>(loader(), platform, paramList))
|
||||
return ret;
|
||||
#else
|
||||
Q_UNUSED(key);
|
||||
Q_UNUSED(platformPluginPath);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -93,6 +96,7 @@ QStringList QPlatformThemeFactory::keys(const QString &platformPluginPath)
|
|||
list += loader()->keyMap().values();
|
||||
return list;
|
||||
#else
|
||||
Q_UNUSED(platformPluginPath);
|
||||
return QStringList();
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,6 +99,7 @@ QStringList QEGLDeviceIntegrationFactory::keys(const QString &pluginPath)
|
|||
qCDebug(qLcEglDevDebug) << "EGL device integration plugin keys:" << list;
|
||||
return list;
|
||||
#else
|
||||
Q_UNUSED(pluginPath);
|
||||
return QStringList();
|
||||
#endif
|
||||
}
|
||||
|
|
@ -117,6 +118,9 @@ QEGLDeviceIntegration *QEGLDeviceIntegrationFactory::create(const QString &key,
|
|||
qCDebug(qLcEglDevDebug) << "Using EGL device integration" << key;
|
||||
else
|
||||
qCWarning(qLcEglDevDebug) << "Failed to load EGL device integration" << key;
|
||||
#else
|
||||
Q_UNUSED(key);
|
||||
Q_UNUSED(pluginPath);
|
||||
#endif
|
||||
return integration;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ QStringList QXcbGlIntegrationFactory::keys(const QString &pluginPath)
|
|||
list.append(loader()->keyMap().values());
|
||||
return list;
|
||||
#else
|
||||
Q_UNUSED(pluginPath);
|
||||
return QStringList();
|
||||
#endif
|
||||
}
|
||||
|
|
@ -93,6 +94,9 @@ QXcbGlIntegration *QXcbGlIntegrationFactory::create(const QString &platform, con
|
|||
}
|
||||
if (QXcbGlIntegration *ret = loadIntegration(loader(), platform))
|
||||
return ret;
|
||||
#else
|
||||
Q_UNUSED(platform);
|
||||
Q_UNUSED(pluginPath);
|
||||
#endif
|
||||
return Q_NULLPTR;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9730,6 +9730,8 @@ void QWidget::setInputMethodHints(Qt::InputMethodHints hints)
|
|||
d->imHints = hints;
|
||||
if (this == QGuiApplication::focusObject())
|
||||
QGuiApplication::inputMethod()->update(Qt::ImHints);
|
||||
#else
|
||||
Q_UNUSED(hints);
|
||||
#endif //QT_NO_IM
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue