forked from qt-creator/qt-creator
QmlDesigner: Fix gcc compilation warnings
Fix warnings from gcc 4.8. Change-Id: If4fc311ea021d1014141cb123f1d765577efd831 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
-16
@@ -116,7 +116,6 @@ void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands()
|
||||
|
||||
QSet<ServerNodeInstance> informationChangedInstanceSet;
|
||||
QVector<InstancePropertyPair> propertyChangedList;
|
||||
bool adjustSceneRect = false;
|
||||
|
||||
if (quickView()) {
|
||||
foreach (QQuickItem *item, allItems()) {
|
||||
@@ -131,11 +130,6 @@ void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands()
|
||||
m_parentChangedSet.insert(instance);
|
||||
informationChangedInstanceSet.insert(instance);
|
||||
}
|
||||
// if (d->geometryChanged) {
|
||||
// if (instance.isRootNodeInstance())
|
||||
// declarativeView()->scene()->setSceneRect(item->boundingRect());
|
||||
// }
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -144,9 +138,6 @@ void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands()
|
||||
const QString propertyName = property.second;
|
||||
|
||||
if (instance.isValid()) {
|
||||
if (instance.isRootNodeInstance() && (propertyName == "width" || propertyName == "height"))
|
||||
adjustSceneRect = true;
|
||||
|
||||
if (propertyName.contains("anchors"))
|
||||
informationChangedInstanceSet.insert(instance);
|
||||
|
||||
@@ -170,13 +161,6 @@ void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands()
|
||||
m_parentChangedSet.clear();
|
||||
}
|
||||
|
||||
// if (adjustSceneRect) {
|
||||
// QRectF boundingRect = rootNodeInstance().boundingRect();
|
||||
// if (boundingRect.isValid()) {
|
||||
// declarativeView()->setSceneRect(boundingRect);
|
||||
// }
|
||||
// }
|
||||
|
||||
if (!m_completedComponentList.isEmpty()) {
|
||||
nodeInstanceClient()->componentCompleted(createComponentCompletedCommand(m_completedComponentList));
|
||||
m_completedComponentList.clear();
|
||||
|
||||
@@ -9,7 +9,7 @@ AbstractCustomTool::AbstractCustomTool()
|
||||
{
|
||||
}
|
||||
|
||||
void AbstractCustomTool::selectedItemsChanged(const QList<FormEditorItem *> &itemList)
|
||||
void AbstractCustomTool::selectedItemsChanged(const QList<FormEditorItem *> & /*itemList*/)
|
||||
{
|
||||
view()->changeToSelectionTool();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user