forked from qt-creator/qt-creator
Fix some compiler warnings
* Unused variables in release build * Comparison of bool to int Change-Id: I1ac9b1051b26ae0655d4ff6b92d216926a4785da Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
@@ -96,6 +96,7 @@ void PositionerNodeInstance::refreshLayoutable()
|
|||||||
{
|
{
|
||||||
bool success = QMetaObject::invokeMethod(positioner(), "prePositioning");
|
bool success = QMetaObject::invokeMethod(positioner(), "prePositioning");
|
||||||
Q_ASSERT(success);
|
Q_ASSERT(success);
|
||||||
|
Q_UNUSED(success)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ void PositionerNodeInstance::refreshPositioner()
|
|||||||
{
|
{
|
||||||
bool success = QMetaObject::invokeMethod(positioner(), "prePositioning");
|
bool success = QMetaObject::invokeMethod(positioner(), "prePositioning");
|
||||||
Q_ASSERT(success);
|
Q_ASSERT(success);
|
||||||
|
Q_UNUSED(success)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -139,6 +139,7 @@ AndroidDebugSupport::AndroidDebugSupport(AndroidRunConfiguration *runConfig,
|
|||||||
Debugger::DebuggerRunConfigurationAspect *aspect
|
Debugger::DebuggerRunConfigurationAspect *aspect
|
||||||
= runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>();
|
= runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>();
|
||||||
Q_ASSERT(aspect->useCppDebugger() || aspect->useQmlDebugger());
|
Q_ASSERT(aspect->useCppDebugger() || aspect->useQmlDebugger());
|
||||||
|
Q_UNUSED(aspect)
|
||||||
|
|
||||||
if (runControl)
|
if (runControl)
|
||||||
m_engine = runControl->engine();
|
m_engine = runControl->engine();
|
||||||
|
|||||||
@@ -385,7 +385,7 @@ bool AndroidManager::updateDeploymentSettings(ProjectExplorer::Target *target)
|
|||||||
changedManifest = true;
|
changedManifest = true;
|
||||||
}
|
}
|
||||||
} else if (metadataElem.attribute(QLatin1String("android:name")) == QLatin1String("android.app.bundle_local_qt_libs")) {
|
} else if (metadataElem.attribute(QLatin1String("android:name")) == QLatin1String("android.app.bundle_local_qt_libs")) {
|
||||||
if (metadataElem.attribute(QLatin1String("android:value")).toInt() != bundleQtLibs) {
|
if (metadataElem.attribute(QLatin1String("android:value")).toInt() != int(bundleQtLibs)) {
|
||||||
metadataElem.setAttribute(QLatin1String("android:value"), int(bundleQtLibs));
|
metadataElem.setAttribute(QLatin1String("android:value"), int(bundleQtLibs));
|
||||||
changedManifest = true;
|
changedManifest = true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user