Changeset 561 for trunk/tools/designer/src/lib/shared/zoomwidget_p.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/designer/src/lib/shared/zoomwidget_p.h (modified) (6 diffs)

trunk/tools/designer/src/lib/shared/zoomwidget_p.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the Qt Designer of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -105 +105 @@
     Q_PROPERTY(int zoom READ zoom WRITE setZoom DESIGNABLE true SCRIPTABLE true)
     Q_PROPERTY(bool zoomContextMenuEnabled READ isZoomContextMenuEnabled WRITE setZoomContextMenuEnabled DESIGNABLE true SCRIPTABLE true)
-    Q_PROPERTY(bool autoScrollSuppressed READ isAutoScrollSuppressed WRITE setAutoScrollSuppressed DESIGNABLE true SCRIPTABLE true)
-
     Q_OBJECT
     Q_DISABLE_COPY(ZoomView)
@@ -121 +119 @@
     void setZoomContextMenuEnabled(bool e);
 
-    // Suppress scrolling when changing zoom. Default: on
-    bool isAutoScrollSuppressed() const;
-    void setAutoScrollSuppressed(bool s);
-
     QGraphicsScene &scene() { return *m_scene; }
     const QGraphicsScene &scene() const { return *m_scene; }
@@ -150 +144 @@
     qreal m_zoomFactor;
 
-    bool m_zoomContextMenuEnabled;
-    bool m_autoScrollSuppressed;
+    bool m_zoomContextMenuEnabled;    
     bool m_resizeBlocked;
     ZoomMenu *m_zoomMenu;