summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-03-02 10:23:45 (GMT)
committerJesper Thomschutz <jesper.thomschutz@nokia.com>2010-03-05 09:20:44 (GMT)
commit79b3fffeb196bbc1f53d8a7253e2bfcf113eee43 (patch)
treec329a3e579e5a467e9bcfaaea59dc4ab97961df3
parenta556372dcf6c9595db00a56c9aa473a652875474 (diff)
downloadQt-79b3fffeb196bbc1f53d8a7253e2bfcf113eee43.zip
Qt-79b3fffeb196bbc1f53d8a7253e2bfcf113eee43.tar.gz
Qt-79b3fffeb196bbc1f53d8a7253e2bfcf113eee43.tar.bz2
QDeclarativeView: Make usable in Designer
Make source a designable property, add missing declarations for enumerations. Reviewed-by: akennedy <qt-info@nokia.com> (cherry picked from commit 0998fc069512d0ae2853929489b80f35e0d9d4ae)
-rw-r--r--src/declarative/util/qdeclarativeview.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h
index 03d8db3..107f3f9 100644
--- a/src/declarative/util/qdeclarativeview.h
+++ b/src/declarative/util/qdeclarativeview.h
@@ -43,6 +43,7 @@
#define QDECLARATIVEVIEW_H
#include <QtCore/qdatetime.h>
+#include <QtCore/qurl.h>
#include <QtGui/qgraphicssceneevent.h>
#include <QtGui/qgraphicsview.h>
#include <QtGui/qwidget.h>
@@ -64,7 +65,8 @@ class Q_DECLARATIVE_EXPORT QDeclarativeView : public QGraphicsView
Q_OBJECT
Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)
Q_PROPERTY(Status status READ status NOTIFY statusChanged)
-
+ Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true)
+ Q_ENUMS(ResizeMode Status)
public:
explicit QDeclarativeView(QWidget *parent = 0);
QDeclarativeView(const QUrl &source, QWidget *parent = 0);