From ab694f173485205e42f99fc775b4ea10765f517c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 3 Dec 2009 11:07:02 +0100 Subject: clean up project files --- src/declarative/3rdparty/3rdparty.pri | 6 +- src/declarative/debugger/debugger.pri | 24 ++- src/declarative/declarative.pro | 2 - src/declarative/graphicsitems/graphicsitems.pri | 162 +++++++++-------- src/declarative/qml/parser/parser.pri | 37 ++-- src/declarative/qml/qml.pri | 232 ++++++++++++------------ src/declarative/qml/rewriter/rewriter.pri | 2 - src/declarative/util/util.pri | 124 ++++++------- src/declarative/widgets/widgets.pri | 13 +- 9 files changed, 305 insertions(+), 297 deletions(-) diff --git a/src/declarative/3rdparty/3rdparty.pri b/src/declarative/3rdparty/3rdparty.pri index 09cf0bb..fbdcc11 100644 --- a/src/declarative/3rdparty/3rdparty.pri +++ b/src/declarative/3rdparty/3rdparty.pri @@ -1,5 +1,7 @@ +INCLUDEPATH += $$PWD + HEADERS += \ - 3rdparty/qlistmodelinterface_p.h\ + $$PWD/qlistmodelinterface_p.h\ SOURCES += \ - 3rdparty/qlistmodelinterface.cpp \ + $$PWD/qlistmodelinterface.cpp \ diff --git a/src/declarative/debugger/debugger.pri b/src/declarative/debugger/debugger.pri index 6cffb28..261b2ff 100644 --- a/src/declarative/debugger/debugger.pri +++ b/src/declarative/debugger/debugger.pri @@ -1,11 +1,15 @@ -SOURCES += debugger/qmldebuggerstatus.cpp \ - debugger/qpacketprotocol.cpp \ - debugger/qmldebugservice.cpp \ - debugger/qmldebugclient.cpp \ - debugger/qmldebug.cpp +INCLUDEPATH += $$PWD -HEADERS += debugger/qmldebuggerstatus_p.h \ - debugger/qpacketprotocol_p.h \ - debugger/qmldebugservice_p.h \ - debugger/qmldebugclient_p.h \ - debugger/qmldebug_p.h +SOURCES += \ + $$PWD/qmldebuggerstatus.cpp \ + $$PWD/qpacketprotocol.cpp \ + $$PWD/qmldebugservice.cpp \ + $$PWD/qmldebugclient.cpp \ + $$PWD/qmldebug.cpp + +HEADERS += \ + $$PWD/qmldebuggerstatus_p.h \ + $$PWD/qpacketprotocol_p.h \ + $$PWD/qmldebugservice_p.h \ + $$PWD/qmldebugclient_p.h \ + $$PWD/qmldebug_p.h diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 8cadc53..0669d13 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -14,8 +14,6 @@ exists("qml_enable_gcov") { LIBS += -lgcov } -#INCLUDEPATH += 3rdparty util graphicsitems debugger qml - include(../qbase.pri) #modules diff --git a/src/declarative/graphicsitems/graphicsitems.pri b/src/declarative/graphicsitems/graphicsitems.pri index 5675130..728c9c0 100644 --- a/src/declarative/graphicsitems/graphicsitems.pri +++ b/src/declarative/graphicsitems/graphicsitems.pri @@ -1,87 +1,89 @@ +INCLUDEPATH += $$PWD + HEADERS += \ - graphicsitems/qmlgraphicsanchors_p.h \ - graphicsitems/qmlgraphicsanchors_p_p.h \ - graphicsitems/qmlgraphicsevents_p_p.h \ - graphicsitems/qmlgraphicsflickable_p.h \ - graphicsitems/qmlgraphicsflickable_p_p.h \ - graphicsitems/qmlgraphicsflipable_p.h \ - graphicsitems/qmlgraphicsgridview_p.h \ - graphicsitems/qmlgraphicsimage_p.h \ - graphicsitems/qmlgraphicsimagebase_p.h \ - graphicsitems/qmlgraphicsborderimage_p.h \ - graphicsitems/qmlgraphicspainteditem_p.h \ - graphicsitems/qmlgraphicspainteditem_p_p.h \ - graphicsitems/qmlgraphicsimage_p_p.h \ - graphicsitems/qmlgraphicsborderimage_p_p.h \ - graphicsitems/qmlgraphicsimagebase_p_p.h \ - graphicsitems/qmlgraphicsanimatedimage_p.h \ - graphicsitems/qmlgraphicsanimatedimage_p_p.h \ - graphicsitems/qmlgraphicsitem.h \ - graphicsitems/qmlgraphicsitem_p.h \ - graphicsitems/qmlgraphicsfocuspanel_p.h \ - graphicsitems/qmlgraphicsfocusscope_p.h \ - graphicsitems/qmlgraphicspositioners_p.h \ - graphicsitems/qmlgraphicspositioners_p_p.h \ - graphicsitems/qmlgraphicsloader_p.h \ - graphicsitems/qmlgraphicsloader_p_p.h \ - graphicsitems/qmlgraphicsmouseregion_p.h \ - graphicsitems/qmlgraphicsmouseregion_p_p.h \ - graphicsitems/qmlgraphicspath_p.h \ - graphicsitems/qmlgraphicspath_p_p.h \ - graphicsitems/qmlgraphicspathview_p.h \ - graphicsitems/qmlgraphicspathview_p_p.h \ - graphicsitems/qmlgraphicsrectangle_p.h \ - graphicsitems/qmlgraphicsrectangle_p_p.h \ - graphicsitems/qmlgraphicsrepeater_p.h \ - graphicsitems/qmlgraphicsrepeater_p_p.h \ - graphicsitems/qmlgraphicsscalegrid_p_p.h \ - graphicsitems/qmlgraphicstextinput_p.h \ - graphicsitems/qmlgraphicstextinput_p_p.h \ - graphicsitems/qmlgraphicstextedit_p.h \ - graphicsitems/qmlgraphicstextedit_p_p.h \ - graphicsitems/qmlgraphicstext_p.h \ - graphicsitems/qmlgraphicstext_p_p.h \ - graphicsitems/qmlgraphicsvisualitemmodel_p.h \ - graphicsitems/qmlgraphicslistview_p.h \ - graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h \ - graphicsitems/qmlgraphicsparticles_p.h \ - graphicsitems/qmlgraphicslayoutitem_p.h \ - graphicsitems/qmlgraphicseffects.cpp + $$PWD/qmlgraphicsanchors_p.h \ + $$PWD/qmlgraphicsanchors_p_p.h \ + $$PWD/qmlgraphicsevents_p_p.h \ + $$PWD/qmlgraphicsflickable_p.h \ + $$PWD/qmlgraphicsflickable_p_p.h \ + $$PWD/qmlgraphicsflipable_p.h \ + $$PWD/qmlgraphicsgridview_p.h \ + $$PWD/qmlgraphicsimage_p.h \ + $$PWD/qmlgraphicsimagebase_p.h \ + $$PWD/qmlgraphicsborderimage_p.h \ + $$PWD/qmlgraphicspainteditem_p.h \ + $$PWD/qmlgraphicspainteditem_p_p.h \ + $$PWD/qmlgraphicsimage_p_p.h \ + $$PWD/qmlgraphicsborderimage_p_p.h \ + $$PWD/qmlgraphicsimagebase_p_p.h \ + $$PWD/qmlgraphicsanimatedimage_p.h \ + $$PWD/qmlgraphicsanimatedimage_p_p.h \ + $$PWD/qmlgraphicsitem.h \ + $$PWD/qmlgraphicsitem_p.h \ + $$PWD/qmlgraphicsfocuspanel_p.h \ + $$PWD/qmlgraphicsfocusscope_p.h \ + $$PWD/qmlgraphicspositioners_p.h \ + $$PWD/qmlgraphicspositioners_p_p.h \ + $$PWD/qmlgraphicsloader_p.h \ + $$PWD/qmlgraphicsloader_p_p.h \ + $$PWD/qmlgraphicsmouseregion_p.h \ + $$PWD/qmlgraphicsmouseregion_p_p.h \ + $$PWD/qmlgraphicspath_p.h \ + $$PWD/qmlgraphicspath_p_p.h \ + $$PWD/qmlgraphicspathview_p.h \ + $$PWD/qmlgraphicspathview_p_p.h \ + $$PWD/qmlgraphicsrectangle_p.h \ + $$PWD/qmlgraphicsrectangle_p_p.h \ + $$PWD/qmlgraphicsrepeater_p.h \ + $$PWD/qmlgraphicsrepeater_p_p.h \ + $$PWD/qmlgraphicsscalegrid_p_p.h \ + $$PWD/qmlgraphicstextinput_p.h \ + $$PWD/qmlgraphicstextinput_p_p.h \ + $$PWD/qmlgraphicstextedit_p.h \ + $$PWD/qmlgraphicstextedit_p_p.h \ + $$PWD/qmlgraphicstext_p.h \ + $$PWD/qmlgraphicstext_p_p.h \ + $$PWD/qmlgraphicsvisualitemmodel_p.h \ + $$PWD/qmlgraphicslistview_p.h \ + $$PWD/qmlgraphicsgraphicsobjectcontainer_p.h \ + $$PWD/qmlgraphicsparticles_p.h \ + $$PWD/qmlgraphicslayoutitem_p.h \ + $$PWD/qmlgraphicseffects.cpp SOURCES += \ - graphicsitems/qmlgraphicsanchors.cpp \ - graphicsitems/qmlgraphicsevents.cpp \ - graphicsitems/qmlgraphicsflickable.cpp \ - graphicsitems/qmlgraphicsflipable.cpp \ - graphicsitems/qmlgraphicsgridview.cpp \ - graphicsitems/qmlgraphicsimage.cpp \ - graphicsitems/qmlgraphicsborderimage.cpp \ - graphicsitems/qmlgraphicsimagebase.cpp \ - graphicsitems/qmlgraphicsanimatedimage.cpp \ - graphicsitems/qmlgraphicspainteditem.cpp \ - graphicsitems/qmlgraphicsitem.cpp \ - graphicsitems/qmlgraphicsfocuspanel.cpp \ - graphicsitems/qmlgraphicsfocusscope.cpp \ - graphicsitems/qmlgraphicspositioners.cpp \ - graphicsitems/qmlgraphicsloader.cpp \ - graphicsitems/qmlgraphicsmouseregion.cpp \ - graphicsitems/qmlgraphicspath.cpp \ - graphicsitems/qmlgraphicspathview.cpp \ - graphicsitems/qmlgraphicsrectangle.cpp \ - graphicsitems/qmlgraphicsrepeater.cpp \ - graphicsitems/qmlgraphicsscalegrid.cpp \ - graphicsitems/qmlgraphicstextinput.cpp \ - graphicsitems/qmlgraphicstext.cpp \ - graphicsitems/qmlgraphicstextedit.cpp \ - graphicsitems/qmlgraphicsvisualitemmodel.cpp \ - graphicsitems/qmlgraphicslistview.cpp \ - graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp \ - graphicsitems/qmlgraphicsparticles.cpp \ - graphicsitems/qmlgraphicslayoutitem.cpp \ + $$PWD/qmlgraphicsanchors.cpp \ + $$PWD/qmlgraphicsevents.cpp \ + $$PWD/qmlgraphicsflickable.cpp \ + $$PWD/qmlgraphicsflipable.cpp \ + $$PWD/qmlgraphicsgridview.cpp \ + $$PWD/qmlgraphicsimage.cpp \ + $$PWD/qmlgraphicsborderimage.cpp \ + $$PWD/qmlgraphicsimagebase.cpp \ + $$PWD/qmlgraphicsanimatedimage.cpp \ + $$PWD/qmlgraphicspainteditem.cpp \ + $$PWD/qmlgraphicsitem.cpp \ + $$PWD/qmlgraphicsfocuspanel.cpp \ + $$PWD/qmlgraphicsfocusscope.cpp \ + $$PWD/qmlgraphicspositioners.cpp \ + $$PWD/qmlgraphicsloader.cpp \ + $$PWD/qmlgraphicsmouseregion.cpp \ + $$PWD/qmlgraphicspath.cpp \ + $$PWD/qmlgraphicspathview.cpp \ + $$PWD/qmlgraphicsrectangle.cpp \ + $$PWD/qmlgraphicsrepeater.cpp \ + $$PWD/qmlgraphicsscalegrid.cpp \ + $$PWD/qmlgraphicstextinput.cpp \ + $$PWD/qmlgraphicstext.cpp \ + $$PWD/qmlgraphicstextedit.cpp \ + $$PWD/qmlgraphicsvisualitemmodel.cpp \ + $$PWD/qmlgraphicslistview.cpp \ + $$PWD/qmlgraphicsgraphicsobjectcontainer.cpp \ + $$PWD/qmlgraphicsparticles.cpp \ + $$PWD/qmlgraphicslayoutitem.cpp \ contains(QT_CONFIG, webkit) { QT+=webkit - SOURCES += graphicsitems/qmlgraphicswebview.cpp - HEADERS += graphicsitems/qmlgraphicswebview_p.h - HEADERS += graphicsitems/qmlgraphicswebview_p_p.h + SOURCES += $$PWD/qmlgraphicswebview.cpp + HEADERS += $$PWD/qmlgraphicswebview_p.h + HEADERS += $$PWD/qmlgraphicswebview_p_p.h } diff --git a/src/declarative/qml/parser/parser.pri b/src/declarative/qml/parser/parser.pri index 986b146..4530479 100644 --- a/src/declarative/qml/parser/parser.pri +++ b/src/declarative/qml/parser/parser.pri @@ -1,22 +1,21 @@ - INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -HEADERS += $$PWD/qmljsast_p.h \ - $$PWD/qmljsastfwd_p.h \ - $$PWD/qmljsastvisitor_p.h \ - $$PWD/qmljsengine_p.h \ - $$PWD/qmljsgrammar_p.h \ - $$PWD/qmljslexer_p.h \ - $$PWD/qmljsmemorypool_p.h \ - $$PWD/qmljsnodepool_p.h \ - $$PWD/qmljsparser_p.h \ - $$PWD/qmljsglobal_p.h -SOURCES += $$PWD/qmljsast.cpp \ - $$PWD/qmljsastvisitor.cpp \ - $$PWD/qmljsengine_p.cpp \ - $$PWD/qmljsgrammar.cpp \ - $$PWD/qmljslexer.cpp \ - $$PWD/qmljsparser.cpp +HEADERS += \ + $$PWD/qmljsast_p.h \ + $$PWD/qmljsastfwd_p.h \ + $$PWD/qmljsastvisitor_p.h \ + $$PWD/qmljsengine_p.h \ + $$PWD/qmljsgrammar_p.h \ + $$PWD/qmljslexer_p.h \ + $$PWD/qmljsmemorypool_p.h \ + $$PWD/qmljsnodepool_p.h \ + $$PWD/qmljsparser_p.h \ + $$PWD/qmljsglobal_p.h +SOURCES += \ + $$PWD/qmljsast.cpp \ + $$PWD/qmljsastvisitor.cpp \ + $$PWD/qmljsengine_p.cpp \ + $$PWD/qmljsgrammar.cpp \ + $$PWD/qmljslexer.cpp \ + $$PWD/qmljsparser.cpp diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index 2167ab3..1155a36 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -1,118 +1,122 @@ -SOURCES += qml/qmlparser.cpp \ - qml/qmlinstruction.cpp \ - qml/qmlvmemetaobject.cpp \ - qml/qmlengine.cpp \ - qml/qmlexpression.cpp \ - qml/qmlbinding.cpp \ - qml/qmlmetaproperty.cpp \ - qml/qmlcomponent.cpp \ - qml/qmlcontext.cpp \ - qml/qmlcustomparser.cpp \ - qml/qmlpropertyvaluesource.cpp \ - qml/qmlpropertyvalueinterceptor.cpp \ - qml/qmlproxymetaobject.cpp \ - qml/qmlvme.cpp \ - qml/qmlcompiler.cpp \ - qml/qmlcompileddata.cpp \ - qml/qmlboundsignal.cpp \ - qml/qmldom.cpp \ - qml/qmlrefcount.cpp \ - qml/qmlprivate.cpp \ - qml/qmlmetatype.cpp \ - qml/qmlstringconverters.cpp \ - qml/qmlclassfactory.cpp \ - qml/qmlparserstatus.cpp \ - qml/qmlcompositetypemanager.cpp \ - qml/qmlinfo.cpp \ - qml/qmlerror.cpp \ - qml/qmlscriptparser.cpp \ - qml/qmlenginedebug.cpp \ - qml/qmlrewrite.cpp \ - qml/qmlbasicscript.cpp \ - qml/qmlvaluetype.cpp \ - qml/qmlbindingoptimizations.cpp \ - qml/qmlxmlhttprequest.cpp \ - qml/qmlsqldatabase.cpp \ - qml/qmetaobjectbuilder.cpp \ - qml/qmlwatcher.cpp \ - qml/qmlscript.cpp \ - qml/qmlcleanup.cpp \ - qml/qmlpropertycache.cpp \ - qml/qmlintegercache.cpp \ - qml/qmltypenamecache.cpp \ - qml/qmlscriptstring.cpp \ - qml/qmlobjectscriptclass.cpp \ - qml/qmlcontextscriptclass.cpp \ - qml/qmlglobalscriptclass.cpp \ - qml/qmlvaluetypescriptclass.cpp \ - qml/qmltypenamescriptclass.cpp \ - qml/qmllistscriptclass.cpp \ - qml/qmlworkerscript.cpp +INCLUDEPATH += $$PWD + +SOURCES += \ + $$PWD/qmlparser.cpp \ + $$PWD/qmlinstruction.cpp \ + $$PWD/qmlvmemetaobject.cpp \ + $$PWD/qmlengine.cpp \ + $$PWD/qmlexpression.cpp \ + $$PWD/qmlbinding.cpp \ + $$PWD/qmlmetaproperty.cpp \ + $$PWD/qmlcomponent.cpp \ + $$PWD/qmlcontext.cpp \ + $$PWD/qmlcustomparser.cpp \ + $$PWD/qmlpropertyvaluesource.cpp \ + $$PWD/qmlpropertyvalueinterceptor.cpp \ + $$PWD/qmlproxymetaobject.cpp \ + $$PWD/qmlvme.cpp \ + $$PWD/qmlcompiler.cpp \ + $$PWD/qmlcompileddata.cpp \ + $$PWD/qmlboundsignal.cpp \ + $$PWD/qmldom.cpp \ + $$PWD/qmlrefcount.cpp \ + $$PWD/qmlprivate.cpp \ + $$PWD/qmlmetatype.cpp \ + $$PWD/qmlstringconverters.cpp \ + $$PWD/qmlclassfactory.cpp \ + $$PWD/qmlparserstatus.cpp \ + $$PWD/qmlcompositetypemanager.cpp \ + $$PWD/qmlinfo.cpp \ + $$PWD/qmlerror.cpp \ + $$PWD/qmlscriptparser.cpp \ + $$PWD/qmlenginedebug.cpp \ + $$PWD/qmlrewrite.cpp \ + $$PWD/qmlbasicscript.cpp \ + $$PWD/qmlvaluetype.cpp \ + $$PWD/qmlbindingoptimizations.cpp \ + $$PWD/qmlxmlhttprequest.cpp \ + $$PWD/qmlsqldatabase.cpp \ + $$PWD/qmetaobjectbuilder.cpp \ + $$PWD/qmlwatcher.cpp \ + $$PWD/qmlscript.cpp \ + $$PWD/qmlcleanup.cpp \ + $$PWD/qmlpropertycache.cpp \ + $$PWD/qmlintegercache.cpp \ + $$PWD/qmltypenamecache.cpp \ + $$PWD/qmlscriptstring.cpp \ + $$PWD/qmlobjectscriptclass.cpp \ + $$PWD/qmlcontextscriptclass.cpp \ + $$PWD/qmlglobalscriptclass.cpp \ + $$PWD/qmlvaluetypescriptclass.cpp \ + $$PWD/qmltypenamescriptclass.cpp \ + $$PWD/qmllistscriptclass.cpp \ + $$PWD/qmlworkerscript.cpp + +HEADERS += \ + $$PWD/qmlparser_p.h \ + $$PWD/qmlglobal_p.h \ + $$PWD/qmlinstruction_p.h \ + $$PWD/qmlvmemetaobject_p.h \ + $$PWD/qml.h \ + $$PWD/qmlbinding.h \ + $$PWD/qmlbinding_p.h \ + $$PWD/qmlmetaproperty.h \ + $$PWD/qmlcomponent.h \ + $$PWD/qmlcomponent_p.h \ + $$PWD/qmlcustomparser_p.h \ + $$PWD/qmlcustomparser_p_p.h \ + $$PWD/qmlpropertyvaluesource.h \ + $$PWD/qmlpropertyvalueinterceptor.h \ + $$PWD/qmlboundsignal_p.h \ + $$PWD/qmlparserstatus.h \ + $$PWD/qmlproxymetaobject_p.h \ + $$PWD/qmlvme_p.h \ + $$PWD/qmlcompiler_p.h \ + $$PWD/qmlengine_p.h \ + $$PWD/qmlexpression_p.h \ + $$PWD/qmlprivate.h \ + $$PWD/qmldom.h \ + $$PWD/qmldom_p.h \ + $$PWD/qmlrefcount_p.h \ + $$PWD/qmlmetatype.h \ + $$PWD/qmlengine.h \ + $$PWD/qmlcontext.h \ + $$PWD/qmlexpression.h \ + $$PWD/qmlstringconverters_p.h \ + $$PWD/qmlclassfactory_p.h \ + $$PWD/qmlinfo.h \ + $$PWD/qmlmetaproperty_p.h \ + $$PWD/qmlcontext_p.h \ + $$PWD/qmlcompositetypedata_p.h \ + $$PWD/qmlcompositetypemanager_p.h \ + $$PWD/qmllist.h \ + $$PWD/qmldeclarativedata_p.h \ + $$PWD/qmlerror.h \ + $$PWD/qmlscriptparser_p.h \ + $$PWD/qmlbasicscript_p.h \ + $$PWD/qmlenginedebug_p.h \ + $$PWD/qmlrewrite_p.h \ + $$PWD/qpodvector_p.h \ + $$PWD/qbitfield_p.h \ + $$PWD/qmlvaluetype_p.h \ + $$PWD/qmlbindingoptimizations_p.h \ + $$PWD/qmlxmlhttprequest_p.h \ + $$PWD/qmlsqldatabase_p.h \ + $$PWD/qmetaobjectbuilder_p.h \ + $$PWD/qmlwatcher_p.h \ + $$PWD/qmlcleanup_p.h \ + $$PWD/qmlpropertycache_p.h \ + $$PWD/qmlintegercache_p.h \ + $$PWD/qmltypenamecache_p.h \ + $$PWD/qmlscriptstring.h \ + $$PWD/qmlobjectscriptclass_p.h \ + $$PWD/qmlcontextscriptclass_p.h \ + $$PWD/qmlglobalscriptclass_p.h \ + $$PWD/qmlvaluetypescriptclass_p.h \ + $$PWD/qmltypenamescriptclass_p.h \ + $$PWD/qmllistscriptclass_p.h \ + $$PWD/qmlworkerscript_p.h -HEADERS += qml/qmlparser_p.h \ - qml/qmlglobal_p.h \ - qml/qmlinstruction_p.h \ - qml/qmlvmemetaobject_p.h \ - qml/qml.h \ - qml/qmlbinding.h \ - qml/qmlbinding_p.h \ - qml/qmlmetaproperty.h \ - qml/qmlcomponent.h \ - qml/qmlcomponent_p.h \ - qml/qmlcustomparser_p.h \ - qml/qmlcustomparser_p_p.h \ - qml/qmlpropertyvaluesource.h \ - qml/qmlpropertyvalueinterceptor.h \ - qml/qmlboundsignal_p.h \ - qml/qmlparserstatus.h \ - qml/qmlproxymetaobject_p.h \ - qml/qmlvme_p.h \ - qml/qmlcompiler_p.h \ - qml/qmlengine_p.h \ - qml/qmlexpression_p.h \ - qml/qmlprivate.h \ - qml/qmldom.h \ - qml/qmldom_p.h \ - qml/qmlrefcount_p.h \ - qml/qmlmetatype.h \ - qml/qmlengine.h \ - qml/qmlcontext.h \ - qml/qmlexpression.h \ - qml/qmlstringconverters_p.h \ - qml/qmlclassfactory_p.h \ - qml/qmlinfo.h \ - qml/qmlmetaproperty_p.h \ - qml/qmlcontext_p.h \ - qml/qmlcompositetypedata_p.h \ - qml/qmlcompositetypemanager_p.h \ - qml/qmllist.h \ - qml/qmldeclarativedata_p.h \ - qml/qmlerror.h \ - qml/qmlscriptparser_p.h \ - qml/qmlbasicscript_p.h \ - qml/qmlenginedebug_p.h \ - qml/qmlrewrite_p.h \ - qml/qpodvector_p.h \ - qml/qbitfield_p.h \ - qml/qmlvaluetype_p.h \ - qml/qmlbindingoptimizations_p.h \ - qml/qmlxmlhttprequest_p.h \ - qml/qmlsqldatabase_p.h \ - qml/qmetaobjectbuilder_p.h \ - qml/qmlwatcher_p.h \ - qml/qmlcleanup_p.h \ - qml/qmlpropertycache_p.h \ - qml/qmlintegercache_p.h \ - qml/qmltypenamecache_p.h \ - qml/qmlscriptstring.h \ - qml/qmlobjectscriptclass_p.h \ - qml/qmlcontextscriptclass_p.h \ - qml/qmlglobalscriptclass_p.h \ - qml/qmlvaluetypescriptclass_p.h \ - qml/qmltypenamescriptclass_p.h \ - qml/qmllistscriptclass_p.h \ - qml/qmlworkerscript_p.h - QT += sql include(parser/parser.pri) diff --git a/src/declarative/qml/rewriter/rewriter.pri b/src/declarative/qml/rewriter/rewriter.pri index 550741b..2c29061 100644 --- a/src/declarative/qml/rewriter/rewriter.pri +++ b/src/declarative/qml/rewriter/rewriter.pri @@ -1,6 +1,4 @@ - INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD HEADERS += $$PWD/textwriter_p.h SOURCES += $$PWD/textwriter.cpp diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri index d2faec9..b3418c7 100644 --- a/src/declarative/util/util.pri +++ b/src/declarative/util/util.pri @@ -1,68 +1,70 @@ +INCLUDEPATH += $$PWD + SOURCES += \ - util/qmlview.cpp \ - util/qfxperf.cpp \ - util/qperformancelog.cpp \ - util/qmlconnection.cpp \ - util/qmlpackage.cpp \ - util/qmlanimation.cpp \ - util/qmlsystempalette.cpp \ - util/qmlspringfollow.cpp \ - util/qmleasefollow.cpp \ - util/qmlstate.cpp\ - util/qmltransitionmanager.cpp \ - util/qmlstateoperations.cpp \ - util/qmlpropertychanges.cpp \ - util/qmlstategroup.cpp \ - util/qmltransition.cpp \ - util/qmllistmodel.cpp\ - util/qmllistaccessor.cpp \ - util/qmlopenmetaobject.cpp \ - util/qmltimeline.cpp \ - util/qmltimer.cpp \ - util/qmlbind.cpp \ - util/qmlpropertymap.cpp \ - util/qmlpixmapcache.cpp \ - util/qnumberformat.cpp \ - util/qmlnumberformatter.cpp \ - util/qmldatetimeformatter.cpp \ - util/qmlbehavior.cpp \ - util/qmlfontloader.cpp + $$PWD/qmlview.cpp \ + $$PWD/qfxperf.cpp \ + $$PWD/qperformancelog.cpp \ + $$PWD/qmlconnection.cpp \ + $$PWD/qmlpackage.cpp \ + $$PWD/qmlanimation.cpp \ + $$PWD/qmlsystempalette.cpp \ + $$PWD/qmlspringfollow.cpp \ + $$PWD/qmleasefollow.cpp \ + $$PWD/qmlstate.cpp\ + $$PWD/qmltransitionmanager.cpp \ + $$PWD/qmlstateoperations.cpp \ + $$PWD/qmlpropertychanges.cpp \ + $$PWD/qmlstategroup.cpp \ + $$PWD/qmltransition.cpp \ + $$PWD/qmllistmodel.cpp\ + $$PWD/qmllistaccessor.cpp \ + $$PWD/qmlopenmetaobject.cpp \ + $$PWD/qmltimeline.cpp \ + $$PWD/qmltimer.cpp \ + $$PWD/qmlbind.cpp \ + $$PWD/qmlpropertymap.cpp \ + $$PWD/qmlpixmapcache.cpp \ + $$PWD/qnumberformat.cpp \ + $$PWD/qmlnumberformatter.cpp \ + $$PWD/qmldatetimeformatter.cpp \ + $$PWD/qmlbehavior.cpp \ + $$PWD/qmlfontloader.cpp HEADERS += \ - util/qmlview.h \ - util/qfxperf_p_p.h \ - util/qperformancelog_p_p.h \ - util/qmlconnection_p.h \ - util/qmlpackage_p.h \ - util/qmlanimation_p.h \ - util/qmlanimation_p_p.h \ - util/qmlsystempalette_p.h \ - util/qmlspringfollow_p.h \ - util/qmleasefollow_p.h \ - util/qmlstate_p.h\ - util/qmlstateoperations_p.h \ - util/qmlpropertychanges_p.h \ - util/qmlstate_p_p.h\ - util/qmltransitionmanager_p_p.h \ - util/qmlstategroup_p.h \ - util/qmltransition_p.h \ - util/qmllistmodel_p.h\ - util/qmllistaccessor_p.h \ - util/qmlopenmetaobject_p.h \ - util/qmlnullablevalue_p_p.h \ - util/qmltimeline_p_p.h \ - util/qmltimer_p.h \ - util/qmlbind_p.h \ - util/qmlpropertymap.h \ - util/qmlpixmapcache_p.h \ - util/qnumberformat_p.h \ - util/qmlnumberformatter_p.h \ - util/qmldatetimeformatter_p.h \ - util/qmlbehavior_p.h \ - util/qmlfontloader_p.h + $$PWD/qmlview.h \ + $$PWD/qfxperf_p_p.h \ + $$PWD/qperformancelog_p_p.h \ + $$PWD/qmlconnection_p.h \ + $$PWD/qmlpackage_p.h \ + $$PWD/qmlanimation_p.h \ + $$PWD/qmlanimation_p_p.h \ + $$PWD/qmlsystempalette_p.h \ + $$PWD/qmlspringfollow_p.h \ + $$PWD/qmleasefollow_p.h \ + $$PWD/qmlstate_p.h\ + $$PWD/qmlstateoperations_p.h \ + $$PWD/qmlpropertychanges_p.h \ + $$PWD/qmlstate_p_p.h\ + $$PWD/qmltransitionmanager_p_p.h \ + $$PWD/qmlstategroup_p.h \ + $$PWD/qmltransition_p.h \ + $$PWD/qmllistmodel_p.h\ + $$PWD/qmllistaccessor_p.h \ + $$PWD/qmlopenmetaobject_p.h \ + $$PWD/qmlnullablevalue_p_p.h \ + $$PWD/qmltimeline_p_p.h \ + $$PWD/qmltimer_p.h \ + $$PWD/qmlbind_p.h \ + $$PWD/qmlpropertymap.h \ + $$PWD/qmlpixmapcache_p.h \ + $$PWD/qnumberformat_p.h \ + $$PWD/qmlnumberformatter_p.h \ + $$PWD/qmldatetimeformatter_p.h \ + $$PWD/qmlbehavior_p.h \ + $$PWD/qmlfontloader_p.h contains(QT_CONFIG, xmlpatterns) { QT+=xmlpatterns - SOURCES += util/qmlxmllistmodel.cpp - HEADERS += util/qmlxmllistmodel_p.h + SOURCES += $$PWD/qmlxmllistmodel.cpp + HEADERS += $$PWD/qmlxmllistmodel_p.h } diff --git a/src/declarative/widgets/widgets.pri b/src/declarative/widgets/widgets.pri index 4a8bc93..4cae3ff 100644 --- a/src/declarative/widgets/widgets.pri +++ b/src/declarative/widgets/widgets.pri @@ -1,10 +1,9 @@ +INCLUDEPATH += $$PWD + SOURCES += \ - widgets/graphicswidgets.cpp \ - widgets/graphicslayouts.cpp \ + $$PWD/graphicswidgets.cpp \ + $$PWD/graphicslayouts.cpp HEADERS += \ - widgets/graphicswidgets_p.h \ - widgets/graphicslayouts_p.h \ - - - + $$PWD/graphicswidgets_p.h \ + $$PWD/graphicslayouts_p.h -- cgit v0.12