From 913dd563064e8047fe738fc9c79135adfb928977 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Tue, 1 Dec 2009 11:17:15 +1000 Subject: Remove include styles that rely on configure. May help modularization (syncqt and configure are Qt-specific). --- src/declarative/debugger/qmldebug.cpp | 2 +- src/declarative/debugger/qmldebugclient.cpp | 2 +- src/declarative/debugger/qmldebugservice.cpp | 2 +- src/declarative/declarative.pro | 2 +- src/declarative/graphicsitems/graphicsitems.pri | 1 - .../graphicsitems/qmlgraphicsanimatedimage_p.h | 2 +- .../graphicsitems/qmlgraphicsanimatedimage_p_p.h | 2 +- .../graphicsitems/qmlgraphicsflickable_p_p.h | 4 +-- .../graphicsitems/qmlgraphicsflipable.cpp | 2 +- .../qmlgraphicsgraphicsobjectcontainer.cpp | 2 +- .../graphicsitems/qmlgraphicsgridview.cpp | 8 ++--- .../graphicsitems/qmlgraphicsgridview_p.h | 2 +- .../graphicsitems/qmlgraphicsimagebase.cpp | 2 +- src/declarative/graphicsitems/qmlgraphicsitem.cpp | 12 ++++---- src/declarative/graphicsitems/qmlgraphicsitem_p.h | 8 ++--- .../graphicsitems/qmlgraphicslayoutitem_p.h | 2 +- .../graphicsitems/qmlgraphicslistview.cpp | 6 ++-- .../graphicsitems/qmlgraphicslistview_p.h | 2 +- .../graphicsitems/qmlgraphicsloader.cpp | 2 +- .../graphicsitems/qmlgraphicspainteditem_p_p.h | 2 +- .../graphicsitems/qmlgraphicsparticles.cpp | 8 ++--- src/declarative/graphicsitems/qmlgraphicspath.cpp | 2 +- .../graphicsitems/qmlgraphicspathview.cpp | 10 +++--- .../graphicsitems/qmlgraphicspathview_p.h | 2 +- .../graphicsitems/qmlgraphicspathview_p_p.h | 2 +- .../graphicsitems/qmlgraphicspositioners.cpp | 12 ++++---- .../graphicsitems/qmlgraphicspositioners_p.h | 2 +- .../graphicsitems/qmlgraphicspositioners_p_p.h | 10 +++--- .../graphicsitems/qmlgraphicsrepeater.cpp | 6 ++-- .../graphicsitems/qmlgraphicsscalegrid_p_p.h | 2 +- src/declarative/graphicsitems/qmlgraphicstext.cpp | 2 +- .../graphicsitems/qmlgraphicstextedit.cpp | 4 +-- .../graphicsitems/qmlgraphicstextedit_p.h | 4 +-- .../graphicsitems/qmlgraphicsvisualitemmodel.cpp | 10 +++--- .../graphicsitems/qmlgraphicswebview.cpp | 6 ++-- .../graphicsitems/qmlgraphicswebview_p.h | 2 +- src/declarative/qml/qmlbasicscript.cpp | 14 ++++----- src/declarative/qml/qmlbasicscript_p.h | 2 +- src/declarative/qml/qmlbinding.cpp | 8 ++--- src/declarative/qml/qmlbindingoptimizations.cpp | 2 +- src/declarative/qml/qmlbindingoptimizations_p.h | 2 +- src/declarative/qml/qmlboundsignal.cpp | 10 +++--- src/declarative/qml/qmlcleanup.cpp | 2 +- src/declarative/qml/qmlcompiler.cpp | 28 ++++++++--------- src/declarative/qml/qmlcompiler_p.h | 16 +++++----- src/declarative/qml/qmlcomponent.cpp | 12 ++++---- src/declarative/qml/qmlcomponent_p.h | 6 ++-- src/declarative/qml/qmlcompositetypedata_p.h | 2 +- src/declarative/qml/qmlcompositetypemanager.cpp | 12 ++++---- src/declarative/qml/qmlcompositetypemanager_p.h | 4 +-- src/declarative/qml/qmlcontext.cpp | 8 ++--- src/declarative/qml/qmlcontext_p.h | 8 ++--- src/declarative/qml/qmlcontextscriptclass.cpp | 6 ++-- src/declarative/qml/qmlcontextscriptclass_p.h | 2 +- src/declarative/qml/qmlcustomparser_p.h | 2 +- src/declarative/qml/qmldom.cpp | 8 ++--- src/declarative/qml/qmlengine.cpp | 36 +++++++++++----------- src/declarative/qml/qmlengine_p.h | 20 ++++++------ src/declarative/qml/qmlenginedebug_p.h | 2 +- src/declarative/qml/qmlinfo.cpp | 2 +- src/declarative/qml/qmlintegercache.cpp | 2 +- src/declarative/qml/qmlintegercache_p.h | 4 +-- src/declarative/qml/qmllistscriptclass.cpp | 2 +- src/declarative/qml/qmlmetaproperty.cpp | 6 ++-- src/declarative/qml/qmlmetaproperty_p.h | 2 +- src/declarative/qml/qmlmetatype.cpp | 4 +-- src/declarative/qml/qmlobjectscriptclass.cpp | 10 +++--- src/declarative/qml/qmlobjectscriptclass_p.h | 4 +-- src/declarative/qml/qmlparser.cpp | 12 ++++---- src/declarative/qml/qmlparser_p.h | 2 +- src/declarative/qml/qmlpropertycache.cpp | 2 +- src/declarative/qml/qmlpropertycache_p.h | 4 +-- src/declarative/qml/qmlproxymetaobject_p.h | 2 +- src/declarative/qml/qmlrewrite.cpp | 2 +- src/declarative/qml/qmlscriptparser.cpp | 2 +- src/declarative/qml/qmlsqldatabase.cpp | 6 ++-- src/declarative/qml/qmltypenamecache.cpp | 2 +- src/declarative/qml/qmltypenamecache_p.h | 4 +-- src/declarative/qml/qmltypenamescriptclass.cpp | 4 +-- src/declarative/qml/qmltypenamescriptclass_p.h | 2 +- src/declarative/qml/qmlvaluetype_p.h | 2 +- src/declarative/qml/qmlvaluetypescriptclass.cpp | 2 +- src/declarative/qml/qmlvme.cpp | 24 +++++++-------- src/declarative/qml/qmlvme_p.h | 2 +- src/declarative/qml/qmlvmemetaobject.cpp | 4 +-- src/declarative/qml/qmlwatcher.cpp | 2 +- src/declarative/qml/qmlworkerscript.cpp | 2 +- src/declarative/qml/qmlworkerscript_p.h | 4 +-- src/declarative/qml/qmlxmlhttprequest.cpp | 6 ++-- src/declarative/util/qfxperf.cpp | 2 +- src/declarative/util/qfxperf_p_p.h | 2 +- src/declarative/util/qmlanimation.cpp | 8 ++--- src/declarative/util/qmlanimation_p.h | 4 +-- src/declarative/util/qmlanimation_p_p.h | 6 ++-- src/declarative/util/qmlbehavior.cpp | 4 +-- src/declarative/util/qmlbehavior_p.h | 2 +- src/declarative/util/qmlbind.cpp | 2 +- src/declarative/util/qmlconnection.cpp | 2 +- src/declarative/util/qmleasefollow.cpp | 2 +- src/declarative/util/qmlfontloader.cpp | 2 +- src/declarative/util/qmllistaccessor.cpp | 2 +- src/declarative/util/qmllistmodel.cpp | 6 ++-- src/declarative/util/qmllistmodel_p.h | 2 +- src/declarative/util/qmlnumberformatter_p.h | 2 +- src/declarative/util/qmlopenmetaobject.cpp | 2 +- src/declarative/util/qmlpixmapcache.cpp | 2 +- src/declarative/util/qmlpropertychanges.cpp | 4 +-- src/declarative/util/qmlpropertychanges_p.h | 2 +- src/declarative/util/qmlpropertymap.cpp | 2 +- src/declarative/util/qmlspringfollow.cpp | 2 +- src/declarative/util/qmlstate.cpp | 2 +- src/declarative/util/qmlstate_p_p.h | 6 ++-- src/declarative/util/qmlstategroup.cpp | 2 +- src/declarative/util/qmlstategroup_p.h | 2 +- src/declarative/util/qmlstateoperations.cpp | 4 +-- src/declarative/util/qmlstateoperations_p.h | 4 +-- src/declarative/util/qmltransition_p.h | 2 +- src/declarative/util/qmltransitionmanager.cpp | 4 +-- src/declarative/util/qmltransitionmanager_p_p.h | 2 +- src/declarative/util/qmlview.cpp | 10 +++--- src/declarative/util/qmlxmllistmodel_p.h | 2 +- src/declarative/widgets/graphicslayouts_p.h | 2 +- 122 files changed, 297 insertions(+), 298 deletions(-) diff --git a/src/declarative/debugger/qmldebug.cpp b/src/declarative/debugger/qmldebug.cpp index 72f613a..40995e7 100644 --- a/src/declarative/debugger/qmldebug.cpp +++ b/src/declarative/debugger/qmldebug.cpp @@ -41,7 +41,7 @@ #include "qmldebug_p.h" #include "qmldebugclient_p.h" #include -#include +#include "qmlenginedebug_p.h" class QmlEngineDebugClient : public QmlDebugClient { diff --git a/src/declarative/debugger/qmldebugclient.cpp b/src/declarative/debugger/qmldebugclient.cpp index 2cd1301..3a76b36 100644 --- a/src/declarative/debugger/qmldebugclient.cpp +++ b/src/declarative/debugger/qmldebugclient.cpp @@ -41,7 +41,7 @@ #include "qmldebugclient_p.h" #include -#include +#include "qpacketprotocol_p.h" #include #include diff --git a/src/declarative/debugger/qmldebugservice.cpp b/src/declarative/debugger/qmldebugservice.cpp index b54ad63..3c09585 100644 --- a/src/declarative/debugger/qmldebugservice.cpp +++ b/src/declarative/debugger/qmldebugservice.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include "qpacketprotocol_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index d1e2ee8..8d059bf 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -14,7 +14,7 @@ exists("qml_enable_gcov") { LIBS += -lgcov } -INCLUDEPATH += ../../include/QtDeclarative +INCLUDEPATH += 3rdparty util graphicsitems debugger qml include(../qbase.pri) diff --git a/src/declarative/graphicsitems/graphicsitems.pri b/src/declarative/graphicsitems/graphicsitems.pri index da3a0d4..5675130 100644 --- a/src/declarative/graphicsitems/graphicsitems.pri +++ b/src/declarative/graphicsitems/graphicsitems.pri @@ -85,4 +85,3 @@ contains(QT_CONFIG, webkit) { HEADERS += graphicsitems/qmlgraphicswebview_p.h HEADERS += graphicsitems/qmlgraphicswebview_p_p.h } - diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h index 79daa0f..a837702 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSANIMATEDIMAGE_H #define QMLGRAPHICSANIMATEDIMAGE_H -#include +#include "qmlgraphicsimage_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h index c24afa0..0d1c749 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include +#include "qmlgraphicsimage_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h index 8044ba7..210052e 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h @@ -57,8 +57,8 @@ #include "qmlgraphicsflickable_p.h" #include "qmlgraphicsitem_p.h" #include "qml.h" -#include "private/qmltimeline_p_p.h" -#include "private/qmlanimation_p_p.h" +#include "qmltimeline_p_p.h" +#include "qmlanimation_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp index b964e22..c271010 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlgraphicsflipable_p.h" -#include "private/qmlgraphicsitem_p.h" +#include "qmlgraphicsitem_p.h" #include "QtGui/qgraphicstransform.h" #include diff --git a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp index 294a374..bdad6ae 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include "qmlgraphicsitem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp index 81128e7..f223413 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include "qmlgraphicsgridview_p.h" -#include -#include -#include -#include +#include "qmlgraphicsvisualitemmodel_p.h" +#include "qlistmodelinterface_p.h" +#include "qmleasefollow_p.h" +#include "qmlgraphicsflickable_p_p.h" #include diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview_p.h b/src/declarative/graphicsitems/qmlgraphicsgridview_p.h index 99515a3..1615469 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgridview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsgridview_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSGRIDVIEW_H #define QMLGRAPHICSGRIDVIEW_H -#include +#include "qmlgraphicsflickable_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp index 8374c9f..c6954fb 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include "qmlpixmapcache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp index db59cf2..3ca9fce 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp @@ -47,21 +47,21 @@ #include #include #include -#include +#include "qfxperf_p_p.h" #include #include #include -#include -#include -#include +#include "qmlopenmetaobject_p.h" +#include "qmlstate_p.h" +#include "qlistmodelinterface_p.h" #include "qmlview.h" -#include +#include "qmlstategroup_p.h" #include "qmlgraphicsitem_p.h" #include "qmlgraphicsitem.h" -#include +#include "qmlgraphicsevents_p_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsitem_p.h b/src/declarative/graphicsitems/qmlgraphicsitem_p.h index 0c722ac..0c6960e 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsitem_p.h @@ -54,10 +54,10 @@ // #include -#include -#include -#include -#include +#include "qmlstate_p.h" +#include "qmlgraphicsanchors_p.h" +#include "qmlnullablevalue_p_p.h" +#include "qmlgraphicsanchors_p_p.h" #include #include #include diff --git a/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h b/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h index 35905b5..1acb5c1 100644 --- a/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h +++ b/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSGRAPHICSLAYOUTITEM_H #define QMLGRAPHICSGRAPHICSLAYOUTITEM_H #include -#include +#include #include QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp index 9dd2ab4..61545ec 100644 --- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "private/qmlgraphicsflickable_p_p.h" -#include -#include +#include "qmlgraphicsflickable_p_p.h" +#include "qmleasefollow_p.h" +#include "qlistmodelinterface_p.h" #include "qmlgraphicsvisualitemmodel_p.h" #include "qmlgraphicslistview_p.h" #include diff --git a/src/declarative/graphicsitems/qmlgraphicslistview_p.h b/src/declarative/graphicsitems/qmlgraphicslistview_p.h index cc74056..543c70a 100644 --- a/src/declarative/graphicsitems/qmlgraphicslistview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicslistview_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSLISTVIEW_H #define QMLGRAPHICSLISTVIEW_H -#include +#include "qmlgraphicsflickable_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsloader.cpp b/src/declarative/graphicsitems/qmlgraphicsloader.cpp index c841efe..7b2c542 100644 --- a/src/declarative/graphicsitems/qmlgraphicsloader.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsloader.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlgraphicsloader_p_p.h" -#include +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h index a938ecf..a49bbdf 100644 --- a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include +#include "qmlgraphicsitem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp index f15d9f6..a1dbe14 100644 --- a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qmlgraphicsitem_p.h" +#include "qmlgraphicsitem_p.h" #include #include @@ -50,9 +50,9 @@ #ifndef INT_MAX #define INT_MAX 2147483647 #endif -#include -#include -#include +#include "qmlpixmapcache_p.h" +#include "qfxperf_p_p.h" +#include "qmlanimation_p_p.h" #include #include "qmlgraphicsparticles_p.h" diff --git a/src/declarative/graphicsitems/qmlgraphicspath.cpp b/src/declarative/graphicsitems/qmlgraphicspath.cpp index 1791074..269552a 100644 --- a/src/declarative/graphicsitems/qmlgraphicspath.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspath.cpp @@ -41,7 +41,7 @@ #include "qmlgraphicspath_p.h" #include "qmlgraphicspath_p_p.h" -#include +#include "qfxperf_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qmlgraphicspathview.cpp b/src/declarative/graphicsitems/qmlgraphicspathview.cpp index 92751a0..3a77274 100644 --- a/src/declarative/graphicsitems/qmlgraphicspathview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspathview.cpp @@ -42,12 +42,12 @@ #include #include #include -#include -#include -#include +#include "qmlstate_p.h" +#include "qlistmodelinterface_p.h" +#include "qmlopenmetaobject_p.h" -#include -#include +#include "qmlgraphicspathview_p.h" +#include "qmlgraphicspathview_p_p.h" #include static const int FlickThreshold = 5; diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p.h index 38f1cd8..fef0798 100644 --- a/src/declarative/graphicsitems/qmlgraphicspathview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspathview_p.h @@ -43,7 +43,7 @@ #define QMLGRAPHICSPATHVIEW_H #include -#include +#include "qmlgraphicspath_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h index a0f2a3d..a61968c 100644 --- a/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h @@ -58,7 +58,7 @@ #include "qmlgraphicsitem_p.h" #include "qmlgraphicsvisualitemmodel_p.h" #include "qml.h" -#include "private/qmlanimation_p_p.h" +#include "qmlanimation_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp index 65e63eb..56fd98e 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp @@ -42,12 +42,12 @@ #include #include #include "qml.h" -#include -#include -#include -#include -#include -#include +#include "qmlstate_p.h" +#include "qmlstategroup_p.h" +#include "qmlstateoperations_p.h" +#include "qfxperf_p_p.h" +#include "qmlgraphicspositioners_p.h" +#include "qmlgraphicspositioners_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h index a0665ae..001ad80 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h @@ -45,7 +45,7 @@ #include #include #include -#include +#include "qmlstate_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h index d7a31a3..ced545e 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h @@ -53,13 +53,13 @@ // We mean it. // -#include +#include "qmlgraphicsitem_p.h" #include #include -#include -#include -#include -#include +#include "qmlgraphicspositioners_p.h" +#include "qmlstate_p.h" +#include "qmltransitionmanager_p_p.h" +#include "qmlstateoperations_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp index be10c24..967a29b 100644 --- a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp @@ -41,9 +41,9 @@ #include "qmlgraphicsrepeater_p.h" #include "qmlgraphicsrepeater_p_p.h" -#include -#include -#include +#include "qmllistaccessor_p.h" +#include "qmlgraphicsvisualitemmodel_p.h" +#include "qlistmodelinterface_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h index 82e0a94..4283c19 100644 --- a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h @@ -44,7 +44,7 @@ #include #include -#include +#include "qmlpixmapcache_p.h" #include #include "qmlgraphicsborderimage_p.h" diff --git a/src/declarative/graphicsitems/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp index d0aec8d..2d2c523 100644 --- a/src/declarative/graphicsitems/qmlgraphicstext.cpp +++ b/src/declarative/graphicsitems/qmlgraphicstext.cpp @@ -43,7 +43,7 @@ #include "qmlgraphicstext_p_p.h" #include -#include +#include "qfxperf_p_p.h" #include #include #include diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp index 5f5269f..94c4a1e 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp +++ b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp @@ -42,8 +42,8 @@ #include "qmlgraphicstextedit_p.h" #include "qmlgraphicstextedit_p_p.h" #include -#include -#include +#include "qfxperf_p_p.h" +#include "qmlgraphicsevents_p_p.h" #include #include #include diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h index 1ddfa6b..28d7d83 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h @@ -42,8 +42,8 @@ #ifndef QMLGRAPHICSTEXTEDIT_H #define QMLGRAPHICSTEXTEDIT_H -#include -#include +#include "qmlgraphicstext_p.h" +#include "qmlgraphicspainteditem_p.h" #include #include diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp index e8ee196..cde1f8a 100644 --- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp @@ -39,17 +39,17 @@ ** ****************************************************************************/ -#include +#include "qlistmodelinterface_p.h" #include "qmlgraphicsitem.h" #include #include -#include +#include "qmlpackage_p.h" #include "qhash.h" #include "qlist.h" #include "private/qobject_p.h" -#include "private/qmetaobjectbuilder_p.h" -#include -#include +#include "qmetaobjectbuilder_p.h" +#include "qmlopenmetaobject_p.h" +#include "qmllistaccessor_p.h" #include "qmlinfo.h" #include "qmlgraphicsvisualitemmodel_p.h" #include "private/qguard_p.h" diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp index e21bda3..0a1587e 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp @@ -55,12 +55,12 @@ #include "qml.h" #include "qmlengine.h" -#include -#include +#include "qmlstate_p.h" +#include "qlistmodelinterface_p.h" #include "qmlgraphicswebview_p.h" #include "qmlgraphicswebview_p_p.h" -#include +#include "qmlgraphicspainteditem_p_p.h" QT_BEGIN_NAMESPACE QML_DEFINE_TYPE(Qt,4,6,WebView,QmlGraphicsWebView) diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h index 7ff51f3..1e44263 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h @@ -44,7 +44,7 @@ #include #include -#include +#include "qmlgraphicspainteditem_p.h" #include #include diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp index b3bcf42..a27c4fb 100644 --- a/src/declarative/qml/qmlbasicscript.cpp +++ b/src/declarative/qml/qmlbasicscript.cpp @@ -42,14 +42,14 @@ #include "qmlbasicscript_p.h" #include #include -#include -#include +#include "qmlengine_p.h" +#include "qmlcontext_p.h" #include -#include -#include -#include -#include -#include +#include "qfxperf_p_p.h" +#include "qmlrefcount_p.h" +#include "qmljsast_p.h" +#include "qmljsengine_p.h" +#include "qmlglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlbasicscript_p.h b/src/declarative/qml/qmlbasicscript_p.h index 57d4fa7..4c4b178 100644 --- a/src/declarative/qml/qmlbasicscript_p.h +++ b/src/declarative/qml/qmlbasicscript_p.h @@ -56,7 +56,7 @@ #include #include #include -#include +#include "qmlparser_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp index ef92308..bb9a803 100644 --- a/src/declarative/qml/qmlbinding.cpp +++ b/src/declarative/qml/qmlbinding.cpp @@ -45,11 +45,11 @@ #include #include #include -#include +#include "qfxperf_p_p.h" #include -#include -#include -#include +#include "qmlcontext_p.h" +#include "qmldeclarativedata_p.h" +#include "qmlstringconverters_p.h" Q_DECLARE_METATYPE(QList); diff --git a/src/declarative/qml/qmlbindingoptimizations.cpp b/src/declarative/qml/qmlbindingoptimizations.cpp index 0efa600..5c67241 100644 --- a/src/declarative/qml/qmlbindingoptimizations.cpp +++ b/src/declarative/qml/qmlbindingoptimizations.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlbindingoptimizations_p.h" -#include +#include "qmlcontext_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlbindingoptimizations_p.h b/src/declarative/qml/qmlbindingoptimizations_p.h index 2cdc07d..1e3723f 100644 --- a/src/declarative/qml/qmlbindingoptimizations_p.h +++ b/src/declarative/qml/qmlbindingoptimizations_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include +#include "qmlexpression_p.h" #include QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlboundsignal.cpp b/src/declarative/qml/qmlboundsignal.cpp index deb15dc..4a0577a 100644 --- a/src/declarative/qml/qmlboundsignal.cpp +++ b/src/declarative/qml/qmlboundsignal.cpp @@ -40,15 +40,15 @@ ****************************************************************************/ #include "qmlboundsignal_p.h" -#include "private/qmetaobjectbuilder_p.h" -#include "private/qmlengine_p.h" -#include "private/qmlexpression_p.h" -#include "private/qmlcontext_p.h" +#include "qmetaobjectbuilder_p.h" +#include "qmlengine_p.h" +#include "qmlexpression_p.h" +#include "qmlcontext_p.h" #include #include #include #include -#include +#include "qmlglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcleanup.cpp b/src/declarative/qml/qmlcleanup.cpp index ef803d0..6b98191 100644 --- a/src/declarative/qml/qmlcleanup.cpp +++ b/src/declarative/qml/qmlcleanup.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlcleanup_p.h" -#include +#include "qmlengine_p.h" /*! \internal diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index a4e14b2..ee0c484 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#include "private/qmlcompiler_p.h" -#include "private/qmlcompositetypedata_p.h" -#include +#include "qmlcompiler_p.h" +#include "qmlcompositetypedata_p.h" +#include "qfxperf_p_p.h" #include "qmlparser_p.h" -#include "private/qmlscriptparser_p.h" +#include "qmlscriptparser_p.h" #include #include -#include "private/qmetaobjectbuilder_p.h" +#include "qmetaobjectbuilder_p.h" #include "qmlbasicscript_p.h" #include #include @@ -54,23 +54,23 @@ #include #include #include -#include -#include +#include "qmlstringconverters_p.h" +#include "qmlengine_p.h" #include #include #include #include #include -#include "private/qmlcustomparser_p_p.h" -#include -#include +#include "qmlcustomparser_p_p.h" +#include "qmlcontext_p.h" +#include "qmlcomponent_p.h" #include "parser/qmljsast_p.h" -#include -#include +#include "qmlvmemetaobject_p.h" +#include "qmlexpression_p.h" #include "qmlmetaproperty_p.h" #include "qmlrewrite_p.h" #include -#include +#include "qmlglobal_p.h" #include "qmlscriptparser_p.h" @@ -2307,7 +2307,7 @@ bool QmlCompiler::buildDynamicMeta(QmlParser::Object *obj, DynamicMetaMode mode) return true; } -#include +#include "qmljsparser_p.h" static QStringList astNodeToStringList(QmlJS::AST::Node *node) { if (node->kind == QmlJS::AST::Node::Kind_IdentifierExpression) { diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h index b54a62a..6b41a5f 100644 --- a/src/declarative/qml/qmlcompiler_p.h +++ b/src/declarative/qml/qmlcompiler_p.h @@ -57,14 +57,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "qmlinstruction_p.h" +#include "qmlcompositetypemanager_p.h" +#include "qmlparser_p.h" +#include "qmlengine_p.h" +#include "qbitfield_p.h" +#include "qmlpropertycache_p.h" +#include "qmlintegercache_p.h" +#include "qmltypenamecache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 5f8b816..1e03557 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -42,21 +42,21 @@ #include "qmlcomponent.h" #include "qmlcomponent_p.h" #include "qmlcompiler_p.h" -#include "private/qmlcontext_p.h" -#include "private/qmlcompositetypedata_p.h" -#include "private/qmlengine_p.h" +#include "qmlcontext_p.h" +#include "qmlcompositetypedata_p.h" +#include "qmlengine_p.h" #include "qmlvme_p.h" #include "qml.h" #include -#include +#include "qfxperf_p_p.h" #include #include #include #include "qmlbinding.h" #include #include -#include -#include +#include "qmlbinding_p.h" +#include "qmlglobal_p.h" #include "qmlscriptparser_p.h" diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h index 61a8a10..c9dfac8 100644 --- a/src/declarative/qml/qmlcomponent_p.h +++ b/src/declarative/qml/qmlcomponent_p.h @@ -57,9 +57,9 @@ #include #include #include -#include -#include -#include +#include "qmlengine_p.h" +#include "qmlcompositetypemanager_p.h" +#include "qbitfield_p.h" #include #include #include diff --git a/src/declarative/qml/qmlcompositetypedata_p.h b/src/declarative/qml/qmlcompositetypedata_p.h index 0d2843d..96531982 100644 --- a/src/declarative/qml/qmlcompositetypedata_p.h +++ b/src/declarative/qml/qmlcompositetypedata_p.h @@ -54,7 +54,7 @@ // #include -#include +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp index fa68951..ca07d84 100644 --- a/src/declarative/qml/qmlcompositetypemanager.cpp +++ b/src/declarative/qml/qmlcompositetypemanager.cpp @@ -39,17 +39,17 @@ ** ****************************************************************************/ -#include -#include -#include +#include "qmlcompositetypedata_p.h" +#include "qmlcompositetypemanager_p.h" +#include "qmlscriptparser_p.h" #include #include -#include +#include "qmlengine_p.h" #include #include #include -#include -#include +#include "qmlcomponent_p.h" +#include "qmlcompiler_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcompositetypemanager_p.h b/src/declarative/qml/qmlcompositetypemanager_p.h index 0abbfb5..f81e594 100644 --- a/src/declarative/qml/qmlcompositetypemanager_p.h +++ b/src/declarative/qml/qmlcompositetypemanager_p.h @@ -54,8 +54,8 @@ // #include -#include -#include +#include "qmlscriptparser_p.h" +#include "qmlrefcount_p.h" #include #include diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp index 38cbcfa..be483c9 100644 --- a/src/declarative/qml/qmlcontext.cpp +++ b/src/declarative/qml/qmlcontext.cpp @@ -40,14 +40,14 @@ ****************************************************************************/ #include -#include -#include -#include +#include "qmlcontext_p.h" +#include "qmlexpression_p.h" +#include "qmlengine_p.h" #include #include #include #include -#include +#include "qmlbindingoptimizations_p.h" #include #include diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h index c8d0b2d..4ad524d 100644 --- a/src/declarative/qml/qmlcontext_p.h +++ b/src/declarative/qml/qmlcontext_p.h @@ -55,14 +55,14 @@ #include #include -#include +#include "qmldeclarativedata_p.h" #include #include #include #include -#include -#include -#include +#include "qmlengine_p.h" +#include "qmlintegercache_p.h" +#include "qmltypenamecache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcontextscriptclass.cpp b/src/declarative/qml/qmlcontextscriptclass.cpp index fda284a..acf6203 100644 --- a/src/declarative/qml/qmlcontextscriptclass.cpp +++ b/src/declarative/qml/qmlcontextscriptclass.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include "qmlcontextscriptclass_p.h" -#include -#include -#include +#include "qmlengine_p.h" +#include "qmlcontext_p.h" +#include "qmltypenamescriptclass_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcontextscriptclass_p.h b/src/declarative/qml/qmlcontextscriptclass_p.h index bbd779b..cf91242 100644 --- a/src/declarative/qml/qmlcontextscriptclass_p.h +++ b/src/declarative/qml/qmlcontextscriptclass_p.h @@ -55,7 +55,7 @@ #include #include -#include +#include "qmltypenamecache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h index 88a264f..9b09280 100644 --- a/src/declarative/qml/qmlcustomparser_p.h +++ b/src/declarative/qml/qmlcustomparser_p.h @@ -57,7 +57,7 @@ #include #include #include -#include +#include "qmlparser_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp index f4a137c..596294f 100644 --- a/src/declarative/qml/qmldom.cpp +++ b/src/declarative/qml/qmldom.cpp @@ -41,14 +41,14 @@ #include "qmldom.h" #include "qmldom_p.h" -#include "private/qmlcompositetypedata_p.h" -#include "private/qmlcompiler_p.h" -#include "private/qmlengine_p.h" +#include "qmlcompositetypedata_p.h" +#include "qmlcompiler_p.h" +#include "qmlengine_p.h" #include #include #include #include "qmlscriptparser_p.h" -#include +#include "qmlglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 864d07e..0221458 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -40,12 +40,12 @@ ****************************************************************************/ #include -#include -#include +#include "qmlengine_p.h" +#include "qmlcontext_p.h" #include -#include +#include "qmlcompiler_p.h" #include -#include +#include "qmlglobalscriptclass_p.h" #include #include @@ -58,9 +58,9 @@ #include #include #include "qml.h" -#include +#include "qfxperf_p_p.h" #include -#include "private/qmlbasicscript_p.h" +#include "qmlbasicscript_p.h" #include "qmlengine.h" #include "qmlcontext.h" #include "qmlexpression.h" @@ -73,19 +73,19 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "qmlmetaproperty_p.h" +#include "qmlbinding_p.h" +#include "qmlvme_p.h" +#include "qmlenginedebug_p.h" +#include "qmlstringconverters_p.h" +#include "qmlxmlhttprequest_p.h" +#include "qmlsqldatabase_p.h" +#include "qmltypenamescriptclass_p.h" +#include "qmllistscriptclass_p.h" #include -#include +#include "qmlglobal_p.h" #include -#include +#include "qmlworkerscript_p.h" #ifdef Q_OS_WIN // for %APPDATA% #include "qt_windows.h" @@ -1207,7 +1207,7 @@ QmlEnginePrivate::Imports::~Imports() } #include -#include +#include "qmltypenamecache_p.h" static QmlTypeNameCache *cacheForNamespace(QmlEngine *engine, const QmlEnginePrivate::ImportedNamespace &set, QmlTypeNameCache *cache) { if (!cache) diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index 9e0c1fc..93fe4a7 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -61,21 +61,21 @@ #include #include #include -#include -#include -#include +#include "qmlclassfactory_p.h" +#include "qmlcompositetypemanager_p.h" +#include "qpodvector_p.h" #include -#include -#include +#include "qmlbasicscript_p.h" +#include "qmlvaluetype_p.h" #include #include #include #include -#include -#include -#include -#include -#include +#include "qmlmetaproperty_p.h" +#include "qmlpropertycache_p.h" +#include "qmlobjectscriptclass_p.h" +#include "qmlcontextscriptclass_p.h" +#include "qmlvaluetypescriptclass_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlenginedebug_p.h b/src/declarative/qml/qmlenginedebug_p.h index 8ba3d38..1804f6b 100644 --- a/src/declarative/qml/qmlenginedebug_p.h +++ b/src/declarative/qml/qmlenginedebug_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include +#include "qmldebugservice_p.h" #include #include diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp index bbd6022..3d9e0f7 100644 --- a/src/declarative/qml/qmlinfo.cpp +++ b/src/declarative/qml/qmlinfo.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlinfo.h" -#include +#include "qmldeclarativedata_p.h" #include #include diff --git a/src/declarative/qml/qmlintegercache.cpp b/src/declarative/qml/qmlintegercache.cpp index 1103ef2..981e653 100644 --- a/src/declarative/qml/qmlintegercache.cpp +++ b/src/declarative/qml/qmlintegercache.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlintegercache_p.h" -#include +#include "qmlengine_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlintegercache_p.h b/src/declarative/qml/qmlintegercache_p.h index 2b10dcc..1592337 100644 --- a/src/declarative/qml/qmlintegercache_p.h +++ b/src/declarative/qml/qmlintegercache_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include +#include "qmlrefcount_p.h" #include -#include +#include "qmlcleanup_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmllistscriptclass.cpp b/src/declarative/qml/qmllistscriptclass.cpp index a180e49..bb3eb21 100644 --- a/src/declarative/qml/qmllistscriptclass.cpp +++ b/src/declarative/qml/qmllistscriptclass.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmllistscriptclass_p.h" -#include +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp index 8bde318..0e34305 100644 --- a/src/declarative/qml/qmlmetaproperty.cpp +++ b/src/declarative/qml/qmlmetaproperty.cpp @@ -43,7 +43,7 @@ #include "qmlmetaproperty_p.h" #include "qmlcompositetypedata_p.h" #include -#include +#include "qfxperf_p_p.h" #include #include "qmlbinding.h" #include @@ -51,8 +51,8 @@ #include #include #include -#include -#include +#include "qmlengine_p.h" +#include "qmldeclarativedata_p.h" Q_DECLARE_METATYPE(QList); diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h index d225afa..dfb05fb 100644 --- a/src/declarative/qml/qmlmetaproperty_p.h +++ b/src/declarative/qml/qmlmetaproperty_p.h @@ -55,7 +55,7 @@ #include "qmlmetaproperty.h" #include -#include +#include "qmlpropertycache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp index 5fb2f50..5172152 100644 --- a/src/declarative/qml/qmlmetatype.cpp +++ b/src/declarative/qml/qmlmetatype.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include "qmlproxymetaobject_p.h" #include #include @@ -58,7 +58,7 @@ #include #include #include -#include +#include "qmlcustomparser_p.h" #ifdef QT_BOOTSTRAPPED # ifndef QT_NO_GEOM_VARIANT diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp index 1a6f724..5110ea0 100644 --- a/src/declarative/qml/qmlobjectscriptclass.cpp +++ b/src/declarative/qml/qmlobjectscriptclass.cpp @@ -40,12 +40,12 @@ ****************************************************************************/ #include "qmlobjectscriptclass_p.h" -#include +#include "qmlengine_p.h" #include -#include -#include -#include -#include +#include "qmlcontext_p.h" +#include "qmldeclarativedata_p.h" +#include "qmltypenamescriptclass_p.h" +#include "qmllistscriptclass_p.h" #include #include diff --git a/src/declarative/qml/qmlobjectscriptclass_p.h b/src/declarative/qml/qmlobjectscriptclass_p.h index 6169812..771c3eb 100644 --- a/src/declarative/qml/qmlobjectscriptclass_p.h +++ b/src/declarative/qml/qmlobjectscriptclass_p.h @@ -55,8 +55,8 @@ #include #include -#include -#include +#include "qmlpropertycache_p.h" +#include "qmltypenamecache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp index 402c93e..04e2926 100644 --- a/src/declarative/qml/qmlparser.cpp +++ b/src/declarative/qml/qmlparser.cpp @@ -46,14 +46,14 @@ #include #include #include -#include -#include +#include "qmlvme_p.h" +#include "qfxperf_p_p.h" #include -#include "private/qmlcomponent_p.h" +#include "qmlcomponent_p.h" #include -#include "private/qmetaobjectbuilder_p.h" -#include -#include +#include "qmetaobjectbuilder_p.h" +#include "qmlvmemetaobject_p.h" +#include "qmlcompiler_p.h" #include "parser/qmljsast_p.h" #include "parser/qmljsengine_p.h" #include diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h index 73bb498..d4bf88e 100644 --- a/src/declarative/qml/qmlparser_p.h +++ b/src/declarative/qml/qmlparser_p.h @@ -57,7 +57,7 @@ #include #include #include -#include +#include "qmlrefcount_p.h" #include QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlpropertycache.cpp b/src/declarative/qml/qmlpropertycache.cpp index b7a5fad..c5cdbaa 100644 --- a/src/declarative/qml/qmlpropertycache.cpp +++ b/src/declarative/qml/qmlpropertycache.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlpropertycache_p.h" -#include +#include "qmlengine_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlpropertycache_p.h b/src/declarative/qml/qmlpropertycache_p.h index c2e8abe..28dd66d 100644 --- a/src/declarative/qml/qmlpropertycache_p.h +++ b/src/declarative/qml/qmlpropertycache_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include +#include "qmlrefcount_p.h" #include -#include +#include "qmlcleanup_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlproxymetaobject_p.h b/src/declarative/qml/qmlproxymetaobject_p.h index 7f9163c..7a15bd9 100644 --- a/src/declarative/qml/qmlproxymetaobject_p.h +++ b/src/declarative/qml/qmlproxymetaobject_p.h @@ -55,7 +55,7 @@ #include #include -#include +#include "qmetaobjectbuilder_p.h" #include #include diff --git a/src/declarative/qml/qmlrewrite.cpp b/src/declarative/qml/qmlrewrite.cpp index 32e2fef..dc90255 100644 --- a/src/declarative/qml/qmlrewrite.cpp +++ b/src/declarative/qml/qmlrewrite.cpp @@ -41,7 +41,7 @@ #include "qmlrewrite_p.h" #include -#include +#include "qmlglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp index 23c050c..3ee7b50 100644 --- a/src/declarative/qml/qmlscriptparser.cpp +++ b/src/declarative/qml/qmlscriptparser.cpp @@ -55,7 +55,7 @@ #include #include -#include +#include "qfxperf_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp index 5a7e94c..3981d4c 100644 --- a/src/declarative/qml/qmlsqldatabase.cpp +++ b/src/declarative/qml/qmlsqldatabase.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include "qmlengine_p.h" #include #include #include @@ -51,8 +51,8 @@ #include #include #include -#include -#include +#include "qmlrefcount_p.h" +#include "qmlengine_p.h" #include #include #include "qmlsqldatabase_p.h" diff --git a/src/declarative/qml/qmltypenamecache.cpp b/src/declarative/qml/qmltypenamecache.cpp index 5c0d23b..ea2a4f3 100644 --- a/src/declarative/qml/qmltypenamecache.cpp +++ b/src/declarative/qml/qmltypenamecache.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmltypenamecache_p.h" -#include +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmltypenamecache_p.h b/src/declarative/qml/qmltypenamecache_p.h index 6ff403d..619a788 100644 --- a/src/declarative/qml/qmltypenamecache_p.h +++ b/src/declarative/qml/qmltypenamecache_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include +#include "qmlrefcount_p.h" #include -#include +#include "qmlcleanup_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmltypenamescriptclass.cpp b/src/declarative/qml/qmltypenamescriptclass.cpp index 8b2addf..9db3426 100644 --- a/src/declarative/qml/qmltypenamescriptclass.cpp +++ b/src/declarative/qml/qmltypenamescriptclass.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include "qmltypenamescriptclass_p.h" -#include -#include +#include "qmlengine_p.h" +#include "qmltypenamecache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmltypenamescriptclass_p.h b/src/declarative/qml/qmltypenamescriptclass_p.h index f630854..cec134d 100644 --- a/src/declarative/qml/qmltypenamescriptclass_p.h +++ b/src/declarative/qml/qmltypenamescriptclass_p.h @@ -54,7 +54,7 @@ // #include #include -#include +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvaluetype_p.h b/src/declarative/qml/qmlvaluetype_p.h index 2af261d..770650a 100644 --- a/src/declarative/qml/qmlvaluetype_p.h +++ b/src/declarative/qml/qmlvaluetype_p.h @@ -58,7 +58,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvaluetypescriptclass.cpp b/src/declarative/qml/qmlvaluetypescriptclass.cpp index e939e80..3b1953a 100644 --- a/src/declarative/qml/qmlvaluetypescriptclass.cpp +++ b/src/declarative/qml/qmlvaluetypescriptclass.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlvaluetypescriptclass_p.h" -#include +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index f2fb217..bee0ff1 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -41,13 +41,13 @@ #include "qmlvme_p.h" #include "qmlcompiler_p.h" -#include -#include -#include -#include "private/qmetaobjectbuilder_p.h" -#include "private/qmldeclarativedata_p.h" +#include "qfxperf_p_p.h" +#include "qmlboundsignal_p.h" +#include "qmlstringconverters_p.h" +#include "qmetaobjectbuilder_p.h" +#include "qmldeclarativedata_p.h" #include -#include +#include "qmlcustomparser_p.h" #include #include #include @@ -58,15 +58,15 @@ #include #include #include -#include -#include -#include "private/qmlvmemetaobject_p.h" +#include "qmlengine_p.h" +#include "qmlcomponent_p.h" +#include "qmlvmemetaobject_p.h" #include #include #include -#include -#include -#include +#include "qmlbinding_p.h" +#include "qmlcontext_p.h" +#include "qmlbindingoptimizations_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvme_p.h b/src/declarative/qml/qmlvme_p.h index a15bd08..257b3b2 100644 --- a/src/declarative/qml/qmlvme_p.h +++ b/src/declarative/qml/qmlvme_p.h @@ -56,7 +56,7 @@ #include #include #include -#include +#include "qbitfield_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp index 3f5dd475..b7ee316 100644 --- a/src/declarative/qml/qmlvmemetaobject.cpp +++ b/src/declarative/qml/qmlvmemetaobject.cpp @@ -41,13 +41,13 @@ #include "qmlvmemetaobject_p.h" #include -#include +#include "qmlrefcount_p.h" #include #include #include #include #include -#include +#include "qmlcontext_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlwatcher.cpp b/src/declarative/qml/qmlwatcher.cpp index 889ac78..3216a6b 100644 --- a/src/declarative/qml/qmlwatcher.cpp +++ b/src/declarative/qml/qmlwatcher.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include "qmldebugservice_p.h" #include #include diff --git a/src/declarative/qml/qmlworkerscript.cpp b/src/declarative/qml/qmlworkerscript.cpp index a6428dd..75c67cc 100644 --- a/src/declarative/qml/qmlworkerscript.cpp +++ b/src/declarative/qml/qmlworkerscript.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include "qmlengine_p.h" #include #include #include diff --git a/src/declarative/qml/qmlworkerscript_p.h b/src/declarative/qml/qmlworkerscript_p.h index 90861f8..b85238d 100644 --- a/src/declarative/qml/qmlworkerscript_p.h +++ b/src/declarative/qml/qmlworkerscript_p.h @@ -54,8 +54,8 @@ // #include -#include -#include +#include +#include #include #include diff --git a/src/declarative/qml/qmlxmlhttprequest.cpp b/src/declarative/qml/qmlxmlhttprequest.cpp index 216db6e..f5100ef 100644 --- a/src/declarative/qml/qmlxmlhttprequest.cpp +++ b/src/declarative/qml/qmlxmlhttprequest.cpp @@ -41,14 +41,14 @@ #include #include -#include +#include "qmlengine_p.h" #include #include #include #include #include -#include -#include +#include "qmlrefcount_p.h" +#include "qmlengine_p.h" #include #include "qmlxmlhttprequest_p.h" diff --git a/src/declarative/util/qfxperf.cpp b/src/declarative/util/qfxperf.cpp index 8fcab2b..f62f810 100644 --- a/src/declarative/util/qfxperf.cpp +++ b/src/declarative/util/qfxperf.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qfxperf_p_p.h" +#include "qfxperf_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qfxperf_p_p.h b/src/declarative/util/qfxperf_p_p.h index c16bf7b..e3f820c 100644 --- a/src/declarative/util/qfxperf_p_p.h +++ b/src/declarative/util/qfxperf_p_p.h @@ -52,7 +52,7 @@ // We mean it. // -#include "private/qperformancelog_p_p.h" +#include "qperformancelog_p_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 475978f..c78deb0 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -47,7 +47,7 @@ #include "qml.h" #include "qmlinfo.h" #include "qmlanimation_p_p.h" -#include +#include "qmlbehavior_p.h" #include #include #include @@ -55,10 +55,10 @@ #include #include #include -#include -#include +#include "qmlstateoperations_p.h" +#include "qmlstringconverters_p.h" #include -#include +#include "qmlglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h index 87b6703..ea48c19 100644 --- a/src/declarative/util/qmlanimation_p.h +++ b/src/declarative/util/qmlanimation_p.h @@ -45,9 +45,9 @@ #include #include #include -#include +#include "qmltransition_p.h" #include -#include +#include "qmlstate_p.h" #include #include diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h index 326e1c6..c1fe239 100644 --- a/src/declarative/util/qmlanimation_p_p.h +++ b/src/declarative/util/qmlanimation_p_p.h @@ -54,16 +54,16 @@ // #include -#include +#include "qmlnullablevalue_p_p.h" #include #include #include #include #include -#include +#include "qmlanimation_p.h" #include #include -#include +#include "qmltimeline_p_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlbehavior.cpp b/src/declarative/util/qmlbehavior.cpp index 23d3838..10de9fc 100644 --- a/src/declarative/util/qmlbehavior.cpp +++ b/src/declarative/util/qmlbehavior.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include -#include -#include +#include "qmlanimation_p.h" +#include "qmltransition_p.h" #include "qmlbehavior_p.h" #include #include diff --git a/src/declarative/util/qmlbehavior_p.h b/src/declarative/util/qmlbehavior_p.h index 581a0a8..b6426a3 100644 --- a/src/declarative/util/qmlbehavior_p.h +++ b/src/declarative/util/qmlbehavior_p.h @@ -45,7 +45,7 @@ #include #include #include -#include +#include "qmlstate_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp index 2f692d8..ae0a2a6 100644 --- a/src/declarative/util/qmlbind.cpp +++ b/src/declarative/util/qmlbind.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include "qmlnullablevalue_p_p.h" #include "qmlbind_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp index 3e72ab8..59798a2 100644 --- a/src/declarative/util/qmlconnection.cpp +++ b/src/declarative/util/qmlconnection.cpp @@ -41,7 +41,7 @@ #include "qmlconnection_p.h" #include -#include "private/qmlboundsignal_p.h" +#include "qmlboundsignal_p.h" #include "private/qobject_p.h" #include #include diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp index b326f63..5e81117 100644 --- a/src/declarative/util/qmleasefollow.cpp +++ b/src/declarative/util/qmleasefollow.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include "qmlanimation_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp index bb26536..ba06e19 100644 --- a/src/declarative/util/qmlfontloader.cpp +++ b/src/declarative/util/qmlfontloader.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/declarative/util/qmllistaccessor.cpp b/src/declarative/util/qmllistaccessor.cpp index 4adec81..8c7e80a 100644 --- a/src/declarative/util/qmllistaccessor.cpp +++ b/src/declarative/util/qmllistaccessor.cpp @@ -45,7 +45,7 @@ #include // ### Remove me -#include +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp index 8259dcd..2ba4c35 100644 --- a/src/declarative/util/qmllistmodel.cpp +++ b/src/declarative/util/qmllistmodel.cpp @@ -42,10 +42,10 @@ #include #include #include -#include -#include +#include "qmlcustomparser_p.h" +#include "qmlparser_p.h" #include "qmlopenmetaobject_p.h" -#include +#include "qmlengine_p.h" #include #include "qmllistmodel_p.h" #include diff --git a/src/declarative/util/qmllistmodel_p.h b/src/declarative/util/qmllistmodel_p.h index d626060..7354296 100644 --- a/src/declarative/util/qmllistmodel_p.h +++ b/src/declarative/util/qmllistmodel_p.h @@ -48,7 +48,7 @@ #include #include #include -#include +#include "qlistmodelinterface_p.h" #include diff --git a/src/declarative/util/qmlnumberformatter_p.h b/src/declarative/util/qmlnumberformatter_p.h index 346c2f0..98e5b92 100644 --- a/src/declarative/util/qmlnumberformatter_p.h +++ b/src/declarative/util/qmlnumberformatter_p.h @@ -43,7 +43,7 @@ #define QMLNUMBERFORMATTER_H #include -#include +#include "qnumberformat_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlopenmetaobject.cpp b/src/declarative/util/qmlopenmetaobject.cpp index 05ff80a..1bbfbda 100644 --- a/src/declarative/util/qmlopenmetaobject.cpp +++ b/src/declarative/util/qmlopenmetaobject.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlopenmetaobject_p.h" -#include "private/qmetaobjectbuilder_p.h" +#include "qmetaobjectbuilder_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp index b8a9bd7..49825db 100644 --- a/src/declarative/util/qmlpixmapcache.cpp +++ b/src/declarative/util/qmlpixmapcache.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include "qfxperf_p_p.h" #include #include #include diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp index 9ca6db8..532cc2d 100644 --- a/src/declarative/util/qmlpropertychanges.cpp +++ b/src/declarative/util/qmlpropertychanges.cpp @@ -44,8 +44,8 @@ #include "qmlpropertychanges_p.h" #include #include -#include -#include +#include "qmlcustomparser_p.h" +#include "qmlparser_p.h" #include #include #include diff --git a/src/declarative/util/qmlpropertychanges_p.h b/src/declarative/util/qmlpropertychanges_p.h index 2c0cba9..461730d 100644 --- a/src/declarative/util/qmlpropertychanges_p.h +++ b/src/declarative/util/qmlpropertychanges_p.h @@ -42,7 +42,7 @@ #ifndef QMLPROPERTYCHANGES_H #define QMLPROPERTYCHANGES_H -#include +#include "qmlstateoperations_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlpropertymap.cpp b/src/declarative/util/qmlpropertymap.cpp index c0e3340..0c398fd 100644 --- a/src/declarative/util/qmlpropertymap.cpp +++ b/src/declarative/util/qmlpropertymap.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlpropertymap.h" -#include +#include "qmlopenmetaobject_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlspringfollow.cpp b/src/declarative/util/qmlspringfollow.cpp index d6961b0..ffecad0 100644 --- a/src/declarative/util/qmlspringfollow.cpp +++ b/src/declarative/util/qmlspringfollow.cpp @@ -44,7 +44,7 @@ #include #include "private/qobject_p.h" #include "qmlspringfollow_p.h" -#include "private/qmlanimation_p_p.h" +#include "qmlanimation_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index 5fde89a..a55308e 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -48,7 +48,7 @@ #include "qmlanimation_p_p.h" #include "qmlstate_p.h" #include -#include +#include "qmlglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstate_p_p.h b/src/declarative/util/qmlstate_p_p.h index 75eb3fd..5d3a7dd 100644 --- a/src/declarative/util/qmlstate_p_p.h +++ b/src/declarative/util/qmlstate_p_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include +#include "qmlstate_p.h" #include -#include -#include +#include "qmlanimation_p_p.h" +#include "qmltransitionmanager_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp index f206f5c..f6a0d1a 100644 --- a/src/declarative/util/qmlstategroup.cpp +++ b/src/declarative/util/qmlstategroup.cpp @@ -45,7 +45,7 @@ #include "qmlstate_p_p.h" #include #include -#include +#include "qmlglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstategroup_p.h b/src/declarative/util/qmlstategroup_p.h index ddd27d7..82cc504 100644 --- a/src/declarative/util/qmlstategroup_p.h +++ b/src/declarative/util/qmlstategroup_p.h @@ -42,7 +42,7 @@ #ifndef QMLSTATEGROUP_H #define QMLSTATEGROUP_H -#include +#include "qmlstate_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index 9727ca7..560c86b 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.cpp @@ -46,8 +46,8 @@ #include "qmlstateoperations_p.h" #include #include -#include -#include +#include "qmlgraphicsanchors_p_p.h" +#include "qmlgraphicsitem_p.h" #include #include diff --git a/src/declarative/util/qmlstateoperations_p.h b/src/declarative/util/qmlstateoperations_p.h index 589fe20..9e9dbd1 100644 --- a/src/declarative/util/qmlstateoperations_p.h +++ b/src/declarative/util/qmlstateoperations_p.h @@ -42,9 +42,9 @@ #ifndef QMLSTATEOPERATIONS_H #define QMLSTATEOPERATIONS_H -#include +#include "qmlstate_p.h" #include -#include +#include "qmlgraphicsanchors_p.h" #include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmltransition_p.h b/src/declarative/util/qmltransition_p.h index 1891a6e..ebc8b79 100644 --- a/src/declarative/util/qmltransition_p.h +++ b/src/declarative/util/qmltransition_p.h @@ -43,7 +43,7 @@ #define QMLTRANSITION_H #include -#include +#include "qmlstate_p.h" #include QT_BEGIN_HEADER diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp index 1a164c7..da9a0dd 100644 --- a/src/declarative/util/qmltransitionmanager.cpp +++ b/src/declarative/util/qmltransitionmanager.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include -#include -#include +#include "qmltransitionmanager_p_p.h" +#include "qmlstate_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmltransitionmanager_p_p.h b/src/declarative/util/qmltransitionmanager_p_p.h index 9a05684..c7e609f 100644 --- a/src/declarative/util/qmltransitionmanager_p_p.h +++ b/src/declarative/util/qmltransitionmanager_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include +#include "qmlstateoperations_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp index afeead2..dc14730 100644 --- a/src/declarative/util/qmlview.cpp +++ b/src/declarative/util/qmlview.cpp @@ -53,16 +53,16 @@ #include "qml.h" #include "qmlgraphicsitem.h" -#include "private/qperformancelog_p_p.h" -#include "private/qfxperf_p_p.h" +#include "qperformancelog_p_p.h" +#include "qfxperf_p_p.h" #include "qmlview.h" #include #include -#include -#include +#include "qmldebug_p.h" +#include "qmldebugservice_p.h" #include -#include +#include "qmlglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h index 2fa1be8..2b46515 100644 --- a/src/declarative/util/qmlxmllistmodel_p.h +++ b/src/declarative/util/qmlxmllistmodel_p.h @@ -43,7 +43,7 @@ #define QMLXMLLISTMODEL_H #include -#include +#include "qlistmodelinterface_p.h" #include QT_BEGIN_HEADER diff --git a/src/declarative/widgets/graphicslayouts_p.h b/src/declarative/widgets/graphicslayouts_p.h index c44cb79..32517b6 100644 --- a/src/declarative/widgets/graphicslayouts_p.h +++ b/src/declarative/widgets/graphicslayouts_p.h @@ -42,7 +42,7 @@ #ifndef GRAPHICSLAYOUTS_H #define GRAPHICSLAYOUTS_H -#include +#include "graphicswidgets_p.h" #include #include -- cgit v0.12 From c25dba4228d958ccddeee22811cec7e40e1ccfc3 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Tue, 1 Dec 2009 12:17:48 +1000 Subject: Compile when in module. --- tools/qmlviewer/qmlviewer.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro index ed26d00..6cd41c6 100644 --- a/tools/qmlviewer/qmlviewer.pro +++ b/tools/qmlviewer/qmlviewer.pro @@ -23,6 +23,7 @@ SOURCES += main.cpp \ FORMS = recopts.ui \ proxysettings.ui INCLUDEPATH += ../../include/QtDeclarative +INCLUDEPATH += ../../src/declarative/util include(../shared/deviceskin/deviceskin.pri) target.path = $$[QT_INSTALL_BINS] INSTALLS += target -- cgit v0.12 From f3076897a43c1093ec19d4ea71cf4c923eb7a084 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Wed, 2 Dec 2009 15:07:06 +1000 Subject: Remove qlistmodelinterface.h duplicate --- examples/declarative/loader/loader.pro | 2 +- examples/declarative/loader/qlistmodelinterface.h | 85 ----------------------- examples/declarative/loader/qmlfolderlistmodel.h | 2 +- 3 files changed, 2 insertions(+), 87 deletions(-) delete mode 100644 examples/declarative/loader/qlistmodelinterface.h diff --git a/examples/declarative/loader/loader.pro b/examples/declarative/loader/loader.pro index edd6267..84b2d21 100644 --- a/examples/declarative/loader/loader.pro +++ b/examples/declarative/loader/loader.pro @@ -1,5 +1,5 @@ SOURCES = main.cpp qmlfolderlistmodel.cpp -HEADERS = qmlfolderlistmodel.h qlistmodelinterface.h +HEADERS = qmlfolderlistmodel.h RESOURCES = loader.qrc QT += script declarative network diff --git a/examples/declarative/loader/qlistmodelinterface.h b/examples/declarative/loader/qlistmodelinterface.h deleted file mode 100644 index 738378e..0000000 --- a/examples/declarative/loader/qlistmodelinterface.h +++ /dev/null @@ -1,85 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** 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. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** 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. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QLISTMODELINTERFACE_H -#define QLISTMODELINTERFACE_H - -#include -#include - - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Declarative) - -class Q_DECLARATIVE_EXPORT QListModelInterface : public QObject -{ - Q_OBJECT - public: - QListModelInterface(QObject *parent = 0) : QObject(parent) {} - virtual ~QListModelInterface() {} - - virtual int count() const = 0; - virtual QHash data(int index, const QList& roles = QList()) const = 0; - virtual bool setData(int index, const QHash& values) - { Q_UNUSED(index); Q_UNUSED(values); return false; } - - virtual QList roles() const = 0; - virtual QString toString(int role) const = 0; - - Q_SIGNALS: - void itemsInserted(int index, int count); - void itemsRemoved(int index, int count); - void itemsMoved(int from, int to, int count); - void itemsChanged(int index, int count, const QList &roles); - - protected: - QListModelInterface(QObjectPrivate &dd, QObject *parent) - : QObject(dd, parent) {} -}; - - -QT_END_NAMESPACE - -QT_END_HEADER -#endif //QTREEMODELINTERFACE_H diff --git a/examples/declarative/loader/qmlfolderlistmodel.h b/examples/declarative/loader/qmlfolderlistmodel.h index f50719a..ac9568f 100644 --- a/examples/declarative/loader/qmlfolderlistmodel.h +++ b/examples/declarative/loader/qmlfolderlistmodel.h @@ -43,7 +43,7 @@ #define QMLFOLDERLISTMODEL_H #include -#include "qlistmodelinterface.h" +#include "../../../src/declarative/3rdparty/qlistmodelinterface_p.h" class QmlContext; class QModelIndex; -- cgit v0.12 From 1893849a7e90781b85f15ac32bef972b0087a720 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Wed, 2 Dec 2009 15:35:32 +1000 Subject: Compile as module. --- tools/qmldebugger/creatorplugin/creatorplugin.pro | 1 + tools/qmldebugger/standalone/qmldebugger.pri | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tools/qmldebugger/creatorplugin/creatorplugin.pro b/tools/qmldebugger/creatorplugin/creatorplugin.pro index ff7f3da..55f7398 100644 --- a/tools/qmldebugger/creatorplugin/creatorplugin.pro +++ b/tools/qmldebugger/creatorplugin/creatorplugin.pro @@ -2,6 +2,7 @@ TEMPLATE = lib TARGET = QmlInspector INCLUDEPATH += . +INCLUDEPATH += ../../../src/declarative/debugger DEPENDPATH += . include(../standalone/qmldebugger.pri) diff --git a/tools/qmldebugger/standalone/qmldebugger.pri b/tools/qmldebugger/standalone/qmldebugger.pri index aad5eb1..ede7d31 100644 --- a/tools/qmldebugger/standalone/qmldebugger.pri +++ b/tools/qmldebugger/standalone/qmldebugger.pri @@ -1,6 +1,8 @@ QT += network declarative contains(QT_CONFIG, opengles2)|contains(QT_CONFIG, opengles1): QT += opengl +INCLUDEPATH += ../../../src/declarative/debugger + # Input HEADERS += $$PWD/canvasframerate.h \ $$PWD/watchtable.h \ -- cgit v0.12 From 289645d2bf46c1d6eace7a0d60389a9c10dd0c34 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Wed, 2 Dec 2009 15:35:43 +1000 Subject: Change from scaling/zooming by zoomFactor to instead use painter scaling. Uses a fixed zoomFactor of 4 to allow sufficient sub-"pixel" precision. --- demos/declarative/webbrowser/webbrowser.qml | 32 ++++++++---- .../graphicsitems/qmlgraphicspainteditem.cpp | 57 ++++++++++++++++++---- .../graphicsitems/qmlgraphicspainteditem_p.h | 8 ++- .../graphicsitems/qmlgraphicspainteditem_p_p.h | 3 +- .../graphicsitems/qmlgraphicswebview.cpp | 45 +++++++++-------- .../graphicsitems/qmlgraphicswebview_p.h | 4 +- 6 files changed, 107 insertions(+), 42 deletions(-) diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index 105bb07..11776aa 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -195,13 +195,14 @@ Item { smoothCache: true // We do want smooth rendering fillColor: "white" focus: true + zoomFactor: 4 onAlert: console.log(message) function doZoom(zoom,centerX,centerY) { if (centerX) { - var sc = zoom/zoomFactor; + var sc = zoom/contentsScale; scaleAnim.to = sc; flickVX.from = flickable.viewportX flickVX.to = Math.max(0,Math.min(centerX-flickable.width/2,webView.width*sc-flickable.width)) @@ -214,17 +215,28 @@ Item { } } + Keys.onLeftPressed: webView.contentsScale -= 0.1 + Keys.onRightPressed: webView.contentsScale += 0.1 + preferredWidth: flickable.width preferredHeight: flickable.height - zoomFactor: flickable.width > 980 ? 1 : flickable.width/980 - - onUrlChanged: { if (url != null) { editUrl.text = url.toString(); } } + contentsScale: 1/zoomFactor + onContentsSizeChanged: { + // zoom out + contentsScale = flickable.width / contentsSize.width + } + onUrlChanged: { + // got to topleft + flickable.viewportX = 0 + flickable.viewportY = 0 + if (url != null) { editUrl.text = url.toString(); } + } onDoubleClick: { if (!heuristicZoom(clickX,clickY,2.5)) { - var zf = flickable.width > 980 ? 1 : flickable.width/980; - if (zf > zoomFactor) - zf = 2.0 // zoom in (else zooming out) - doZoom(zf,clickX/zoomFactor*zf,clickY/zoomFactor*zf) + var zf = flickable.width / contentsSize.width + if (zf >= contentsScale) + zf = 2.0/zoomFactor // zoom in (else zooming out) + doZoom(zf,clickX*zf,clickY*zf) } } @@ -268,7 +280,7 @@ Item { PropertyAction { id: finalZoom target: webView - property: "zoomFactor" + property: "contentsScale" } PropertyAction { target: webView @@ -277,7 +289,7 @@ Item { } // Have to set the viewportXY, since the above 2 // size changes may have started a correction if - // zoomFactor < 1.0. + // contentsScale < 1.0. PropertyAction { id: finalX target: flickable diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp index 948f69a..b4bb361 100644 --- a/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp @@ -50,6 +50,7 @@ #include #include #include +#include QT_BEGIN_NAMESPACE @@ -98,9 +99,13 @@ static int inpaint_clearcache=0; void QmlGraphicsPaintedItem::dirtyCache(const QRect& rect) { Q_D(QmlGraphicsPaintedItem); + QRect srect(qCeil(rect.x()*d->contentsScale), + qCeil(rect.y()*d->contentsScale), + qCeil(rect.width()*d->contentsScale), + qCeil(rect.height()*d->contentsScale)); for (int i=0; i < d->imagecache.count(); ) { QmlGraphicsPaintedItemPrivate::ImageCacheItem *c = d->imagecache[i]; - QRect isect = (c->area & rect) | c->dirty; + QRect isect = (c->area & srect) | c->dirty; if (isect == c->area && !inpaint) { delete d->imagecache.takeAt(i); } else { @@ -147,10 +152,32 @@ void QmlGraphicsPaintedItem::setContentsSize(const QSize &size) Q_D(QmlGraphicsPaintedItem); if (d->contentsSize == size) return; d->contentsSize = size; + setImplicitWidth(size.width()*d->contentsScale); + setImplicitHeight(size.height()*d->contentsScale); clearCache(); update(); + emit contentsSizeChanged(); } +qreal QmlGraphicsPaintedItem::contentsScale() const +{ + Q_D(const QmlGraphicsPaintedItem); + return d->contentsScale; +} + +void QmlGraphicsPaintedItem::setContentsScale(qreal scale) +{ + Q_D(QmlGraphicsPaintedItem); + if (d->contentsScale == scale) return; + d->contentsScale = scale; + setImplicitWidth(d->contentsSize.width()*scale); + setImplicitHeight(d->contentsSize.height()*scale); + clearCache(); + update(); + emit contentsScaleChanged(); +} + + /*! Constructs a new QmlGraphicsPaintedItem with the given \a parent. */ @@ -204,7 +231,8 @@ void QmlGraphicsPaintedItem::setCacheFrozen(bool frozen) void QmlGraphicsPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *) { Q_D(QmlGraphicsPaintedItem); - const QRect content(QPoint(0,0),d->contentsSize); + const QRect content(0,0,qCeil(d->contentsSize.width()*d->contentsScale), + qCeil(d->contentsSize.height()*d->contentsScale)); if (content.width() <= 0 || content.height() <= 0) return; @@ -244,21 +272,27 @@ void QmlGraphicsPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem * if (!d->cachefrozen) { if (!d->imagecache[i]->dirty.isNull() && topaint.contains(d->imagecache[i]->dirty)) { QPainter qp(&d->imagecache[i]->image); - qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smoothCache); + qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smoothCache); qp.translate(-area.x(), -area.y()); + qp.scale(d->contentsScale,d->contentsScale); + QRect clip = d->imagecache[i]->dirty; + QRect sclip(qFloor(clip.x()/d->contentsScale), + qFloor(clip.y()/d->contentsScale), + qCeil(clip.width()/d->contentsScale+clip.x()/d->contentsScale-qFloor(clip.x()/d->contentsScale)), + qCeil(clip.height()/d->contentsScale+clip.y()/d->contentsScale-qFloor(clip.y()/d->contentsScale))); + qp.setClipRect(sclip); if (d->fillColor.isValid()){ if(d->fillColor.alpha() < 255){ // ### Might not work outside of raster paintengine QPainter::CompositionMode prev = qp.compositionMode(); qp.setCompositionMode(QPainter::CompositionMode_Source); - qp.fillRect(d->imagecache[i]->dirty,d->fillColor); + qp.fillRect(sclip,d->fillColor); qp.setCompositionMode(prev); }else{ - qp.fillRect(d->imagecache[i]->dirty,d->fillColor); + qp.fillRect(sclip,d->fillColor); } } - qp.setClipRect(d->imagecache[i]->dirty); - drawContents(&qp, d->imagecache[i]->dirty); + drawContents(&qp, sclip); d->imagecache[i]->dirty = QRect(); } } @@ -300,10 +334,15 @@ void QmlGraphicsPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem * img.fill(d->fillColor); { QPainter qp(&img); - qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smoothCache); + qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smoothCache); qp.translate(-r.x(),-r.y()); - drawContents(&qp, r); + qp.scale(d->contentsScale,d->contentsScale); + QRect sclip(qFloor(r.x()/d->contentsScale), + qFloor(r.y()/d->contentsScale), + 1+qCeil(r.width()/d->contentsScale+r.x()/d->contentsScale-qFloor(r.x()/d->contentsScale)), + 1+qCeil(r.height()/d->contentsScale+r.y()/d->contentsScale-qFloor(r.y()/d->contentsScale))); + drawContents(&qp, sclip); } QmlGraphicsPaintedItemPrivate::ImageCacheItem *newitem = new QmlGraphicsPaintedItemPrivate::ImageCacheItem; newitem->area = r; diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h index f6bb078..d59f6d1 100644 --- a/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h @@ -56,10 +56,11 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsPaintedItem : public QmlGraphicsItem { Q_OBJECT - Q_PROPERTY(QSize contentsSize READ contentsSize WRITE setContentsSize) + Q_PROPERTY(QSize contentsSize READ contentsSize WRITE setContentsSize NOTIFY contentsSizeChanged) Q_PROPERTY(QColor fillColor READ fillColor WRITE setFillColor NOTIFY fillColorChanged) Q_PROPERTY(int pixelCacheSize READ pixelCacheSize WRITE setPixelCacheSize) Q_PROPERTY(bool smoothCache READ smoothCache WRITE setSmoothCache) + Q_PROPERTY(qreal contentsScale READ contentsScale WRITE setContentsScale NOTIFY contentsScaleChanged) public: @@ -69,6 +70,9 @@ public: QSize contentsSize() const; void setContentsSize(const QSize &); + qreal contentsScale() const; + void setContentsScale(qreal); + int pixelCacheSize() const; void setPixelCacheSize(int pixels); @@ -89,6 +93,8 @@ protected: Q_SIGNALS: void fillColorChanged(); + void contentsSizeChanged(); + void contentsScaleChanged(); protected Q_SLOTS: void dirtyCache(const QRect &); diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h index a49bbdf..6bcc51a 100644 --- a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h @@ -63,7 +63,7 @@ class QmlGraphicsPaintedItemPrivate : public QmlGraphicsItemPrivate public: QmlGraphicsPaintedItemPrivate() - : max_imagecache_size(100000), fillColor(Qt::transparent), cachefrozen(false), smoothCache(true) + : max_imagecache_size(100000), contentsScale(1.0), fillColor(Qt::transparent), cachefrozen(false), smoothCache(true) { } @@ -80,6 +80,7 @@ public: int max_imagecache_size; QSize contentsSize; + qreal contentsScale; QColor fillColor; bool cachefrozen; bool smoothCache; diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp index 0a1587e..c9ba37b 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp @@ -349,7 +349,9 @@ void QmlGraphicsWebView::setPreferredWidth(int iw) Q_D(QmlGraphicsWebView); if (d->preferredwidth == iw) return; d->preferredwidth = iw; - expandToWebPage(); + if (d->preferredwidth > 0 && d->preferredheight > 0) + page()->setPreferredContentsSize(QSize(d->preferredwidth,d->preferredheight)); + //expandToWebPage(); emit preferredWidthChanged(); } @@ -368,6 +370,8 @@ void QmlGraphicsWebView::setPreferredHeight(int ih) Q_D(QmlGraphicsWebView); if (d->preferredheight == ih) return; d->preferredheight = ih; + if (d->preferredwidth > 0 && d->preferredheight > 0) + page()->setPreferredContentsSize(QSize(d->preferredwidth,d->preferredheight)); emit preferredHeightChanged(); } @@ -397,7 +401,7 @@ void QmlGraphicsWebView::initialLayout() // nothing useful to do at this point } -void QmlGraphicsWebView::contentsSizeChanged(const QSize&) +void QmlGraphicsWebView::noteContentsSizeChanged(const QSize&) { expandToWebPage(); } @@ -416,10 +420,9 @@ void QmlGraphicsWebView::expandToWebPage() cs.setHeight(height()); if (cs != page()->viewportSize()) { page()->setViewportSize(cs); - clearCache(); - setImplicitWidth(cs.width()); - setImplicitHeight(cs.height()); } + if (cs != contentsSize()) + setContentsSize(cs); } void QmlGraphicsWebView::geometryChanged(const QRectF &newGeometry, @@ -432,9 +435,6 @@ void QmlGraphicsWebView::geometryChanged(const QRectF &newGeometry, void QmlGraphicsWebView::paintPage(const QRect& r) { - Q_D(QmlGraphicsWebView); - if (d->page->mainFrame()->contentsSize() != contentsSize()) - setContentsSize(d->page->mainFrame()->contentsSize()); dirtyCache(r); update(); } @@ -536,7 +536,7 @@ void QmlGraphicsWebView::drawContents(QPainter *p, const QRect &r) page()->mainFrame()->render(p,r); } -static QMouseEvent *sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *e) +QMouseEvent *QmlGraphicsWebView::sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *e) { QEvent::Type t; switch(e->type()) { @@ -555,15 +555,15 @@ static QMouseEvent *sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *e) break; } - QMouseEvent *me = new QMouseEvent(t, e->pos().toPoint(), e->button(), e->buttons(), 0); + QMouseEvent *me = new QMouseEvent(t, (e->pos()/contentsScale()).toPoint(), e->button(), e->buttons(), 0); return me; } -static QMouseEvent *sceneHoverMoveEventToMouseEvent(QGraphicsSceneHoverEvent *e) +QMouseEvent *QmlGraphicsWebView::sceneHoverMoveEventToMouseEvent(QGraphicsSceneHoverEvent *e) { QEvent::Type t = QEvent::MouseMove; - QMouseEvent *me = new QMouseEvent(t, e->pos().toPoint(), Qt::NoButton, Qt::NoButton, 0); + QMouseEvent *me = new QMouseEvent(t, (e->pos()/contentsScale()).toPoint(), Qt::NoButton, Qt::NoButton, 0); return me; } @@ -601,15 +601,15 @@ void QmlGraphicsWebView::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) bool QmlGraphicsWebView::heuristicZoom(int clickX, int clickY, qreal maxzoom) { Q_D(QmlGraphicsWebView); - qreal ozf = zoomFactor(); - if (ozf >= maxzoom) + if (contentsScale() >= maxzoom/zoomFactor()) return false; + qreal ozf = contentsScale(); QRect showarea = elementAreaAt(clickX, clickY, d->preferredwidth/maxzoom, d->preferredheight/maxzoom); - qreal z = qMin(qreal(d->preferredwidth)*ozf/showarea.width(),qreal(d->preferredheight)*ozf/showarea.height()); - if (z > maxzoom) - z = maxzoom; - if (z/ozf > 1.1) { - QRectF r(showarea.left()/ozf*z, showarea.top()/ozf*z, showarea.width()/ozf*z, showarea.height()/ozf*z); + qreal z = qMin(qreal(d->preferredwidth)/showarea.width(),qreal(d->preferredheight)/showarea.height()); + if (z > maxzoom/zoomFactor()) + z = maxzoom/zoomFactor(); + if (z/ozf > 1.2) { + QRectF r(showarea.left()*z, showarea.top()*z, showarea.width()*z, showarea.height()*z); emit zoomTo(z,r.x()+r.width()/2, r.y()+r.height()/2); return true; } else { @@ -963,7 +963,7 @@ void QmlGraphicsWebView::setPage(QWebPage *page) connect(d->page->mainFrame(),SIGNAL(urlChanged(QUrl)),this,SLOT(pageUrlChanged())); connect(d->page->mainFrame(), SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString))); connect(d->page->mainFrame(), SIGNAL(iconChanged()), this, SIGNAL(iconChanged())); - connect(d->page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)), this, SLOT(contentsSizeChanged(QSize))); + connect(d->page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)), this, SLOT(noteContentsSizeChanged(QSize))); connect(d->page->mainFrame(), SIGNAL(initialLayoutCompleted()), this, SLOT(initialLayout())); connect(d->page,SIGNAL(loadStarted()),this,SLOT(doLoadStarted())); @@ -1204,6 +1204,7 @@ QString QmlGraphicsWebPage::chooseFile(QWebFrame *originatingFrame, const QStrin void QmlGraphicsWebPage::javaScriptAlert(QWebFrame *originatingFrame, const QString& msg) { + Q_UNUSED(originatingFrame) emit viewItem()->alert(msg); } @@ -1218,6 +1219,10 @@ bool QmlGraphicsWebPage::javaScriptConfirm(QWebFrame *originatingFrame, const QS bool QmlGraphicsWebPage::javaScriptPrompt(QWebFrame *originatingFrame, const QString& msg, const QString& defaultValue, QString* result) { // Not supported (it's modal) + Q_UNUSED(originatingFrame) + Q_UNUSED(msg) + Q_UNUSED(defaultValue) + Q_UNUSED(result) return false; } diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h index 1e44263..2280697 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h @@ -210,7 +210,7 @@ private Q_SLOTS: void setStatusText(const QString&); void windowObjectCleared(); void pageUrlChanged(); - void contentsSizeChanged(const QSize&); + void noteContentsSizeChanged(const QSize&); void initialLayout(); protected: @@ -235,6 +235,8 @@ private: virtual void componentComplete(); Q_DISABLE_COPY(QmlGraphicsWebView) Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsWebView) + QMouseEvent *sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *); + QMouseEvent *sceneHoverMoveEventToMouseEvent(QGraphicsSceneHoverEvent *); friend class QmlGraphicsWebPage; }; -- cgit v0.12 From 37b4fd7b6615b5e73b0fb71d56df98302ec90de3 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Wed, 2 Dec 2009 16:23:26 +1000 Subject: Restructure for easier re-use. --- .../webbrowser/content/FlickableWebView.qml | 162 ++++++++++++ .../webbrowser/content/RectSoftShadow.qml | 2 +- .../content/RetractingWebBrowserHeader.qml | 106 ++++++++ .../webbrowser/content/fieldtext/FieldText.qml | 161 ++++++++++++ .../webbrowser/content/fieldtext/pics/cancel.png | Bin 0 -> 1038 bytes .../webbrowser/content/fieldtext/pics/ok.png | Bin 0 -> 655 bytes .../declarative/webbrowser/fieldtext/FieldText.qml | 161 ------------ .../webbrowser/fieldtext/pics/cancel.png | Bin 1038 -> 0 bytes demos/declarative/webbrowser/fieldtext/pics/ok.png | Bin 655 -> 0 bytes demos/declarative/webbrowser/webbrowser.qml | 284 +-------------------- 10 files changed, 437 insertions(+), 439 deletions(-) create mode 100644 demos/declarative/webbrowser/content/FlickableWebView.qml create mode 100644 demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml create mode 100644 demos/declarative/webbrowser/content/fieldtext/FieldText.qml create mode 100644 demos/declarative/webbrowser/content/fieldtext/pics/cancel.png create mode 100644 demos/declarative/webbrowser/content/fieldtext/pics/ok.png delete mode 100644 demos/declarative/webbrowser/fieldtext/FieldText.qml delete mode 100644 demos/declarative/webbrowser/fieldtext/pics/cancel.png delete mode 100644 demos/declarative/webbrowser/fieldtext/pics/ok.png diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml new file mode 100644 index 0000000..09a3c04 --- /dev/null +++ b/demos/declarative/webbrowser/content/FlickableWebView.qml @@ -0,0 +1,162 @@ +import Qt 4.6 + +Flickable { + property alias title: webView.title + property alias progress: webView.progress + property alias url: webView.url + property alias back: webView.back + property alias reload: webView.reload + property alias forward: webView.forward + + id: flickable + width: parent.width + viewportWidth: Math.max(parent.width,webView.width*webView.scale) + viewportHeight: Math.max(parent.height,webView.height*webView.scale) + anchors.top: headerSpace.bottom + anchors.bottom: footer.top + anchors.left: parent.left + anchors.right: parent.right + pressDelay: 200 + + WebView { + id: webView + pixelCacheSize: 4000000 + + Script { + function fixUrl(url) + { + if (url == "") return url + if (url[0] == "/") return "file://"+url + if (url.indexOf(":")<0) { + if (url.indexOf(".")<0 || url.indexOf(" ")>=0) { + // Fall back to a search engine; hard-code Wikipedia + return "http://en.wikipedia.org/w/index.php?search="+url + } else { + return "http://"+url + } + } + return url + } + } + + url: fixUrl(webBrowser.urlString) + smooth: false // We don't want smooth scaling, since we only scale during (fast) transitions + smoothCache: true // We do want smooth rendering + fillColor: "white" + focus: true + zoomFactor: 4 + + onAlert: console.log(message) + + function doZoom(zoom,centerX,centerY) + { + if (centerX) { + var sc = zoom/contentsScale; + scaleAnim.to = sc; + flickVX.from = flickable.viewportX + flickVX.to = Math.max(0,Math.min(centerX-flickable.width/2,webView.width*sc-flickable.width)) + finalX.value = flickVX.to + flickVY.from = flickable.viewportY + flickVY.to = Math.max(0,Math.min(centerY-flickable.height/2,webView.height*sc-flickable.height)) + finalY.value = flickVY.to + finalZoom.value = zoom + quickZoom.start() + } + } + + Keys.onLeftPressed: webView.contentsScale -= 0.1 + Keys.onRightPressed: webView.contentsScale += 0.1 + + preferredWidth: flickable.width + preferredHeight: flickable.height + contentsScale: 1/zoomFactor + onContentsSizeChanged: { + // zoom out + contentsScale = flickable.width / contentsSize.width + } + onUrlChanged: { + // got to topleft + flickable.viewportX = 0 + flickable.viewportY = 0 + if (url != null) { header.editUrl = url.toString(); } + } + onDoubleClick: { + if (!heuristicZoom(clickX,clickY,2.5)) { + var zf = flickable.width / contentsSize.width + if (zf >= contentsScale) + zf = 2.0/zoomFactor // zoom in (else zooming out) + doZoom(zf,clickX*zf,clickY*zf) + } + } + + SequentialAnimation { + id: quickZoom + + PropertyAction { + target: webView + property: "renderingEnabled" + value: false + } + ParallelAnimation { + NumberAnimation { + id: scaleAnim + target: webView + property: "scale" + from: 1 + to: 0 // set before calling + easing: "easeLinear" + duration: 200 + } + NumberAnimation { + id: flickVX + target: flickable + property: "viewportX" + easing: "easeLinear" + duration: 200 + from: 0 // set before calling + to: 0 // set before calling + } + NumberAnimation { + id: flickVY + target: flickable + property: "viewportY" + easing: "easeLinear" + duration: 200 + from: 0 // set before calling + to: 0 // set before calling + } + } + PropertyAction { + id: finalZoom + target: webView + property: "contentsScale" + } + PropertyAction { + target: webView + property: "scale" + value: 1.0 + } + // Have to set the viewportXY, since the above 2 + // size changes may have started a correction if + // contentsScale < 1.0. + PropertyAction { + id: finalX + target: flickable + property: "viewportX" + value: 0 // set before calling + } + PropertyAction { + id: finalY + target: flickable + property: "viewportY" + value: 0 // set before calling + } + PropertyAction { + target: webView + property: "renderingEnabled" + value: true + } + } + onZoomTo: doZoom(zoom,centerX,centerY) + } +} diff --git a/demos/declarative/webbrowser/content/RectSoftShadow.qml b/demos/declarative/webbrowser/content/RectSoftShadow.qml index 6bba98e..5b6d4ec 100644 --- a/demos/declarative/webbrowser/content/RectSoftShadow.qml +++ b/demos/declarative/webbrowser/content/RectSoftShadow.qml @@ -26,7 +26,7 @@ Item { source: "pics/softshadow-bottom.png" x: 0 y: parent.height - width: webView.width*webView.scale + width: parent.width height: 16 } } diff --git a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml new file mode 100644 index 0000000..a7e6a97 --- /dev/null +++ b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml @@ -0,0 +1,106 @@ +import Qt 4.6 + +import "fieldtext" + +Image { + property alias editUrl: editUrl.text + + id: header + source: "pics/header.png" + width: parent.width + height: 60 + x: webView.viewportX < 0 ? -webView.viewportX : webView.viewportX > webView.viewportWidth-webView.width + ? -webView.viewportX+webView.viewportWidth-webView.width : 0 + y: webView.viewportY < 0 ? -webView.viewportY : progressOff* + (webView.viewportY>height?-height:-webView.viewportY) + Text { + id: headerText + + text: webView.title!='' || webView.progress == 1.0 ? webView.title : 'Loading...' + elide: Text.ElideRight + + color: "white" + styleColor: "black" + style: Text.Raised + + font.family: "Helvetica" + font.pointSize: 10 + font.bold: true + + anchors.left: header.left + anchors.right: header.right + anchors.leftMargin: 4 + anchors.rightMargin: 4 + anchors.top: header.top + anchors.topMargin: 4 + horizontalAlignment: Text.AlignHCenter + } + Item { + width: parent.width + anchors.top: headerText.bottom + anchors.topMargin: 2 + anchors.bottom: parent.bottom + + Item { + id: urlBox + height: 31 + anchors.left: parent.left + anchors.leftMargin: 12 + anchors.right: parent.right + anchors.rightMargin: 12 + anchors.top: parent.top + clip: true + property bool mouseGrabbed: false + + BorderImage { + source: "pics/addressbar.sci" + anchors.fill: urlBox + } + + BorderImage { + id: urlBoxhl + source: "pics/addressbar-filled.sci" + width: parent.width*webView.progress + height: parent.height + opacity: 1-header.progressOff + clip: true + } + + FieldText { + id: editUrl + mouseGrabbed: parent.mouseGrabbed + + text: webBrowser.urlString + label: "url:" + onConfirmed: { webBrowser.urlString = editUrl.text; webView.focus=true } + onCancelled: { webView.focus=true } + onStartEdit: { webView.focus=false } + + anchors.left: urlBox.left + anchors.right: urlBox.right + anchors.leftMargin: 6 + anchors.verticalCenter: urlBox.verticalCenter + anchors.verticalCenterOffset: 1 + } + } + } + + property real progressOff : 1 + states: [ + State { + name: "ProgressShown" + when: webView.progress < 1.0 + PropertyChanges { target: header; progressOff: 0; } + } + ] + transitions: [ + Transition { + NumberAnimation { + matchTargets: header + matchProperties: "progressOff" + easing: "easeInOutQuad" + duration: 300 + } + } + ] +} diff --git a/demos/declarative/webbrowser/content/fieldtext/FieldText.qml b/demos/declarative/webbrowser/content/fieldtext/FieldText.qml new file mode 100644 index 0000000..6b1d271 --- /dev/null +++ b/demos/declarative/webbrowser/content/fieldtext/FieldText.qml @@ -0,0 +1,161 @@ +import Qt 4.6 + +Item { + id: fieldText + height: 30 + property string text: "" + property string label: "" + property bool mouseGrabbed: false + signal confirmed + signal cancelled + signal startEdit + + Script { + + function edit() { + if (!mouseGrabbed) { + fieldText.startEdit(); + fieldText.state='editing'; + mouseGrabbed=true; + } + } + + function confirm() { + fieldText.state=''; + fieldText.text = textEdit.text; + mouseGrabbed=false; + fieldText.confirmed(); + } + + function reset() { + textEdit.text = fieldText.text; + fieldText.state=''; + mouseGrabbed=false; + fieldText.cancelled(); + } + + } + + Image { + id: cancelIcon + width: 22 + height: 22 + anchors.right: parent.right + anchors.rightMargin: 4 + anchors.verticalCenter: parent.verticalCenter + source: "pics/cancel.png" + opacity: 0 + } + + Image { + id: confirmIcon + width: 22 + height: 22 + anchors.left: parent.left + anchors.leftMargin: 4 + anchors.verticalCenter: parent.verticalCenter + source: "pics/ok.png" + opacity: 0 + } + + TextInput { + id: textEdit + text: fieldText.text + focus: false + anchors.left: parent.left + anchors.leftMargin: 0 + anchors.right: parent.right + anchors.rightMargin: 0 + anchors.verticalCenter: parent.verticalCenter + color: "black" + font.bold: true + readOnly: true + onAccepted: confirm() + Keys.onEscapePressed: reset() + } + + Text { + id: textLabel + x: 5 + width: parent.width-10 + anchors.verticalCenter: parent.verticalCenter + horizontalAlignment: Text.AlignHCenter + color: fieldText.state == "editing" ? "#505050" : "#AAAAAA" + font.italic: true + font.bold: true + text: label + opacity: textEdit.text == '' ? 1 : 0 + opacity: Behavior { + NumberAnimation { + property: "opacity" + duration: 250 + } + } + } + + MouseRegion { + anchors.fill: cancelIcon + onClicked: { reset() } + } + + MouseRegion { + anchors.fill: confirmIcon + onClicked: { confirm() } + } + + MouseRegion { + id: editRegion + anchors.fill: textEdit + onClicked: { edit() } + } + + states: [ + State { + name: "editing" + PropertyChanges { + target: confirmIcon + opacity: 1 + } + PropertyChanges { + target: cancelIcon + opacity: 1 + } + PropertyChanges { + target: textEdit + color: "black" + readOnly: false + focus: true + selectionStart: 0 + selectionEnd: -1 + } + PropertyChanges { + target: editRegion + opacity: 0 + } + PropertyChanges { + target: textEdit.anchors + leftMargin: 34 + } + PropertyChanges { + target: textEdit.anchors + rightMargin: 34 + } + } + ] + + transitions: [ + Transition { + from: "" + to: "*" + reversible: true + NumberAnimation { + matchProperties: "opacity,leftMargin,rightMargin" + duration: 200 + } + ColorAnimation { + property: "color" + duration: 150 + } + } + ] +} diff --git a/demos/declarative/webbrowser/content/fieldtext/pics/cancel.png b/demos/declarative/webbrowser/content/fieldtext/pics/cancel.png new file mode 100644 index 0000000..ecc9533 Binary files /dev/null and b/demos/declarative/webbrowser/content/fieldtext/pics/cancel.png differ diff --git a/demos/declarative/webbrowser/content/fieldtext/pics/ok.png b/demos/declarative/webbrowser/content/fieldtext/pics/ok.png new file mode 100644 index 0000000..5795f04 Binary files /dev/null and b/demos/declarative/webbrowser/content/fieldtext/pics/ok.png differ diff --git a/demos/declarative/webbrowser/fieldtext/FieldText.qml b/demos/declarative/webbrowser/fieldtext/FieldText.qml deleted file mode 100644 index 6b1d271..0000000 --- a/demos/declarative/webbrowser/fieldtext/FieldText.qml +++ /dev/null @@ -1,161 +0,0 @@ -import Qt 4.6 - -Item { - id: fieldText - height: 30 - property string text: "" - property string label: "" - property bool mouseGrabbed: false - signal confirmed - signal cancelled - signal startEdit - - Script { - - function edit() { - if (!mouseGrabbed) { - fieldText.startEdit(); - fieldText.state='editing'; - mouseGrabbed=true; - } - } - - function confirm() { - fieldText.state=''; - fieldText.text = textEdit.text; - mouseGrabbed=false; - fieldText.confirmed(); - } - - function reset() { - textEdit.text = fieldText.text; - fieldText.state=''; - mouseGrabbed=false; - fieldText.cancelled(); - } - - } - - Image { - id: cancelIcon - width: 22 - height: 22 - anchors.right: parent.right - anchors.rightMargin: 4 - anchors.verticalCenter: parent.verticalCenter - source: "pics/cancel.png" - opacity: 0 - } - - Image { - id: confirmIcon - width: 22 - height: 22 - anchors.left: parent.left - anchors.leftMargin: 4 - anchors.verticalCenter: parent.verticalCenter - source: "pics/ok.png" - opacity: 0 - } - - TextInput { - id: textEdit - text: fieldText.text - focus: false - anchors.left: parent.left - anchors.leftMargin: 0 - anchors.right: parent.right - anchors.rightMargin: 0 - anchors.verticalCenter: parent.verticalCenter - color: "black" - font.bold: true - readOnly: true - onAccepted: confirm() - Keys.onEscapePressed: reset() - } - - Text { - id: textLabel - x: 5 - width: parent.width-10 - anchors.verticalCenter: parent.verticalCenter - horizontalAlignment: Text.AlignHCenter - color: fieldText.state == "editing" ? "#505050" : "#AAAAAA" - font.italic: true - font.bold: true - text: label - opacity: textEdit.text == '' ? 1 : 0 - opacity: Behavior { - NumberAnimation { - property: "opacity" - duration: 250 - } - } - } - - MouseRegion { - anchors.fill: cancelIcon - onClicked: { reset() } - } - - MouseRegion { - anchors.fill: confirmIcon - onClicked: { confirm() } - } - - MouseRegion { - id: editRegion - anchors.fill: textEdit - onClicked: { edit() } - } - - states: [ - State { - name: "editing" - PropertyChanges { - target: confirmIcon - opacity: 1 - } - PropertyChanges { - target: cancelIcon - opacity: 1 - } - PropertyChanges { - target: textEdit - color: "black" - readOnly: false - focus: true - selectionStart: 0 - selectionEnd: -1 - } - PropertyChanges { - target: editRegion - opacity: 0 - } - PropertyChanges { - target: textEdit.anchors - leftMargin: 34 - } - PropertyChanges { - target: textEdit.anchors - rightMargin: 34 - } - } - ] - - transitions: [ - Transition { - from: "" - to: "*" - reversible: true - NumberAnimation { - matchProperties: "opacity,leftMargin,rightMargin" - duration: 200 - } - ColorAnimation { - property: "color" - duration: 150 - } - } - ] -} diff --git a/demos/declarative/webbrowser/fieldtext/pics/cancel.png b/demos/declarative/webbrowser/fieldtext/pics/cancel.png deleted file mode 100644 index ecc9533..0000000 Binary files a/demos/declarative/webbrowser/fieldtext/pics/cancel.png and /dev/null differ diff --git a/demos/declarative/webbrowser/fieldtext/pics/ok.png b/demos/declarative/webbrowser/fieldtext/pics/ok.png deleted file mode 100644 index 5795f04..0000000 Binary files a/demos/declarative/webbrowser/fieldtext/pics/ok.png and /dev/null differ diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index 11776aa..3b3790c 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -1,15 +1,12 @@ import Qt 4.6 import "content" -import "fieldtext" Item { id: webBrowser property string urlString : "http://qt.nokia.com/" - state: "Normal" - width: 640 height: 480 @@ -33,10 +30,10 @@ Item { anchors.bottom: footer.top } RectSoftShadow { - x: -flickable.viewportX - y: -flickable.viewportY - width: webView.width*webView.scale - height: flickable.y+webView.height*webView.scale + x: -webView.viewportX + y: -webView.viewportY + width: webView.viewportWidth + height: webView.viewportHeight+headerSpace.height } Item { id: headerSpace @@ -44,282 +41,15 @@ Item { height: 60 z: 1 - Rectangle { - id: headerSpaceTint - color: "black" - opacity: 0 - anchors.fill: parent - } - - Image { - id: header - source: "content/pics/header.png" - width: parent.width - height: 60 - state: "Normal" - x: flickable.viewportX < 0 ? -flickable.viewportX : flickable.viewportX > flickable.viewportWidth-flickable.width - ? -flickable.viewportX+flickable.viewportWidth-flickable.width : 0 - y: flickable.viewportY < 0 ? -flickable.viewportY : progressOff* - (flickable.viewportY>height?-height:-flickable.viewportY) - Text { - id: headerText - - text: webView.title!='' || webView.progress == 1.0 ? webView.title : 'Loading...' - elide: Text.ElideRight - - color: "white" - styleColor: "black" - style: Text.Raised - - font.family: "Helvetica" - font.pointSize: 10 - font.bold: true - - anchors.left: header.left - anchors.right: header.right - anchors.leftMargin: 4 - anchors.rightMargin: 4 - anchors.top: header.top - anchors.topMargin: 4 - horizontalAlignment: Text.AlignHCenter - } - Item { - width: parent.width - anchors.top: headerText.bottom - anchors.topMargin: 2 - anchors.bottom: parent.bottom - - Item { - id: urlBox - height: 31 - anchors.left: parent.left - anchors.leftMargin: 12 - anchors.right: parent.right - anchors.rightMargin: 12 - anchors.top: parent.top - clip: true - property bool mouseGrabbed: false - - BorderImage { - source: "content/pics/addressbar.sci" - anchors.fill: urlBox - } - - BorderImage { - id: urlBoxhl - source: "content/pics/addressbar-filled.sci" - width: parent.width*webView.progress - height: parent.height - opacity: 1-header.progressOff - clip: true - } - - FieldText { - id: editUrl - mouseGrabbed: parent.mouseGrabbed - - text: webBrowser.urlString - label: "url:" - onConfirmed: { webBrowser.urlString = editUrl.text; webView.focus=true } - onCancelled: { webView.focus=true } - onStartEdit: { webView.focus=false } - - anchors.left: urlBox.left - anchors.right: urlBox.right - anchors.leftMargin: 6 - anchors.verticalCenter: urlBox.verticalCenter - anchors.verticalCenterOffset: 1 - } - } - } - - property real progressOff : 1 - states: [ - State { - name: "Normal" - when: webView.progress == 1.0 - PropertyChanges { target: header; progressOff: 1 } - }, - State { - name: "ProgressShown" - when: webView.progress < 1.0 - PropertyChanges { target: header; progressOff: 0; } - } - ] - transitions: [ - Transition { - NumberAnimation { - matchTargets: header - matchProperties: "progressOff" - easing: "easeInOutQuad" - duration: 300 - } - } - ] - } + RetractingWebBrowserHeader { id: header } } - Flickable { - id: flickable + FlickableWebView { + id: webView width: parent.width - viewportWidth: Math.max(parent.width,webView.width*webView.scale) - viewportHeight: Math.max(parent.height,webView.height*webView.scale) anchors.top: headerSpace.bottom anchors.bottom: footer.top anchors.left: parent.left anchors.right: parent.right - pressDelay: 200 - - WebView { - id: webView - pixelCacheSize: 4000000 - - Script { - function fixUrl(url) - { - if (url == "") return url - if (url[0] == "/") return "file://"+url - if (url.indexOf(":")<0) { - if (url.indexOf(".")<0 || url.indexOf(" ")>=0) { - // Fall back to a search engine; hard-code Wikipedia - return "http://en.wikipedia.org/w/index.php?search="+url - } else { - return "http://"+url - } - } - return url - } - } - - url: fixUrl(webBrowser.urlString) - smooth: false // We don't want smooth scaling, since we only scale during (fast) transitions - smoothCache: true // We do want smooth rendering - fillColor: "white" - focus: true - zoomFactor: 4 - - onAlert: console.log(message) - - function doZoom(zoom,centerX,centerY) - { - if (centerX) { - var sc = zoom/contentsScale; - scaleAnim.to = sc; - flickVX.from = flickable.viewportX - flickVX.to = Math.max(0,Math.min(centerX-flickable.width/2,webView.width*sc-flickable.width)) - finalX.value = flickVX.to - flickVY.from = flickable.viewportY - flickVY.to = Math.max(0,Math.min(centerY-flickable.height/2,webView.height*sc-flickable.height)) - finalY.value = flickVY.to - finalZoom.value = zoom - quickZoom.start() - } - } - - Keys.onLeftPressed: webView.contentsScale -= 0.1 - Keys.onRightPressed: webView.contentsScale += 0.1 - - preferredWidth: flickable.width - preferredHeight: flickable.height - contentsScale: 1/zoomFactor - onContentsSizeChanged: { - // zoom out - contentsScale = flickable.width / contentsSize.width - } - onUrlChanged: { - // got to topleft - flickable.viewportX = 0 - flickable.viewportY = 0 - if (url != null) { editUrl.text = url.toString(); } - } - onDoubleClick: { - if (!heuristicZoom(clickX,clickY,2.5)) { - var zf = flickable.width / contentsSize.width - if (zf >= contentsScale) - zf = 2.0/zoomFactor // zoom in (else zooming out) - doZoom(zf,clickX*zf,clickY*zf) - } - } - - SequentialAnimation { - id: quickZoom - - PropertyAction { - target: webView - property: "renderingEnabled" - value: false - } - ParallelAnimation { - NumberAnimation { - id: scaleAnim - target: webView - property: "scale" - from: 1 - to: 0 // set before calling - easing: "easeLinear" - duration: 200 - } - NumberAnimation { - id: flickVX - target: flickable - property: "viewportX" - easing: "easeLinear" - duration: 200 - from: 0 // set before calling - to: 0 // set before calling - } - NumberAnimation { - id: flickVY - target: flickable - property: "viewportY" - easing: "easeLinear" - duration: 200 - from: 0 // set before calling - to: 0 // set before calling - } - } - PropertyAction { - id: finalZoom - target: webView - property: "contentsScale" - } - PropertyAction { - target: webView - property: "scale" - value: 1.0 - } - // Have to set the viewportXY, since the above 2 - // size changes may have started a correction if - // contentsScale < 1.0. - PropertyAction { - id: finalX - target: flickable - property: "viewportX" - value: 0 // set before calling - } - PropertyAction { - id: finalY - target: flickable - property: "viewportY" - value: 0 // set before calling - } - PropertyAction { - target: webView - property: "renderingEnabled" - value: true - } - } - onZoomTo: doZoom(zoom,centerX,centerY) - } - Rectangle { - id: webViewTint - color: "black" - opacity: 0 - anchors.fill: webView - /*MouseRegion { - anchors.fill: WebViewTint - onClicked: { proxy.focus=false } - }*/ - } } BorderImage { id: footer -- cgit v0.12 From 4c8fdfca8b31916f9a130c163914ded7eb391807 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Wed, 2 Dec 2009 16:59:13 +1000 Subject: Fix initial scaling. QWebPage::setPreferredSize doesn't really work. --- demos/declarative/webbrowser/content/FlickableWebView.qml | 6 +++--- src/declarative/graphicsitems/qmlgraphicswebview.cpp | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml index 09a3c04..7c46d4c 100644 --- a/demos/declarative/webbrowser/content/FlickableWebView.qml +++ b/demos/declarative/webbrowser/content/FlickableWebView.qml @@ -67,12 +67,12 @@ Flickable { Keys.onLeftPressed: webView.contentsScale -= 0.1 Keys.onRightPressed: webView.contentsScale += 0.1 - preferredWidth: flickable.width - preferredHeight: flickable.height + preferredWidth: flickable.width*zoomFactor + preferredHeight: flickable.height*zoomFactor contentsScale: 1/zoomFactor onContentsSizeChanged: { // zoom out - contentsScale = flickable.width / contentsSize.width + contentsScale = Math.min(0.25,flickable.width / contentsSize.width) } onUrlChanged: { // got to topleft diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp index c9ba37b..35dd1f0 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp @@ -317,8 +317,6 @@ void QmlGraphicsWebView::setUrl(const QUrl &url) page()->setViewportSize(QSize( d->preferredwidth>0 ? d->preferredwidth : width(), d->preferredheight>0 ? d->preferredheight : height())); - if (d->preferredwidth > 0 && d->preferredheight > 0) - page()->setPreferredContentsSize(QSize(d->preferredwidth,d->preferredheight)); QUrl seturl = url; if (seturl.isEmpty()) seturl = QUrl(QLatin1String("about:blank")); @@ -349,8 +347,6 @@ void QmlGraphicsWebView::setPreferredWidth(int iw) Q_D(QmlGraphicsWebView); if (d->preferredwidth == iw) return; d->preferredwidth = iw; - if (d->preferredwidth > 0 && d->preferredheight > 0) - page()->setPreferredContentsSize(QSize(d->preferredwidth,d->preferredheight)); //expandToWebPage(); emit preferredWidthChanged(); } @@ -370,8 +366,6 @@ void QmlGraphicsWebView::setPreferredHeight(int ih) Q_D(QmlGraphicsWebView); if (d->preferredheight == ih) return; d->preferredheight = ih; - if (d->preferredwidth > 0 && d->preferredheight > 0) - page()->setPreferredContentsSize(QSize(d->preferredwidth,d->preferredheight)); emit preferredHeightChanged(); } -- cgit v0.12