Changeset 769 for trunk/tools/designer/src/components

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/designer/src/components/formeditor/formwindow.cpp (modified) (1 diff)
• tools/designer/src/components/formeditor/formwindow.h (modified) (1 diff)
• tools/designer/src/components/formeditor/qdesigner_resource.cpp (modified) (2 diffs)
• tools/designer/src/components/propertyeditor/designerpropertymanager.h (modified) (1 diff)

trunk/tools/designer/src/components/formeditor/formwindow.cpp

@@ -2220 +2220 @@
         }
 
+        if (manager->actionLower()->isEnabled()) {
+            popup->addAction(manager->actionLower());
+            popup->addAction(manager->actionRaise());
+            popup->addSeparator();
+        }
         popup->addAction(manager->actionCut());
         popup->addAction(manager->actionCopy());

trunk/tools/designer/src/components/formeditor/formwindow.h

@@ -279 +279 @@
     void checkPreviewGeometry(QRect &r);
 
-    void finishContextMenu(QWidget *w, QWidget *menuParent, QContextMenuEvent *e);
-
     bool handleContextMenu(QWidget *widget, QWidget *managedWidget, QContextMenuEvent *e);
     bool handleMouseButtonDblClickEvent(QWidget *widget, QWidget *managedWidget, QMouseEvent *e);

trunk/tools/designer/src/components/formeditor/qdesigner_resource.cpp

@@ -1447 +1447 @@
 
     QList<QWidget*> tabOrder;
-    foreach (QString widgetName, tabStops->elementTabStop()) {
+    foreach (const QString &widgetName, tabStops->elementTabStop()) {
         if (QWidget *w = qFindChild<QWidget*>(widget, widgetName)) {
             tabOrder.append(w);
@@ -2419 +2419 @@
     if (resourceSet) {
         const QStringList activePaths = resourceSet->activeQrcPaths();
-        foreach (QString path, activePaths) {
+        foreach (const QString &path, activePaths) {
             if (qrcPaths.contains(path)) {
                 DomResource *dom_res = new DomResource;

trunk/tools/designer/src/components/propertyeditor/designerpropertymanager.h

@@ -103 +103 @@
     Q_OBJECT
 public:
-    DesignerPropertyManager(QDesignerFormEditorInterface *core, QObject *parent = 0);
+    explicit DesignerPropertyManager(QDesignerFormEditorInterface *core, QObject *parent = 0);
     ~DesignerPropertyManager();