Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

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

Location:
trunk
Files:
3 edited
200 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/include/QtDeclarative/QtDeclarative

    r561 r846  
    11#ifndef QT_QTDECLARATIVE_MODULE_H
    22#define QT_QTDECLARATIVE_MODULE_H
     3#include <QtCore/QtCore>
     4#include <QtGui/QtGui>
     5#include <QtScript/QtScript>
     6#include <QtNetwork/QtNetwork>
     7#include "qdeclarative.h"
     8#include "qdeclarativecomponent.h"
     9#include "qdeclarativecontext.h"
     10#include "qdeclarativeengine.h"
     11#include "qdeclarativeerror.h"
     12#include "qdeclarativeexpression.h"
     13#include "qdeclarativeextensioninterface.h"
     14#include "qdeclarativeextensionplugin.h"
     15#include "qdeclarativeimageprovider.h"
     16#include "qdeclarativeinfo.h"
     17#include "qdeclarativelist.h"
     18#include "qdeclarativenetworkaccessmanagerfactory.h"
     19#include "qdeclarativeparserstatus.h"
     20#include "qdeclarativeprivate.h"
     21#include "qdeclarativeproperty.h"
     22#include "qdeclarativepropertyvalueinterceptor.h"
     23#include "qdeclarativepropertyvaluesource.h"
     24#include "qdeclarativescriptstring.h"
     25#include "qdeclarativeitem.h"
     26#include "qdeclarativepropertymap.h"
     27#include "qdeclarativeview.h"
    328#endif

  • trunk/include/QtDeclarative/headers.pri

    r561 r846  
    1 SYNCQT.HEADER_FILES = ../../include/QtDeclarative/QtDeclarative
    2 SYNCQT.HEADER_CLASSES =
    3 SYNCQT.PRIVATE_HEADER_FILES =
     1SYNCQT.HEADER_FILES = ../declarative/qml/qdeclarative.h ../declarative/qml/qdeclarativecomponent.h ../declarative/qml/qdeclarativecontext.h ../declarative/qml/qdeclarativeengine.h ../declarative/qml/qdeclarativeerror.h ../declarative/qml/qdeclarativeexpression.h ../declarative/qml/qdeclarativeextensioninterface.h ../declarative/qml/qdeclarativeextensionplugin.h ../declarative/qml/qdeclarativeimageprovider.h ../declarative/qml/qdeclarativeinfo.h ../declarative/qml/qdeclarativelist.h ../declarative/qml/qdeclarativenetworkaccessmanagerfactory.h ../declarative/qml/qdeclarativeparserstatus.h ../declarative/qml/qdeclarativeprivate.h ../declarative/qml/qdeclarativeproperty.h ../declarative/qml/qdeclarativepropertyvalueinterceptor.h ../declarative/qml/qdeclarativepropertyvaluesource.h ../declarative/qml/qdeclarativescriptstring.h ../declarative/graphicsitems/qdeclarativeitem.h ../declarative/util/qdeclarativepropertymap.h ../declarative/util/qdeclarativeview.h ../../include/QtDeclarative/QtDeclarative
     2SYNCQT.HEADER_CLASSES = ../../include/QtDeclarative/QDeclarativeComponent ../../include/QtDeclarative/QDeclarativeContext ../../include/QtDeclarative/QDeclarativeEngine ../../include/QtDeclarative/QDeclarativeError ../../include/QtDeclarative/QDeclarativeExpression ../../include/QtDeclarative/QDeclarativeExtensionInterface ../../include/QtDeclarative/QDeclarativeExtensionPlugin ../../include/QtDeclarative/QDeclarativeImageProvider ../../include/QtDeclarative/QDeclarativeInfo ../../include/QtDeclarative/QDeclarativeListProperty ../../include/QtDeclarative/QDeclarativeListReference ../../include/QtDeclarative/QDeclarativeNetworkAccessManagerFactory ../../include/QtDeclarative/QDeclarativeParserStatus ../../include/QtDeclarative/QDeclarativeAttachedPropertiesFunc ../../include/QtDeclarative/QDeclarativeTypeInfo ../../include/QtDeclarative/QDeclarativeProperty ../../include/QtDeclarative/QDeclarativeProperties ../../include/QtDeclarative/QDeclarativePropertyValueInterceptor ../../include/QtDeclarative/QDeclarativePropertyValueSource ../../include/QtDeclarative/QDeclarativeScriptString ../../include/QtDeclarative/QDeclarativeItem ../../include/QtDeclarative/QDeclarativePropertyMap ../../include/QtDeclarative/QDeclarativeView
     3SYNCQT.PRIVATE_HEADER_FILES = ../declarative/qml/qbitfield_p.h ../declarative/qml/qdeclarativebinding_p.h ../declarative/qml/qdeclarativebinding_p_p.h ../declarative/qml/qdeclarativeboundsignal_p.h ../declarative/qml/qdeclarativecleanup_p.h ../declarative/qml/qdeclarativecompiledbindings_p.h ../declarative/qml/qdeclarativecompiler_p.h ../declarative/qml/qdeclarativecomponent_p.h ../declarative/qml/qdeclarativecontext_p.h ../declarative/qml/qdeclarativecontextscriptclass_p.h ../declarative/qml/qdeclarativecustomparser_p.h ../declarative/qml/qdeclarativecustomparser_p_p.h ../declarative/qml/qdeclarativedata_p.h ../declarative/qml/qdeclarativedirparser_p.h ../declarative/qml/qdeclarativedom_p.h ../declarative/qml/qdeclarativedom_p_p.h ../declarative/qml/qdeclarativeengine_p.h ../declarative/qml/qdeclarativeenginedebug_p.h ../declarative/qml/qdeclarativeexpression_p.h ../declarative/qml/qdeclarativefastproperties_p.h ../declarative/qml/qdeclarativeglobal_p.h ../declarative/qml/qdeclarativeglobalscriptclass_p.h ../declarative/qml/qdeclarativeguard_p.h ../declarative/qml/qdeclarativeimport_p.h ../declarative/qml/qdeclarativeinclude_p.h ../declarative/qml/qdeclarativeinstruction_p.h ../declarative/qml/qdeclarativeintegercache_p.h ../declarative/qml/qdeclarativelist_p.h ../declarative/qml/qdeclarativelistscriptclass_p.h ../declarative/qml/qdeclarativemetatype_p.h ../declarative/qml/qdeclarativenotifier_p.h ../declarative/qml/qdeclarativeobjectscriptclass_p.h ../declarative/qml/qdeclarativeparser_p.h ../declarative/qml/qdeclarativeproperty_p.h ../declarative/qml/qdeclarativepropertycache_p.h ../declarative/qml/qdeclarativeproxymetaobject_p.h ../declarative/qml/qdeclarativerefcount_p.h ../declarative/qml/qdeclarativerewrite_p.h ../declarative/qml/qdeclarativescriptparser_p.h ../declarative/qml/qdeclarativesqldatabase_p.h ../declarative/qml/qdeclarativestringconverters_p.h ../declarative/qml/qdeclarativetypeloader_p.h ../declarative/qml/qdeclarativetypenamecache_p.h ../declarative/qml/qdeclarativetypenamescriptclass_p.h ../declarative/qml/qdeclarativetypenotavailable_p.h ../declarative/qml/qdeclarativevaluetype_p.h ../declarative/qml/qdeclarativevaluetypescriptclass_p.h ../declarative/qml/qdeclarativevme_p.h ../declarative/qml/qdeclarativevmemetaobject_p.h ../declarative/qml/qdeclarativewatcher_p.h ../declarative/qml/qdeclarativeworkerscript_p.h ../declarative/qml/qdeclarativexmlhttprequest_p.h ../declarative/qml/qmetaobjectbuilder_p.h ../declarative/qml/qpodvector_p.h ../declarative/graphicsitems/qdeclarativeanchors_p.h ../declarative/graphicsitems/qdeclarativeanchors_p_p.h ../declarative/graphicsitems/qdeclarativeanimatedimage_p.h ../declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h ../declarative/graphicsitems/qdeclarativeborderimage_p.h ../declarative/graphicsitems/qdeclarativeborderimage_p_p.h ../declarative/graphicsitems/qdeclarativeevents_p_p.h ../declarative/graphicsitems/qdeclarativeflickable_p.h ../declarative/graphicsitems/qdeclarativeflickable_p_p.h ../declarative/graphicsitems/qdeclarativeflipable_p.h ../declarative/graphicsitems/qdeclarativefocuspanel_p.h ../declarative/graphicsitems/qdeclarativefocusscope_p.h ../declarative/graphicsitems/qdeclarativegraphicswidget_p.h ../declarative/graphicsitems/qdeclarativegridview_p.h ../declarative/graphicsitems/qdeclarativeimage_p.h ../declarative/graphicsitems/qdeclarativeimage_p_p.h ../declarative/graphicsitems/qdeclarativeimagebase_p.h ../declarative/graphicsitems/qdeclarativeimagebase_p_p.h ../declarative/graphicsitems/qdeclarativeitem_p.h ../declarative/graphicsitems/qdeclarativeitemchangelistener_p.h ../declarative/graphicsitems/qdeclarativeitemsmodule_p.h ../declarative/graphicsitems/qdeclarativelayoutitem_p.h ../declarative/graphicsitems/qdeclarativelistview_p.h ../declarative/graphicsitems/qdeclarativeloader_p.h ../declarative/graphicsitems/qdeclarativeloader_p_p.h ../declarative/graphicsitems/qdeclarativemousearea_p.h ../declarative/graphicsitems/qdeclarativemousearea_p_p.h ../declarative/graphicsitems/qdeclarativepainteditem_p.h ../declarative/graphicsitems/qdeclarativepainteditem_p_p.h ../declarative/graphicsitems/qdeclarativepath_p.h ../declarative/graphicsitems/qdeclarativepath_p_p.h ../declarative/graphicsitems/qdeclarativepathview_p.h ../declarative/graphicsitems/qdeclarativepathview_p_p.h ../declarative/graphicsitems/qdeclarativepositioners_p.h ../declarative/graphicsitems/qdeclarativepositioners_p_p.h ../declarative/graphicsitems/qdeclarativerectangle_p.h ../declarative/graphicsitems/qdeclarativerectangle_p_p.h ../declarative/graphicsitems/qdeclarativerepeater_p.h ../declarative/graphicsitems/qdeclarativerepeater_p_p.h ../declarative/graphicsitems/qdeclarativescalegrid_p_p.h ../declarative/graphicsitems/qdeclarativetext_p.h ../declarative/graphicsitems/qdeclarativetext_p_p.h ../declarative/graphicsitems/qdeclarativetextedit_p.h ../declarative/graphicsitems/qdeclarativetextedit_p_p.h ../declarative/graphicsitems/qdeclarativetextinput_p.h ../declarative/graphicsitems/qdeclarativetextinput_p_p.h ../declarative/graphicsitems/qdeclarativetextlayout_p.h ../declarative/graphicsitems/qdeclarativetranslate_p.h ../declarative/graphicsitems/qdeclarativevisualitemmodel_p.h ../declarative/debugger/qdeclarativedebug_p.h ../declarative/debugger/qdeclarativedebugclient_p.h ../declarative/debugger/qdeclarativedebuggerstatus_p.h ../declarative/debugger/qdeclarativedebughelper_p.h ../declarative/debugger/qdeclarativedebugserver_p.h ../declarative/debugger/qdeclarativedebugserverconnection_p.h ../declarative/debugger/qdeclarativedebugservice_p.h ../declarative/debugger/qdeclarativedebugservice_p_p.h ../declarative/debugger/qdeclarativedebugtrace_p.h ../declarative/debugger/qpacketprotocol_p.h ../declarative/util/qdeclarativeanimation_p.h ../declarative/util/qdeclarativeanimation_p_p.h ../declarative/util/qdeclarativebehavior_p.h ../declarative/util/qdeclarativebind_p.h ../declarative/util/qdeclarativeconnections_p.h ../declarative/util/qdeclarativefontloader_p.h ../declarative/util/qdeclarativelistaccessor_p.h ../declarative/util/qdeclarativelistmodel_p.h ../declarative/util/qdeclarativelistmodel_p_p.h ../declarative/util/qdeclarativelistmodelworkeragent_p.h ../declarative/util/qdeclarativenullablevalue_p_p.h ../declarative/util/qdeclarativeopenmetaobject_p.h ../declarative/util/qdeclarativepackage_p.h ../declarative/util/qdeclarativepixmapcache_p.h ../declarative/util/qdeclarativepropertychanges_p.h ../declarative/util/qdeclarativesmoothedanimation_p.h ../declarative/util/qdeclarativesmoothedanimation_p_p.h ../declarative/util/qdeclarativespringanimation_p.h ../declarative/util/qdeclarativestate_p.h ../declarative/util/qdeclarativestate_p_p.h ../declarative/util/qdeclarativestategroup_p.h ../declarative/util/qdeclarativestateoperations_p.h ../declarative/util/qdeclarativestyledtext_p.h ../declarative/util/qdeclarativesystempalette_p.h ../declarative/util/qdeclarativetimeline_p_p.h ../declarative/util/qdeclarativetimer_p.h ../declarative/util/qdeclarativetransition_p.h ../declarative/util/qdeclarativetransitionmanager_p_p.h ../declarative/util/qdeclarativeutilmodule_p.h ../declarative/util/qdeclarativexmllistmodel_p.h ../declarative/util/qlistmodelinterface_p.h ../declarative/qml/parser/qdeclarativejsast_p.h ../declarative/qml/parser/qdeclarativejsastfwd_p.h ../declarative/qml/parser/qdeclarativejsastvisitor_p.h ../declarative/qml/parser/qdeclarativejsengine_p.h ../declarative/qml/parser/qdeclarativejsglobal_p.h ../declarative/qml/parser/qdeclarativejsgrammar_p.h ../declarative/qml/parser/qdeclarativejslexer_p.h ../declarative/qml/parser/qdeclarativejsmemorypool_p.h ../declarative/qml/parser/qdeclarativejsnodepool_p.h ../declarative/qml/parser/qdeclarativejsparser_p.h ../declarative/qml/rewriter/textwriter_p.h
Note: See TracChangeset for help on using the changeset viewer.