summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2013-10-31 13:41:06 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-13 15:44:15 +0100
commit74eb1254b30f36da937c8c47efe8cd88e942071b (patch)
treed723e505cfe44a340596f345a2a35fcb95b2ba8f /lib
parentc9d9b0d0ad41e1b2ab2d9d7617b5fc3fa0bd34a1 (diff)
Move implemented properties around
Out of the #ifndef Q_MOC_RUN block, so we can keep track of what's missing there. Change-Id: I53ef60b1a70b5495603d44fb23491c144891eb92 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/widgets/Api/qwebenginepage.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/widgets/Api/qwebenginepage.h b/lib/widgets/Api/qwebenginepage.h
index 8bb4176a6..c6e397197 100644
--- a/lib/widgets/Api/qwebenginepage.h
+++ b/lib/widgets/Api/qwebenginepage.h
@@ -117,9 +117,6 @@ class QWEBENGINEWIDGETS_EXPORT QWebEnginePage : public QObject {
// Ex-QWebFrame properties
Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false)
- Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
- Q_PROPERTY(QString title READ title)
- Q_PROPERTY(QUrl url READ url WRITE setUrl)
Q_PROPERTY(QUrl requestedUrl READ requestedUrl)
Q_PROPERTY(QUrl baseUrl READ baseUrl)
Q_PROPERTY(QIcon icon READ icon)
@@ -127,6 +124,9 @@ class QWEBENGINEWIDGETS_EXPORT QWebEnginePage : public QObject {
Q_PROPERTY(QPoint scrollPosition READ scrollPosition WRITE setScrollPosition)
Q_PROPERTY(bool focus READ hasFocus)
#endif
+ Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
+ Q_PROPERTY(QString title READ title)
+ Q_PROPERTY(QUrl url READ url WRITE setUrl)
public:
enum NavigationType {