From 79fed8757e26f946745eec9d8bba8b91aeb1a742 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 15 Oct 2012 15:58:44 +0200 Subject: Rename the QtQuick1 module back to QtDeclarative Matches the name that this code used to have in Qt 4. - Adapt library, change import path to 'QtDeclarative'. - Update the tests and examples to match the new library name. - Rename qtquick1global{_p}.h to qtdeclarativeglobal.h. - Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like it was in Qt 4 and matching the library name again. This also changes the include guards in qtdeclarativeglobal{,_p}.h. - Fix occurrence of quick_debug in tools/qml/qml.pro. Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f Reviewed-by: hjk Reviewed-by: Friedemann Kleint Reviewed-by: Lars Knoll --- .../qtbinding/context-advanced/main.cpp | 2 +- .../declarative/qtbinding/context/main.cpp | 2 +- .../declarative/qtbinding/enums/imageviewer.h | 2 +- .../snippets/declarative/qtbinding/enums/main.cpp | 2 +- .../declarative/qtbinding/functions-cpp/main.cpp | 2 +- .../declarative/qtbinding/functions-qml/main.cpp | 2 +- .../declarative/qtbinding/loading/main.cpp | 2 +- .../qtbinding/newelements/imageviewer.h | 2 +- .../declarative/qtbinding/newelements/main.cpp | 2 +- .../declarative/qtbinding/properties-cpp/main.cpp | 2 +- .../declarative/qtbinding/properties-qml/main.cpp | 2 +- .../qtbinding/signals-cpp/imageviewer.h | 2 +- .../declarative/qtbinding/signals-cpp/main.cpp | 2 +- .../declarative/qtbinding/signals-qml/main.cpp | 2 +- .../declarative/qtbinding/variantlistmap/main.cpp | 2 +- .../basics/color-animation/color-animation.pro | 2 +- .../property-animation/property-animation.pro | 2 +- .../behavior-example/behavior-example.pro | 2 +- .../animation/behaviors/wigglytext/wigglytext.pro | 2 +- examples/declarative/animation/easing/easing.pro | 2 +- examples/declarative/animation/states/states.pro | 2 +- .../cppextensions/imageprovider/imageprovider.pro | 8 +-- .../networkaccessmanagerfactory.pro | 2 +- .../declarative/cppextensions/plugins/plugin.cpp | 4 +- .../declarative/cppextensions/plugins/plugins.pro | 8 +-- .../qgraphicslayouts/layoutitem/layoutitem.pro | 2 +- .../qgraphicsgridlayout/qgraphicsgridlayout.pro | 2 +- .../qgraphicslinearlayout.pro | 2 +- .../cppextensions/qwidgets/qwidgets.cpp | 4 +- .../cppextensions/qwidgets/qwidgets.pro | 6 +-- .../referenceexamples/adding/adding.pro | 6 +-- .../referenceexamples/attached/attached.pro | 6 +-- .../referenceexamples/binding/binding.pro | 6 +-- .../referenceexamples/coercion/coercion.pro | 6 +-- .../referenceexamples/default/default.pro | 6 +-- .../referenceexamples/extended/extended.pro | 6 +-- .../referenceexamples/grouped/grouped.pro | 6 +-- .../referenceexamples/methods/methods.pro | 6 +-- .../referenceexamples/properties/properties.pro | 6 +-- .../referenceexamples/signal/signal.pro | 6 +-- .../referenceexamples/valuesource/valuesource.pro | 6 +-- examples/declarative/declarative.pro | 2 +- examples/declarative/i18n/i18n.pro | 2 +- .../imageelements/borderimage/borderimage.pro | 2 +- examples/declarative/imageelements/image/image.pro | 2 +- .../declarative/imageelements/shadows/shadows.pro | 2 +- .../declarative/keyinteraction/focus/focus.pro | 2 +- .../abstractitemmodel/abstractitemmodel.pro | 2 +- .../declarative/modelviews/gridview/gridview.pro | 2 +- .../listview/dynamiclist/dynamiclist.pro | 2 +- .../expandingdelegates/expandingdelegates.pro | 2 +- .../modelviews/listview/highlight/highlight.pro | 2 +- .../listview/highlightranges/highlightranges.pro | 2 +- .../modelviews/listview/sections/sections.pro | 2 +- .../modelviews/objectlistmodel/objectlistmodel.pro | 2 +- .../declarative/modelviews/package/package.pro | 2 +- .../declarative/modelviews/parallax/parallax.pro | 2 +- .../declarative/modelviews/pathview/pathview.pro | 2 +- .../modelviews/stringlistmodel/stringlistmodel.pro | 2 +- .../modelviews/visualitemmodel/visualitemmodel.pro | 2 +- examples/declarative/positioners/positioners.pro | 2 +- .../layoutdirection/layoutdirection.pro | 2 +- .../layoutmirroring/layoutmirroring.pro | 2 +- .../righttoleft/textalignment/textalignment.pro | 2 +- .../declarative/shadereffects/shadereffects.pro | 4 +- .../sqllocalstorage/sqllocalstorage.pro | 2 +- .../text/fonts/availableFonts/availableFonts.pro | 2 +- examples/declarative/text/fonts/banner/banner.pro | 2 +- examples/declarative/text/fonts/fonts/fonts.pro | 2 +- examples/declarative/text/fonts/hello/hello.pro | 2 +- .../text/textselection/textselection.pro | 2 +- .../threadedlistmodel/threadedlistmodel.pro | 2 +- .../threading/workerscript/workerscript.pro | 2 +- .../experimental-gestures/experimentalgestures.pro | 2 +- .../mousearea-example/mouseareaexample.pro | 2 +- .../touchinteraction/pincharea/pincharea.pro | 2 +- examples/declarative/toys/clocks/clocks.pro | 2 +- .../declarative/toys/corkboards/corkboards.pro | 2 +- .../declarative/toys/dynamicscene/dynamicscene.pro | 2 +- .../declarative/toys/tic-tac-toe/tictactoe.pro | 2 +- examples/declarative/toys/tvtennis/tvtennis.pro | 2 +- .../extending/chapter1-basics/chapter1-basics.pro | 2 +- .../chapter2-methods/chapter2-methods.pro | 2 +- .../chapter3-bindings/chapter3-bindings.pro | 2 +- .../chapter4-customPropertyTypes.pro | 2 +- .../chapter5-listproperties.pro | 2 +- .../chapter6-plugins/chapter6-plugins.pro | 2 +- .../ui-components/dialcontrol/dialcontrol.pro | 2 +- .../ui-components/flipable/flipable.pro | 2 +- examples/declarative/ui-components/main/main.pro | 2 +- .../ui-components/progressbar/progressbar.pro | 2 +- .../ui-components/scrollbar/scrollbar.pro | 2 +- .../ui-components/searchbox/searchbox.pro | 2 +- .../ui-components/slideswitch/slideswitch.pro | 2 +- .../declarative/ui-components/spinner/spinner.pro | 2 +- .../ui-components/tabwidget/tabwidget.pro | 2 +- .../xmlhttprequestexample.pro | 2 +- examples/demos/calculator/calculator.pro | 2 +- examples/demos/flickr/flickr.pro | 2 +- examples/demos/minehunt/main.cpp | 4 +- examples/demos/minehunt/minehunt.pro | 2 +- examples/demos/photoviewer/photoviewer.pro | 2 +- examples/demos/rssnews/rssnews.pro | 2 +- examples/demos/samegame/samegame.pro | 2 +- examples/demos/snake/snake.pro | 2 +- examples/demos/twitter/twitter.pro | 2 +- examples/helper/helper.pro | 2 +- .../qmlapplicationviewer/qmlapplicationviewer.cpp | 6 +-- .../qmlapplicationviewer/qmlapplicationviewer.h | 2 +- .../qmlapplicationviewer/qmlapplicationviewer.pri | 2 +- examples/mobile/guitartuner/guitartuner.pro | 4 +- examples/mobile/guitartuner/src/guitartuner.h | 2 +- examples/mobile/qtbubblelevel/main.cpp | 2 +- examples/mobile/qtbubblelevel/qtbubblelevel.pro | 2 +- examples/mobile/quickhit/quickhit.pro | 2 +- .../gsQml/filedialog/dialogPlugin.cpp | 2 +- .../gettingStarted/gsQml/filedialog/dialogPlugin.h | 2 +- .../gettingStarted/gsQml/filedialog/filedialog.pro | 2 +- .../gsQml/parts/part5/filedialog/dialogPlugin.cpp | 2 +- .../gsQml/parts/part5/filedialog/dialogPlugin.h | 2 +- .../gsQml/parts/part5/filedialog/filedialog.pro | 2 +- src/declarative/debugger/qdeclarativedebug.h | 4 +- .../debugger/qdeclarativedebugclient_p.h | 6 +-- .../debugger/qdeclarativedebuggerstatus_p.h | 4 +- .../debugger/qdeclarativedebughelper_p.h | 4 +- .../debugger/qdeclarativedebugserver.cpp | 2 +- .../debugger/qdeclarativedebugserver_p.h | 2 +- .../debugger/qdeclarativedebugserverconnection_p.h | 4 +- .../debugger/qdeclarativedebugservice_p.h | 4 +- .../debugger/qdeclarativedebugtrace_p.h | 4 +- .../debugger/qdeclarativeenginedebug_p.h | 30 +++++------ .../debugger/qdeclarativeenginedebugservice_p.h | 8 +-- .../debugger/qdeclarativeinspectorinterface_p.h | 4 +- .../debugger/qdeclarativeinspectorservice.cpp | 2 +- .../debugger/qdeclarativeinspectorservice_p.h | 2 +- src/declarative/debugger/qjsdebugservice.cpp | 2 +- src/declarative/debugger/qpacketprotocol_p.h | 8 +-- src/declarative/declarative.pro | 8 +-- .../graphicsitems/qdeclarativeanchors_p.h | 4 +- .../graphicsitems/qdeclarativeevents_p_p.h | 4 +- .../graphicsitems/qdeclarativegraphicswidget_p.h | 2 +- src/declarative/graphicsitems/qdeclarativeitem.cpp | 2 +- src/declarative/graphicsitems/qdeclarativeitem.h | 8 +-- src/declarative/graphicsitems/qdeclarativeitem_p.h | 2 +- .../graphicsitems/qdeclarativepositioners_p.h | 2 +- .../graphicsitems/qdeclarativerectangle_p.h | 6 +-- .../graphicsitems/qdeclarativescalegrid_p_p.h | 4 +- src/declarative/graphicsitems/qdeclarativetext_p.h | 4 +- src/declarative/qml/qdeclarative.h | 20 +++---- src/declarative/qml/qdeclarativebinding_p.h | 4 +- .../qml/qdeclarativecompiledbindings.cpp | 2 +- src/declarative/qml/qdeclarativecomponent.h | 6 +-- src/declarative/qml/qdeclarativecontext.h | 4 +- src/declarative/qml/qdeclarativecustomparser_p.h | 6 +-- src/declarative/qml/qdeclarativedom_p.h | 26 ++++----- src/declarative/qml/qdeclarativeengine.h | 6 +-- src/declarative/qml/qdeclarativeerror.h | 6 +-- src/declarative/qml/qdeclarativeexpression.h | 4 +- .../qml/qdeclarativeextensioninterface.h | 4 +- src/declarative/qml/qdeclarativeextensionplugin.h | 4 +- src/declarative/qml/qdeclarativeimageprovider.h | 4 +- src/declarative/qml/qdeclarativeimport.cpp | 4 +- src/declarative/qml/qdeclarativeinfo.h | 16 +++--- src/declarative/qml/qdeclarativelist.h | 4 +- src/declarative/qml/qdeclarativemetatype.cpp | 2 +- src/declarative/qml/qdeclarativemetatype_p.h | 6 +-- .../qml/qdeclarativenetworkaccessmanagerfactory.h | 4 +- src/declarative/qml/qdeclarativeparser_p.h | 2 +- src/declarative/qml/qdeclarativeparserstatus.h | 4 +- src/declarative/qml/qdeclarativeprivate.h | 6 +-- src/declarative/qml/qdeclarativeproperty.h | 4 +- src/declarative/qml/qdeclarativeproperty_p.h | 4 +- .../qml/qdeclarativepropertyvalueinterceptor.h | 4 +- .../qml/qdeclarativepropertyvaluesource.h | 4 +- src/declarative/qml/qdeclarativerefcount_p.h | 4 +- src/declarative/qml/qdeclarativescriptstring.h | 4 +- .../qml/qdeclarativestringconverters_p.h | 22 ++++---- src/declarative/qml/qdeclarativetypeloader.cpp | 2 +- src/declarative/qml/qdeclarativetypeloader_p.h | 4 +- src/declarative/qml/qdeclarativevaluetype_p.h | 4 +- src/declarative/qml/qdeclarativeworkerscript.cpp | 2 +- src/declarative/qml/qperformancetimer_p.h | 4 +- src/declarative/qtdeclarativeglobal.h | 63 ++++++++++++++++++++++ src/declarative/qtdeclarativeglobal_p.h | 60 +++++++++++++++++++++ src/declarative/qtquick1global.h | 63 ---------------------- src/declarative/qtquick1global_p.h | 60 --------------------- src/declarative/util/qdeclarativeanimation_p.h | 4 +- src/declarative/util/qdeclarativeapplication_p.h | 4 +- src/declarative/util/qdeclarativebehavior_p.h | 2 +- src/declarative/util/qdeclarativelistmodel_p.h | 2 +- .../util/qdeclarativeopenmetaobject_p.h | 6 +-- src/declarative/util/qdeclarativepixmapcache_p.h | 4 +- .../util/qdeclarativepropertychanges_p.h | 2 +- src/declarative/util/qdeclarativepropertymap.h | 4 +- src/declarative/util/qdeclarativestate_p.h | 8 +-- src/declarative/util/qdeclarativestategroup_p.h | 2 +- .../util/qdeclarativestateoperations_p.h | 4 +- src/declarative/util/qdeclarativetimer_p.h | 4 +- src/declarative/util/qdeclarativetransition_p.h | 2 +- src/declarative/util/qdeclarativeview.h | 4 +- src/declarative/util/qlistmodelinterface_p.h | 4 +- src/imports/folderlistmodel/folderlistmodel.pro | 6 +-- src/imports/folderlistmodel/plugin.cpp | 4 +- src/imports/gestures/gestures.pro | 6 +-- src/imports/gestures/plugin.cpp | 4 +- src/imports/particles/particles.cpp | 4 +- src/imports/particles/particles.pro | 6 +-- src/imports/particles/qdeclarativeparticles_p.h | 2 +- src/imports/qimportbase.pri | 2 +- src/imports/shaders/qmlshadersplugin_plugin.cpp | 2 +- src/imports/shaders/qmlshadersplugin_plugin.h | 2 +- src/imports/shaders/shaders.pro | 6 +-- src/imports/webview/webview.pro | 4 +- .../qmlapplicationviewer/qmlapplicationviewer.cpp | 6 +-- .../qmlapplicationviewer/qmlapplicationviewer.h | 2 +- src/plugins/qdeclarativeview/qdeclarativeview.pro | 2 +- .../qdeclarativeview/qdeclarativeview_plugin.cpp | 4 +- .../qmldbg_inspector/abstractviewinspector.cpp | 6 +-- .../qmldbg_inspector/editor/liveselectiontool.cpp | 4 +- .../qmldbg_inspector/qdeclarativeviewinspector.cpp | 2 +- .../qmldbg_inspector/qdeclarativeviewinspector.h | 2 +- .../qmldbg_inspector/qdeclarativeviewinspector_p.h | 4 +- .../qmldbg_inspector/qmldbg_inspector.pro | 4 +- .../qmldbg_inspector/qmlinspectorconstants.h | 2 +- .../qmltooling/qmldbg_inspector/qtquick1plugin.cpp | 4 +- .../qmltooling/qmldbg_inspector/qtquick1plugin.h | 2 +- .../qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro | 6 +-- .../qmldbg_tcp_qtquick1/qtcpserverconnection.h | 2 +- sync.profile | 2 +- tests/auto/cmake/test_modules/CMakeLists.txt | 8 +-- tests/auto/declarative/examples/examples.pro | 2 +- tests/auto/declarative/moduleqt47/moduleqt47.pro | 2 +- .../auto/declarative/moduleqt47/tst_moduleqt47.cpp | 4 +- .../auto/declarative/parserstress/parserstress.pro | 2 +- .../qdeclarativeanchors/qdeclarativeanchors.pro | 2 +- .../tst_qdeclarativeanchors.cpp | 10 ++-- .../qdeclarativeanimatedimage.pro | 2 +- .../tst_qdeclarativeanimatedimage.cpp | 8 +-- .../qdeclarativeanimations.pro | 2 +- .../tst_qdeclarativeanimations.cpp | 6 +-- .../qdeclarativeapplication.pro | 2 +- .../tst_qdeclarativeapplication.cpp | 6 +-- .../qdeclarativebehaviors.pro | 2 +- .../tst_qdeclarativebehaviors.cpp | 6 +-- .../qdeclarativebinding/qdeclarativebinding.pro | 2 +- .../tst_qdeclarativebinding.cpp | 4 +- .../qdeclarativeborderimage.pro | 2 +- .../tst_qdeclarativeborderimage.cpp | 6 +-- .../qdeclarativecomponent.pro | 2 +- .../tst_qdeclarativecomponent.cpp | 8 +-- .../qdeclarativeconnection.pro | 2 +- .../tst_qdeclarativeconnection.cpp | 6 +-- .../qdeclarativecontext/qdeclarativecontext.pro | 2 +- .../qdeclarativedebug/qdeclarativedebug.pro | 2 +- .../qdeclarativedebug/tst_qdeclarativedebug.cpp | 10 ++-- .../qdeclarativedebugclient.pro | 2 +- .../tst_qdeclarativedebugclient.cpp | 2 +- .../private_headers/qdeclarativedebughelper_p.h | 2 +- .../qdeclarativedebughelper.pro | 2 +- .../declarative/qdeclarativedebugjs/app/app.pro | 2 +- .../declarative/qdeclarativedebugjs/app/main.cpp | 2 +- .../tst_qdeclarativedebugjs.cpp | 8 +-- .../tst_qdeclarativedebugjs.pro | 2 +- .../qdeclarativedebugservice.pro | 2 +- .../tst_qdeclarativedebugservice.cpp | 2 +- .../qdeclarativedom/qdeclarativedom.pro | 2 +- .../qdeclarativedom/tst_qdeclarativedom.cpp | 6 +-- .../qdeclarativeecmascript.pro | 2 +- .../declarative/qdeclarativeecmascript/testtypes.h | 10 ++-- .../tst_qdeclarativeecmascript.cpp | 10 ++-- .../qdeclarativeengine/qdeclarativeengine.pro | 2 +- .../qdeclarativeerror/qdeclarativeerror.pro | 2 +- .../qdeclarativeflickable.pro | 2 +- .../tst_qdeclarativeflickable.cpp | 6 +-- .../qdeclarativeflipable/qdeclarativeflipable.pro | 2 +- .../tst_qdeclarativeflipable.cpp | 6 +-- .../qdeclarativefocusscope.pro | 2 +- .../tst_qdeclarativefocusscope.cpp | 8 +-- .../qdeclarativefolderlistmodel.pro | 2 +- .../tst_qdeclarativefolderlistmodel.cpp | 4 +- .../qdeclarativefontloader.pro | 2 +- .../tst_qdeclarativefontloader.cpp | 6 +-- .../qdeclarativegridview/qdeclarativegridview.pro | 2 +- .../tst_qdeclarativegridview.cpp | 20 +++---- .../qdeclarativeimage/qdeclarativeimage.pro | 2 +- .../qdeclarativeimage/tst_qdeclarativeimage.cpp | 10 ++-- .../qdeclarativeimageprovider.pro | 2 +- .../tst_qdeclarativeimageprovider.cpp | 4 +- .../qdeclarativeinfo/qdeclarativeinfo.pro | 2 +- .../qdeclarativeinstruction.pro | 2 +- .../qdeclarativeitem/qdeclarativeitem.pro | 2 +- .../qdeclarativeitem/tst_qdeclarativeitem.cpp | 8 +-- .../qdeclarativelanguage/qdeclarativelanguage.pro | 2 +- .../declarative/qdeclarativelanguage/testtypes.h | 12 ++--- .../tst_qdeclarativelanguage.cpp | 4 +- .../qdeclarativelayoutitem.pro | 2 +- .../qdeclarativelistmodel.pro | 2 +- .../tst_qdeclarativelistmodel.cpp | 10 ++-- .../qdeclarativelistreference.pro | 2 +- .../tst_qdeclarativelistreference.cpp | 6 +-- .../qdeclarativelistview/qdeclarativelistview.pro | 2 +- .../tst_qdeclarativelistview.cpp | 20 +++---- .../qdeclarativeloader/qdeclarativeloader.pro | 2 +- .../qdeclarativeloader/tst_qdeclarativeloader.cpp | 4 +- .../qdeclarativemetatype/qdeclarativemetatype.pro | 2 +- .../plugin.2.1/plugin.2.1.pro | 2 +- .../qdeclarativemoduleplugin/plugin.2.1/plugin.cpp | 4 +- .../qdeclarativemoduleplugin/plugin.2/plugin.2.pro | 2 +- .../qdeclarativemoduleplugin/plugin.2/plugin.cpp | 4 +- .../qdeclarativemoduleplugin/plugin/plugin.cpp | 4 +- .../qdeclarativemoduleplugin/plugin/plugin.pro | 2 +- .../pluginMixed/plugin.cpp | 4 +- .../pluginMixed/pluginMixed.pro | 2 +- .../pluginVersion/plugin.cpp | 4 +- .../pluginVersion/pluginVersion.pro | 2 +- .../pluginWithQmlFile/plugin.cpp | 4 +- .../pluginWithQmlFile/pluginWithQmlFile.pro | 2 +- .../pluginWrongCase/plugin.cpp | 4 +- .../pluginWrongCase/pluginWrongCase.pro | 2 +- .../qdeclarativemoduleplugin/pureQml/plugin.cpp | 4 +- .../qdeclarativemoduleplugin/pureQml/pureQml.pro | 2 +- .../tst_qdeclarativemoduleplugin.cpp | 4 +- .../tst_qdeclarativemoduleplugin.pro | 2 +- .../qdeclarativemousearea.pro | 2 +- .../tst_qdeclarativemousearea.cpp | 8 +-- .../qdeclarativeparticles.pro | 2 +- .../qdeclarativepathview/qdeclarativepathview.pro | 2 +- .../tst_qdeclarativepathview.cpp | 22 ++++---- .../qdeclarativepincharea.pro | 2 +- .../tst_qdeclarativepincharea.cpp | 4 +- .../qdeclarativepixmapcache.pro | 2 +- .../tst_qdeclarativepixmapcache.cpp | 4 +- .../qdeclarativepositioners.pro | 2 +- .../qdeclarativeproperty/qdeclarativeproperty.pro | 2 +- .../tst_qdeclarativeproperty.cpp | 8 +-- .../qdeclarativepropertymap.pro | 2 +- .../tst_qdeclarativepropertymap.cpp | 8 +-- .../declarative/qdeclarativeqt/qdeclarativeqt.pro | 2 +- .../qdeclarativerepeater/qdeclarativerepeater.pro | 2 +- .../tst_qdeclarativerepeater.cpp | 8 +-- .../qdeclarativesmoothedanimation.pro | 2 +- .../tst_qdeclarativesmoothedanimation.cpp | 4 +- .../qdeclarativespringanimation.pro | 2 +- .../tst_qdeclarativespringanimation.cpp | 4 +- .../qdeclarativestates/qdeclarativestates.pro | 2 +- .../qdeclarativestates/tst_qdeclarativestates.cpp | 4 +- .../qdeclarativestyledtext.pro | 2 +- .../qdeclarativesystempalette.pro | 2 +- .../tst_qdeclarativesystempalette.cpp | 4 +- .../qdeclarativetext/qdeclarativetext.pro | 2 +- .../qdeclarativetext/tst_qdeclarativetext.cpp | 4 +- .../qdeclarativetextedit/qdeclarativetextedit.pro | 2 +- .../tst_qdeclarativetextedit.cpp | 10 ++-- .../qdeclarativetextinput.pro | 2 +- .../tst_qdeclarativetextinput.cpp | 4 +- .../qdeclarativetimer/qdeclarativetimer.pro | 2 +- .../qdeclarativetimer/tst_qdeclarativetimer.cpp | 6 +-- .../qdeclarativevaluetypes.pro | 2 +- .../qdeclarativeview/qdeclarativeview.pro | 2 +- .../qdeclarativeview/tst_qdeclarativeview.cpp | 8 +-- .../qdeclarativeviewer/qdeclarativeviewer.pro | 2 +- .../qdeclarativeviewer/tst_qdeclarativeviewer.cpp | 8 +-- .../qdeclarativevisualdatamodel.pro | 2 +- .../tst_qdeclarativevisualdatamodel.cpp | 10 ++-- .../qdeclarativewebview/qdeclarativewebview.pro | 2 +- .../qdeclarativeworkerscript.pro | 2 +- .../tst_qdeclarativeworkerscript.cpp | 6 +-- .../qdeclarativexmlhttprequest.pro | 2 +- .../qdeclarativexmllistmodel.pro | 2 +- .../tst_qdeclarativexmllistmodel.cpp | 6 +-- .../qmlshadersplugin/qmlshadersplugin.pro | 2 +- .../qmlshadersplugin/tst_qmlshadersplugin.cpp | 2 +- tests/auto/declarative/qmlvisual/qmlvisual.pro | 2 +- .../qpacketprotocol/qpacketprotocol.pro | 2 +- .../qperformancetimer/qperformancetimer.pro | 2 +- tests/auto/declarative/shared/debugutil_p.h | 2 +- .../declarative/shared/qdeclarativedatatest.cpp | 8 +-- tests/auto/headersclean/headersclean.pro | 2 +- tests/auto/headersclean/qt_headersclean_headers.h | 2 +- .../qmlapplicationviewer/qmlapplicationviewer.cpp | 6 +-- .../qmlapplicationviewer/qmlapplicationviewer.h | 2 +- .../qmlapplicationviewer/qmlapplicationviewer.pri | 2 +- .../qmlshadersplugin/qmlshadersplugin.pro | 2 +- .../plugins/qdeclarativeview/qdeclarativeview.pro | 2 +- .../qdeclarativeview/qdeclarativeview_plugin.cpp | 2 +- tools/qml/qml.pri | 2 +- tools/qml/qml.pro | 4 +- tools/qmlplugindump/main.cpp | 10 ++-- tools/qmlplugindump/qmlplugindump.pro | 4 +- 389 files changed, 852 insertions(+), 852 deletions(-) create mode 100644 src/declarative/qtdeclarativeglobal.h create mode 100644 src/declarative/qtdeclarativeglobal_p.h delete mode 100644 src/declarative/qtquick1global.h delete mode 100644 src/declarative/qtquick1global_p.h diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp b/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp index 5ef09aa9..aaa7f645 100644 --- a/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include -#include +#include #include "applicationdata.h" diff --git a/doc/src/snippets/declarative/qtbinding/context/main.cpp b/doc/src/snippets/declarative/qtbinding/context/main.cpp index 24f6e8ed..0f1cd090 100644 --- a/doc/src/snippets/declarative/qtbinding/context/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/context/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include -#include +#include int main(int argc, char *argv[]) { diff --git a/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h b/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h index 1d3d9cc5..f071fc9f 100644 --- a/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h +++ b/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include -#include +#include //![start] class ImageViewer : public QDeclarativeItem diff --git a/doc/src/snippets/declarative/qtbinding/enums/main.cpp b/doc/src/snippets/declarative/qtbinding/enums/main.cpp index 028fe831..868c62fe 100644 --- a/doc/src/snippets/declarative/qtbinding/enums/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/enums/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include -#include +#include #include "imageviewer.h" diff --git a/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp b/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp index d8d277b2..dc288662 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include -#include +#include #include "myclass.h" diff --git a/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp b/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp index 8b5522c0..4894d36e 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include -#include +#include int main(int argc, char *argv[]) { diff --git a/doc/src/snippets/declarative/qtbinding/loading/main.cpp b/doc/src/snippets/declarative/qtbinding/loading/main.cpp index 2dd52b76..163b461b 100644 --- a/doc/src/snippets/declarative/qtbinding/loading/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/loading/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include -#include +#include static void withComponent() { diff --git a/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h b/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h index 713a5162..ce711435 100644 --- a/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h +++ b/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h @@ -39,7 +39,7 @@ ****************************************************************************/ //![0] #include -#include +#include class ImageViewer : public QDeclarativeItem { diff --git a/doc/src/snippets/declarative/qtbinding/newelements/main.cpp b/doc/src/snippets/declarative/qtbinding/newelements/main.cpp index 51e6de59..bd389d78 100644 --- a/doc/src/snippets/declarative/qtbinding/newelements/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/newelements/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include -#include +#include #include "imageviewer.h" diff --git a/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp b/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp index 485d8daa..e2a26d57 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include -#include +#include #include "applicationdata.h" diff --git a/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp b/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp index 8021a6e2..e7beaa8e 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include -#include +#include int main(int argc, char *argv[]) { diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h b/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h index 35858faf..c67f924d 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h +++ b/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include -#include +#include //![start] class ImageViewer : public QDeclarativeItem diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp b/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp index 58318ad6..a0d41d6c 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include -#include +#include #include "imageviewer.h" diff --git a/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp b/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp index bcd6c320..ef045cfe 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include -#include +#include //![0] int main(int argc, char *argv[]) { diff --git a/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp b/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp index 040c00c9..e48bf211 100644 --- a/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include -#include +#include int main(int argc, char *argv[]) { QApplication app(argc, argv); diff --git a/examples/declarative/animation/basics/color-animation/color-animation.pro b/examples/declarative/animation/basics/color-animation/color-animation.pro index 11dd9d13..eecab9bb 100644 --- a/examples/declarative/animation/basics/color-animation/color-animation.pro +++ b/examples/declarative/animation/basics/color-animation/color-animation.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/basics/color-animation +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/basics/color-animation exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/basics/property-animation/property-animation.pro b/examples/declarative/animation/basics/property-animation/property-animation.pro index 28e7ebc3..61e165c8 100644 --- a/examples/declarative/animation/basics/property-animation/property-animation.pro +++ b/examples/declarative/animation/basics/property-animation/property-animation.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/basics/property-animation +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/basics/property-animation exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro index b1b3cd6b..70b6187f 100644 --- a/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro +++ b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/behaviors/behavior-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/behaviors/behavior-example exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro index 4c46a119..2c9cd4f2 100644 --- a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro +++ b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro @@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEB6022A4 SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/animation/wigglytext/wigglytext +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/animation/wigglytext/wigglytext exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/easing/easing.pro b/examples/declarative/animation/easing/easing.pro index ac80ef7a..34007253 100644 --- a/examples/declarative/animation/easing/easing.pro +++ b/examples/declarative/animation/easing/easing.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/easing +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/easing exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/states/states.pro b/examples/declarative/animation/states/states.pro index 9a469a68..b188c70a 100644 --- a/examples/declarative/animation/states/states.pro +++ b/examples/declarative/animation/states/states.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/states +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/animation/states exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index 0d9b33c9..0d24c035 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += quick1 +QT += declarative DESTDIR = ImageProviderCore TARGET = qmlimageproviderplugin @@ -10,13 +10,13 @@ SOURCES += imageprovider.cpp OTHER_FILES += imageprovider.json sources.files = $$SOURCES imageprovider.qml imageprovider.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/imageprovider -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider/ImageProviderCore +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/imageprovider/ImageProviderCore ImageProviderCore_sources.files = \ ImageProviderCore/qmldir -ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider/ImageProviderCore +ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/imageprovider/ImageProviderCore INSTALLS = sources ImageProviderCore_sources target diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro index 4048dfd9..e8103794 100644 --- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro +++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro @@ -21,7 +21,7 @@ SOURCES += main.cpp RESOURCES += networkaccessmanagerfactory.qrc # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/networkaccessmanagerfactory +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/networkaccessmanagerfactory exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/cppextensions/plugins/plugin.cpp b/examples/declarative/cppextensions/plugins/plugin.cpp index 70365662..7ee6755b 100644 --- a/examples/declarative/cppextensions/plugins/plugin.cpp +++ b/examples/declarative/cppextensions/plugins/plugin.cpp @@ -38,8 +38,8 @@ ** ****************************************************************************/ -#include -#include +#include +#include #include #include #include diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index a0f08844..0d6fe43e 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += widgets quick1 +QT += widgets declarative DESTDIR = com/nokia/TimeExample TARGET = qmlqtimeexampleplugin @@ -17,11 +17,11 @@ qdeclarativesources.files += \ com/nokia/TimeExample/hour.png \ com/nokia/TimeExample/minute.png -qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins/com/nokia/TimeExample +qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins/com/nokia/TimeExample sources.files += plugins.pro plugin.cpp plugins.qml README -sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins -target.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins/com/nokia/TimeExample +sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins +target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins/com/nokia/TimeExample INSTALLS += qdeclarativesources sources target diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro index c3e6a913..27682b49 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro +++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro @@ -1,4 +1,4 @@ -QT += widgets quick1 +QT += widgets declarative SOURCES += main.cpp RESOURCES += layoutitem.qrc diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro index 794979c4..4ad99b56 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro @@ -28,7 +28,7 @@ RESOURCES += \ gridlayout.qrc # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro index da9b9939..cb070816 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro @@ -28,7 +28,7 @@ RESOURCES += \ linearlayout.qrc # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp index 887c4657..464d19aa 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.cpp +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.cpp @@ -38,8 +38,8 @@ ** ****************************************************************************/ -#include -#include +#include +#include #include #include #include diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro index 3a451551..e0d17715 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += widgets quick1 +QT += widgets declarative DESTDIR = QWidgets TARGET = qmlqwidgetsplugin @@ -10,8 +10,8 @@ SOURCES += qwidgets.cpp OTHER_FILES += qwidgets.json sources.files += qwidgets.pro qwidgets.cpp qwidgets.qml -sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins -target.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins +sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins +target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/plugins INSTALLS += sources target diff --git a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro index 92af7535..a4718886 100644 --- a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro +++ b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro @@ -1,11 +1,11 @@ -QT += quick1 +QT += declarative SOURCES += main.cpp \ person.cpp HEADERS += person.h RESOURCES += adding.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/adding +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/adding sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/adding +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/adding INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro index ab1bd45f..8a5bc14c 100644 --- a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro +++ b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro @@ -1,4 +1,4 @@ -QT += quick1 +QT += declarative SOURCES += main.cpp \ person.cpp \ @@ -7,7 +7,7 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += attached.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/attached +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/attached sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/attached +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/attached INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro index b818f79d..281ca7e0 100644 --- a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro +++ b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro @@ -1,4 +1,4 @@ -QT += quick1 +QT += declarative SOURCES += main.cpp \ person.cpp \ @@ -9,7 +9,7 @@ HEADERS += person.h \ happybirthdaysong.h RESOURCES += binding.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/binding +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/binding sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/binding +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/binding INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro index 882a71b9..b89db7a5 100644 --- a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro +++ b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro @@ -1,4 +1,4 @@ -QT += quick1 +QT += declarative SOURCES += main.cpp \ person.cpp \ @@ -7,7 +7,7 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += coercion.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/coercion +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/coercion sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/coercion +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/coercion INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/default/default.pro b/examples/declarative/cppextensions/referenceexamples/default/default.pro index 0244f8bb..3d0b3405 100644 --- a/examples/declarative/cppextensions/referenceexamples/default/default.pro +++ b/examples/declarative/cppextensions/referenceexamples/default/default.pro @@ -1,4 +1,4 @@ -QT += quick1 +QT += declarative SOURCES += main.cpp \ person.cpp \ @@ -7,7 +7,7 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += default.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/default +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/default sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/default +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/default INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro index ffc161ad..f9485f67 100644 --- a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro +++ b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro @@ -1,11 +1,11 @@ -QT += widgets quick1 +QT += widgets declarative SOURCES += main.cpp \ lineedit.cpp HEADERS += lineedit.h RESOURCES += extended.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/extended +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/extended sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/extended +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/extended INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro index 0ce0bad9..5bf40ddd 100644 --- a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro +++ b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro @@ -1,4 +1,4 @@ -QT += quick1 +QT += declarative SOURCES += main.cpp \ person.cpp \ @@ -7,7 +7,7 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += grouped.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/grouped +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/grouped sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/grouped +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/grouped INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro index 8c8288a3..b9310c14 100644 --- a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro +++ b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro @@ -1,4 +1,4 @@ -QT += quick1 +QT += declarative SOURCES += main.cpp \ person.cpp \ @@ -7,7 +7,7 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += methods.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/methods +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/methods sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS methods.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/methods +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/methods INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro index 13f8bb0f..5bc57983 100644 --- a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro +++ b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro @@ -1,4 +1,4 @@ -QT += quick1 +QT += declarative SOURCES += main.cpp \ person.cpp \ @@ -7,7 +7,7 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += properties.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/properties +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/properties sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/properties +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/properties INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro index 3baff92e..2b850245 100644 --- a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro +++ b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro @@ -1,4 +1,4 @@ -QT += quick1 +QT += declarative SOURCES += main.cpp \ person.cpp \ @@ -7,7 +7,7 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += signal.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/signal +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/signal sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/signal +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/signal INSTALLS += target sources diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro index 6db7514f..c32e5a2d 100644 --- a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro +++ b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro @@ -1,4 +1,4 @@ -QT += quick1 +QT += declarative SOURCES += main.cpp \ person.cpp \ @@ -9,7 +9,7 @@ HEADERS += person.h \ happybirthdaysong.h RESOURCES += valuesource.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/valuesource +target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/valuesource sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/valuesource +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/cppextensions/referenceexamples/valuesource INSTALLS += target sources diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index 7fe8f957..42bc3f4a 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -25,5 +25,5 @@ sources.files = \ cppextensions \ xml -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative INSTALLS += sources diff --git a/examples/declarative/i18n/i18n.pro b/examples/declarative/i18n/i18n.pro index abae210e..951b2611 100644 --- a/examples/declarative/i18n/i18n.pro +++ b/examples/declarative/i18n/i18n.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/i18n +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/i18n exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) diff --git a/examples/declarative/imageelements/borderimage/borderimage.pro b/examples/declarative/imageelements/borderimage/borderimage.pro index 5cfc2e5b..eab55135 100644 --- a/examples/declarative/imageelements/borderimage/borderimage.pro +++ b/examples/declarative/imageelements/borderimage/borderimage.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/borderimage +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/imageelements/borderimage exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/imageelements/image/image.pro b/examples/declarative/imageelements/image/image.pro index d19b6fde..41560539 100644 --- a/examples/declarative/imageelements/image/image.pro +++ b/examples/declarative/imageelements/image/image.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/image +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/imageelements/image exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/imageelements/shadows/shadows.pro b/examples/declarative/imageelements/shadows/shadows.pro index 035a06a6..d12cb7ca 100644 --- a/examples/declarative/imageelements/shadows/shadows.pro +++ b/examples/declarative/imageelements/shadows/shadows.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/shadows +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/imageelements/shadows exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/keyinteraction/focus/focus.pro b/examples/declarative/keyinteraction/focus/focus.pro index 584a80bf..b6fd6856 100644 --- a/examples/declarative/keyinteraction/focus/focus.pro +++ b/examples/declarative/keyinteraction/focus/focus.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/keyinteraction/focus +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/keyinteraction/focus exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro index 7ba55ba6..164ed233 100644 --- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro +++ b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro @@ -21,7 +21,7 @@ SOURCES = main.cpp model.cpp HEADERS = model.h # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/abstractitemmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/abstractitemmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/gridview/gridview.pro b/examples/declarative/modelviews/gridview/gridview.pro index 5ff68def..967ca931 100644 --- a/examples/declarative/modelviews/gridview/gridview.pro +++ b/examples/declarative/modelviews/gridview/gridview.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/gridview-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/gridview-example exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro index c37afe45..272ff7d3 100644 --- a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro +++ b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/dynamiclist +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/dynamiclist exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro index 1ddbb46f..73a32e44 100644 --- a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro +++ b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/expandingdelegates +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/expandingdelegates exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/listview/highlight/highlight.pro b/examples/declarative/modelviews/listview/highlight/highlight.pro index 062de0a7..220dae9e 100644 --- a/examples/declarative/modelviews/listview/highlight/highlight.pro +++ b/examples/declarative/modelviews/listview/highlight/highlight.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/highlight +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/highlight exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro b/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro index b27e2c06..0faf1a8f 100644 --- a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro +++ b/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/highlightranges +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/highlightranges exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/listview/sections/sections.pro b/examples/declarative/modelviews/listview/sections/sections.pro index edad3e58..699a8e4e 100644 --- a/examples/declarative/modelviews/listview/sections/sections.pro +++ b/examples/declarative/modelviews/listview/sections/sections.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/sections +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/listview/sections exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro index d37bd87b..790946cd 100644 --- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro +++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro @@ -22,7 +22,7 @@ SOURCES += main.cpp \ HEADERS += dataobject.h # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/objectlistmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/objectlistmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/package/package.pro b/examples/declarative/modelviews/package/package.pro index d68cdcc8..6d7a1fab 100644 --- a/examples/declarative/modelviews/package/package.pro +++ b/examples/declarative/modelviews/package/package.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/package +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/package exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/parallax/parallax.pro b/examples/declarative/modelviews/parallax/parallax.pro index cf21b699..51307e54 100644 --- a/examples/declarative/modelviews/parallax/parallax.pro +++ b/examples/declarative/modelviews/parallax/parallax.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/parallax +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/parallax exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/pathview/pathview.pro b/examples/declarative/modelviews/pathview/pathview.pro index 9b00ce2c..9bd27e18 100644 --- a/examples/declarative/modelviews/pathview/pathview.pro +++ b/examples/declarative/modelviews/pathview/pathview.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/pathview-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/pathview-example exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro index 8d326922..e7221f02 100644 --- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro +++ b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro @@ -20,7 +20,7 @@ QT += widgets SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/stringlistmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/stringlistmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro index 7309eea1..19ea9469 100644 --- a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro +++ b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/visualitemmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/visualitemmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/positioners/positioners.pro b/examples/declarative/positioners/positioners.pro index 1991997a..c6b26fb8 100644 --- a/examples/declarative/positioners/positioners.pro +++ b/examples/declarative/positioners/positioners.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/positioners +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/positioners exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro b/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro index 402d8344..dd33b64a 100644 --- a/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro +++ b/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro @@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/righttoleft/layoutdirection +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/righttoleft/layoutdirection exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro index eb6ab5c5..f45ca74e 100644 --- a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro +++ b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro @@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/righttoleft/layoutmirroring +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/righttoleft/layoutmirroring exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/righttoleft/textalignment/textalignment.pro b/examples/declarative/righttoleft/textalignment/textalignment.pro index fd2ee263..f9d164ea 100644 --- a/examples/declarative/righttoleft/textalignment/textalignment.pro +++ b/examples/declarative/righttoleft/textalignment/textalignment.pro @@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/righttoleft/textalignment +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/righttoleft/textalignment exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/shadereffects/shadereffects.pro b/examples/declarative/shadereffects/shadereffects.pro index b4a9eabe..d8d0df19 100644 --- a/examples/declarative/shadereffects/shadereffects.pro +++ b/examples/declarative/shadereffects/shadereffects.pro @@ -14,7 +14,7 @@ QML_IMPORT_PATH = # Speed up launching on MeeGo/Harmattan when using applauncherd daemon # CONFIG += qdeclarative-boostable -QT += quick1 opengl +QT += declarative opengl # The .cpp file which was generated for your project. Feel free to hack it. SOURCES += main.cpp @@ -24,7 +24,7 @@ symbian { } # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/shadereffects +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/shadereffects exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) diff --git a/examples/declarative/sqllocalstorage/sqllocalstorage.pro b/examples/declarative/sqllocalstorage/sqllocalstorage.pro index 631cff40..bb5a1323 100644 --- a/examples/declarative/sqllocalstorage/sqllocalstorage.pro +++ b/examples/declarative/sqllocalstorage/sqllocalstorage.pro @@ -19,7 +19,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/sqllocalstorage +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/sqllocalstorage exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) diff --git a/examples/declarative/text/fonts/availableFonts/availableFonts.pro b/examples/declarative/text/fonts/availableFonts/availableFonts.pro index a175e3d5..e8fc381b 100644 --- a/examples/declarative/text/fonts/availableFonts/availableFonts.pro +++ b/examples/declarative/text/fonts/availableFonts/availableFonts.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/availableFonts +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/fonts/availableFonts exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/text/fonts/banner/banner.pro b/examples/declarative/text/fonts/banner/banner.pro index ab6f3e56..f3fba2e6 100644 --- a/examples/declarative/text/fonts/banner/banner.pro +++ b/examples/declarative/text/fonts/banner/banner.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/banner +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/fonts/banner exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/text/fonts/fonts/fonts.pro b/examples/declarative/text/fonts/fonts/fonts.pro index 1e10fc17..c5382311 100644 --- a/examples/declarative/text/fonts/fonts/fonts.pro +++ b/examples/declarative/text/fonts/fonts/fonts.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/fonts +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/fonts/fonts exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/text/fonts/hello/hello.pro b/examples/declarative/text/fonts/hello/hello.pro index 8a7752a8..a6a685c2 100644 --- a/examples/declarative/text/fonts/hello/hello.pro +++ b/examples/declarative/text/fonts/hello/hello.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/hello +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/fonts/hello exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/text/textselection/textselection.pro b/examples/declarative/text/textselection/textselection.pro index 327efad9..20450b2d 100644 --- a/examples/declarative/text/textselection/textselection.pro +++ b/examples/declarative/text/textselection/textselection.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/textselection +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/text/textselection exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro index 35f203f1..409f792e 100644 --- a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro +++ b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/threading/threadedlistmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/threading/threadedlistmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/threading/workerscript/workerscript.pro b/examples/declarative/threading/workerscript/workerscript.pro index b92a2745..e7f1a2aa 100644 --- a/examples/declarative/threading/workerscript/workerscript.pro +++ b/examples/declarative/threading/workerscript/workerscript.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/threading/workerscript +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/threading/workerscript exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro b/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro index db652cc3..a81a0219 100644 --- a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro +++ b/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/gestures/experimental-gestures +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/touchinteraction/gestures/experimental-gestures exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro b/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro index c55b883c..ce5bbd3f 100644 --- a/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro +++ b/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/mousearea/mousearea-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/touchinteraction/mousearea/mousearea-example exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/touchinteraction/pincharea/pincharea.pro b/examples/declarative/touchinteraction/pincharea/pincharea.pro index 6a2e9dd3..a7ae4561 100644 --- a/examples/declarative/touchinteraction/pincharea/pincharea.pro +++ b/examples/declarative/touchinteraction/pincharea/pincharea.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/pincharea +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/touchinteraction/pincharea exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/toys/clocks/clocks.pro b/examples/declarative/toys/clocks/clocks.pro index 483924e1..6fc6c58c 100644 --- a/examples/declarative/toys/clocks/clocks.pro +++ b/examples/declarative/toys/clocks/clocks.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/clocks +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/clocks exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/toys/corkboards/corkboards.pro b/examples/declarative/toys/corkboards/corkboards.pro index 61e141fa..810adf04 100644 --- a/examples/declarative/toys/corkboards/corkboards.pro +++ b/examples/declarative/toys/corkboards/corkboards.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/corkboards +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/corkboards exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.pro b/examples/declarative/toys/dynamicscene/dynamicscene.pro index 5d19757b..3a177275 100644 --- a/examples/declarative/toys/dynamicscene/dynamicscene.pro +++ b/examples/declarative/toys/dynamicscene/dynamicscene.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/dynamicscene +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/dynamicscene exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/toys/tic-tac-toe/tictactoe.pro b/examples/declarative/toys/tic-tac-toe/tictactoe.pro index 4a669f6f..9547c913 100644 --- a/examples/declarative/toys/tic-tac-toe/tictactoe.pro +++ b/examples/declarative/toys/tic-tac-toe/tictactoe.pro @@ -24,7 +24,7 @@ TARGET = tic-tac-toe SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/tic-tac-toe +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/tic-tac-toe exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/toys/tvtennis/tvtennis.pro b/examples/declarative/toys/tvtennis/tvtennis.pro index 2b4cc07e..3f843595 100644 --- a/examples/declarative/toys/tvtennis/tvtennis.pro +++ b/examples/declarative/toys/tvtennis/tvtennis.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/tvtennis +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/toys/tvtennis exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro index d75e7b26..f978c7bb 100644 --- a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro +++ b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro @@ -1,4 +1,4 @@ -QT += widgets quick1 +QT += widgets declarative HEADERS += piechart.h SOURCES += piechart.cpp \ diff --git a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro index d75e7b26..f978c7bb 100644 --- a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro +++ b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro @@ -1,4 +1,4 @@ -QT += widgets quick1 +QT += widgets declarative HEADERS += piechart.h SOURCES += piechart.cpp \ diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro index d75e7b26..f978c7bb 100644 --- a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro +++ b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro @@ -1,4 +1,4 @@ -QT += widgets quick1 +QT += widgets declarative HEADERS += piechart.h SOURCES += piechart.cpp \ diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro index 535f8a72..b0c94cc7 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro @@ -1,4 +1,4 @@ -QT += widgets quick1 +QT += widgets declarative HEADERS += piechart.h \ pieslice.h diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro index 535f8a72..b0c94cc7 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro @@ -1,4 +1,4 @@ -QT += widgets quick1 +QT += widgets declarative HEADERS += piechart.h \ pieslice.h diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index c2d277f5..62c41a0f 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += quick1 widgets +QT += declarative widgets DESTDIR = lib OBJECTS_DIR = tmp diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro index 5e112a8d..741c0429 100644 --- a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro +++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/dialcontrol +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/dialcontrol exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/flipable/flipable.pro b/examples/declarative/ui-components/flipable/flipable.pro index 0cfd2ec2..9707142b 100644 --- a/examples/declarative/ui-components/flipable/flipable.pro +++ b/examples/declarative/ui-components/flipable/flipable.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/flipable +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/flipable exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/main/main.pro b/examples/declarative/ui-components/main/main.pro index 428ffd47..c0e53864 100644 --- a/examples/declarative/ui-components/main/main.pro +++ b/examples/declarative/ui-components/main/main.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/main +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/main exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/progressbar/progressbar.pro b/examples/declarative/ui-components/progressbar/progressbar.pro index 8e232277..5557daba 100644 --- a/examples/declarative/ui-components/progressbar/progressbar.pro +++ b/examples/declarative/ui-components/progressbar/progressbar.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/progressbar +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/progressbar exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/scrollbar/scrollbar.pro b/examples/declarative/ui-components/scrollbar/scrollbar.pro index 5843ef7f..c29a02dc 100644 --- a/examples/declarative/ui-components/scrollbar/scrollbar.pro +++ b/examples/declarative/ui-components/scrollbar/scrollbar.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/scrollbar +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/scrollbar exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/searchbox/searchbox.pro b/examples/declarative/ui-components/searchbox/searchbox.pro index 6219524f..56c060b8 100644 --- a/examples/declarative/ui-components/searchbox/searchbox.pro +++ b/examples/declarative/ui-components/searchbox/searchbox.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/searchbox +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/searchbox exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.pro b/examples/declarative/ui-components/slideswitch/slideswitch.pro index 63e471cf..77b3d996 100644 --- a/examples/declarative/ui-components/slideswitch/slideswitch.pro +++ b/examples/declarative/ui-components/slideswitch/slideswitch.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/slideswitch +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/slideswitch exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/spinner/spinner.pro b/examples/declarative/ui-components/spinner/spinner.pro index 0c65f28d..20a686da 100644 --- a/examples/declarative/ui-components/spinner/spinner.pro +++ b/examples/declarative/ui-components/spinner/spinner.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/spinner +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/spinner exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/tabwidget/tabwidget.pro b/examples/declarative/ui-components/tabwidget/tabwidget.pro index 97d49ea2..caa03212 100644 --- a/examples/declarative/ui-components/tabwidget/tabwidget.pro +++ b/examples/declarative/ui-components/tabwidget/tabwidget.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/tabwidget +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/tabwidget exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro b/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro index 9c75b8b0..c6be2562 100644 --- a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro +++ b/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/xml/xmlhttprequest-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/xml/xmlhttprequest-example exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/calculator/calculator.pro b/examples/demos/calculator/calculator.pro index 7db59b96..f59289be 100644 --- a/examples/demos/calculator/calculator.pro +++ b/examples/demos/calculator/calculator.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/calculator +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/calculator exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/flickr/flickr.pro b/examples/demos/flickr/flickr.pro index 625b2a57..74342fbc 100644 --- a/examples/demos/flickr/flickr.pro +++ b/examples/demos/flickr/flickr.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/flickr +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/flickr exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/minehunt/main.cpp b/examples/demos/minehunt/main.cpp index 636ec081..cfe36f0b 100644 --- a/examples/demos/minehunt/main.cpp +++ b/examples/demos/minehunt/main.cpp @@ -42,8 +42,8 @@ #include "qmlapplicationviewer.h" #include "minehunt.h" #include -#include -#include +#include +#include int main(int argc, char *argv[]) { diff --git a/examples/demos/minehunt/minehunt.pro b/examples/demos/minehunt/minehunt.pro index 2a43a11f..8c7f5bbf 100644 --- a/examples/demos/minehunt/minehunt.pro +++ b/examples/demos/minehunt/minehunt.pro @@ -19,7 +19,7 @@ SOURCES += main.cpp minehunt.cpp RESOURCES = minehunt.qrc # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/minehunt +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/minehunt exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/photoviewer/photoviewer.pro b/examples/demos/photoviewer/photoviewer.pro index 694aeb36..1b1490cb 100644 --- a/examples/demos/photoviewer/photoviewer.pro +++ b/examples/demos/photoviewer/photoviewer.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/photoviewer +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/photoviewer exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/rssnews/rssnews.pro b/examples/demos/rssnews/rssnews.pro index 14002fb1..04ff5ae9 100644 --- a/examples/demos/rssnews/rssnews.pro +++ b/examples/demos/rssnews/rssnews.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/rssnews +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/rssnews exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/samegame/samegame.pro b/examples/demos/samegame/samegame.pro index 6342ba4a..10b28698 100644 --- a/examples/demos/samegame/samegame.pro +++ b/examples/demos/samegame/samegame.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/samegame +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/samegame exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/snake/snake.pro b/examples/demos/snake/snake.pro index 0fa838d5..427f570a 100644 --- a/examples/demos/snake/snake.pro +++ b/examples/demos/snake/snake.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/snake +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/snake exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/twitter/twitter.pro b/examples/demos/twitter/twitter.pro index c2beb0e3..9a699799 100644 --- a/examples/demos/twitter/twitter.pro +++ b/examples/demos/twitter/twitter.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/twitter +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/twitter exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/helper/helper.pro b/examples/helper/helper.pro index 85117a0f..0a111c50 100644 --- a/examples/helper/helper.pro +++ b/examples/helper/helper.pro @@ -3,5 +3,5 @@ TEMPLATE = subdirs # the helpers simply need a make install target, but require no compilation sources.files = \ qmlapplicationviewer -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/helper +sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/helper INSTALLS += sources diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp index bbd53bd5..6a9a1fd5 100644 --- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -42,9 +42,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include // MEEGO_EDITION_HARMATTAN diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h index ef4e8363..b6b96bca 100644 --- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h +++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h @@ -41,7 +41,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#include +#include class QmlApplicationViewer : public QDeclarativeView { diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri index e1cc288b..b83bd9b5 100644 --- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri @@ -4,7 +4,7 @@ # It is recommended not to modify this file, since newer versions of Qt Creator # may offer an updated version of it. -QT += quick1 widgets +QT += declarative widgets SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/examples/mobile/guitartuner/guitartuner.pro b/examples/mobile/guitartuner/guitartuner.pro index b86f4778..9478f380 100644 --- a/examples/mobile/guitartuner/guitartuner.pro +++ b/examples/mobile/guitartuner/guitartuner.pro @@ -65,8 +65,8 @@ symbian { TARGET.CAPABILITY = UserEnvironment } -# Add quick1 module -QT += quick1 +# Add declarative module +QT += declarative OTHER_FILES += \ src/application.qml \ diff --git a/examples/mobile/guitartuner/src/guitartuner.h b/examples/mobile/guitartuner/src/guitartuner.h index 0d647d54..a1eff87c 100644 --- a/examples/mobile/guitartuner/src/guitartuner.h +++ b/examples/mobile/guitartuner/src/guitartuner.h @@ -43,7 +43,7 @@ #define MAINWINDOW_H #include -#include +#include #include #include #include diff --git a/examples/mobile/qtbubblelevel/main.cpp b/examples/mobile/qtbubblelevel/main.cpp index ad0e1dc7..2b8bdf00 100644 --- a/examples/mobile/qtbubblelevel/main.cpp +++ b/examples/mobile/qtbubblelevel/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include #include diff --git a/examples/mobile/qtbubblelevel/qtbubblelevel.pro b/examples/mobile/qtbubblelevel/qtbubblelevel.pro index 93c676c6..3314815b 100644 --- a/examples/mobile/qtbubblelevel/qtbubblelevel.pro +++ b/examples/mobile/qtbubblelevel/qtbubblelevel.pro @@ -1,4 +1,4 @@ -QT += core gui quick1 +QT += core gui declarative CONFIG += mobility MOBILITY += sensors diff --git a/examples/mobile/quickhit/quickhit.pro b/examples/mobile/quickhit/quickhit.pro index cc980d92..b511a76f 100644 --- a/examples/mobile/quickhit/quickhit.pro +++ b/examples/mobile/quickhit/quickhit.pro @@ -1,4 +1,4 @@ -QT += core gui quick1 opengl widgets +QT += core gui declarative opengl widgets VERSION = 1.1.1 diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp index f7b2537d..bc711932 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp @@ -41,7 +41,7 @@ #include "dialogPlugin.h" #include "directory.h" #include "file.h" -#include +#include void DialogPlugin::registerTypes(const char *uri) { diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h index a5cf8cdf..e87b7e82 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h @@ -41,7 +41,7 @@ #ifndef DIALOGPLUGIN_H #define DIALOGPLUGIN_H -#include +#include class DialogPlugin : public QDeclarativeExtensionPlugin { diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro b/examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro index 33eb51d4..d85787d0 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += quick1 +QT += declarative DESTDIR += ../plugins OBJECTS_DIR = tmp diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp index 9cf5f0ee..286374d8 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp @@ -41,7 +41,7 @@ #include "dialogPlugin.h" #include "directory.h" #include "file.h" -#include +#include void DialogPlugin::registerTypes(const char *uri){ diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h index 1ee96a96..ddcf82be 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h @@ -41,7 +41,7 @@ #ifndef DIALOGPLUGIN_H #define DIALOGPLUGIN_H -#include +#include class DialogPlugin : public QDeclarativeExtensionPlugin { diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.pro b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.pro index 9b1cfa11..62477470 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.pro +++ b/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += quick1 +QT += declarative DESTDIR += ../plugins OBJECTS_DIR = tmp diff --git a/src/declarative/debugger/qdeclarativedebug.h b/src/declarative/debugger/qdeclarativedebug.h index b0d9ca2e..a9a27555 100644 --- a/src/declarative/debugger/qdeclarativedebug.h +++ b/src/declarative/debugger/qdeclarativedebug.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEDEBUG_H #define QDECLARATIVEDEBUG_H -#include +#include QT_BEGIN_HEADER @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -struct Q_QUICK1_EXPORT QDeclarativeDebuggingEnabler +struct Q_DECLARATIVE_EXPORT QDeclarativeDebuggingEnabler { QDeclarativeDebuggingEnabler(); }; diff --git a/src/declarative/debugger/qdeclarativedebugclient_p.h b/src/declarative/debugger/qdeclarativedebugclient_p.h index 95453b7d..10b358ab 100644 --- a/src/declarative/debugger/qdeclarativedebugclient_p.h +++ b/src/declarative/debugger/qdeclarativedebugclient_p.h @@ -44,7 +44,7 @@ #include -#include +#include QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeDebugConnectionPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugConnection : public QTcpSocket +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugConnection : public QTcpSocket { Q_OBJECT Q_DISABLE_COPY(QDeclarativeDebugConnection) @@ -69,7 +69,7 @@ private: }; class QDeclarativeDebugClientPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugClient : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugClient : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeDebugClient) diff --git a/src/declarative/debugger/qdeclarativedebuggerstatus_p.h b/src/declarative/debugger/qdeclarativedebuggerstatus_p.h index 0155651b..aac48e82 100644 --- a/src/declarative/debugger/qdeclarativedebuggerstatus_p.h +++ b/src/declarative/debugger/qdeclarativedebuggerstatus_p.h @@ -44,7 +44,7 @@ #include -#include +#include QT_BEGIN_HEADER @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebuggerStatus +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebuggerStatus { public: virtual ~QDeclarativeDebuggerStatus(); diff --git a/src/declarative/debugger/qdeclarativedebughelper_p.h b/src/declarative/debugger/qdeclarativedebughelper_p.h index dc41db95..32e6f677 100644 --- a/src/declarative/debugger/qdeclarativedebughelper_p.h +++ b/src/declarative/debugger/qdeclarativedebughelper_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEDEBUGHELPER_P_H #define QDECLARATIVEDEBUGHELPER_P_H -#include +#include QT_BEGIN_HEADER @@ -53,7 +53,7 @@ class QDeclarativeEngine; // Helper methods to access private API through a stable interface // This is used in the qmljsdebugger library of QtCreator. -class Q_QUICK1_EXPORT QDeclarativeDebugHelper +class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper { public: static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine); diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp index dacf2ca7..e3228f06 100644 --- a/src/declarative/debugger/qdeclarativedebugserver.cpp +++ b/src/declarative/debugger/qdeclarativedebugserver.cpp @@ -190,7 +190,7 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance() if (appD->qmljsDebugArgumentsString().indexOf(QLatin1String("port:")) == 0) { int separatorIndex = appD->qmljsDebugArgumentsString().indexOf(QLatin1Char(',')); port = appD->qmljsDebugArgumentsString().mid(5, separatorIndex - 5).toInt(&ok); - pluginName = QLatin1String("qmldbg_tcp_qtquick1"); + pluginName = QLatin1String("qmldbg_tcp"); } else if (appD->qmljsDebugArgumentsString().contains(QLatin1String("ost"))) { pluginName = QLatin1String("qmldbg_ost"); ok = true; diff --git a/src/declarative/debugger/qdeclarativedebugserver_p.h b/src/declarative/debugger/qdeclarativedebugserver_p.h index 0b94a274..c1968cc9 100644 --- a/src/declarative/debugger/qdeclarativedebugserver_p.h +++ b/src/declarative/debugger/qdeclarativedebugserver_p.h @@ -54,7 +54,7 @@ QT_MODULE(Declarative) class QDeclarativeDebugService; class QDeclarativeDebugServerPrivate; -class Q_QUICK1_EXPORT QDeclarativeDebugServer : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeDebugServer : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeDebugServer) diff --git a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h index 666c4446..91181568 100644 --- a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h +++ b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEDEBUGSERVERCONNECTION_H #define QDECLARATIVEDEBUGSERVERCONNECTION_H -#include +#include #include // @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeDebugServer; -class Q_QUICK1_EXPORT QDeclarativeDebugServerConnection +class Q_DECLARATIVE_EXPORT QDeclarativeDebugServerConnection { public: QDeclarativeDebugServerConnection() {} diff --git a/src/declarative/debugger/qdeclarativedebugservice_p.h b/src/declarative/debugger/qdeclarativedebugservice_p.h index 892e493e..daacfc4a 100644 --- a/src/declarative/debugger/qdeclarativedebugservice_p.h +++ b/src/declarative/debugger/qdeclarativedebugservice_p.h @@ -44,7 +44,7 @@ #include -#include +#include QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeDebugServicePrivate; -class Q_QUICK1_EXPORT QDeclarativeDebugService : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeDebugService : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeDebugService) diff --git a/src/declarative/debugger/qdeclarativedebugtrace_p.h b/src/declarative/debugger/qdeclarativedebugtrace_p.h index dfd478b0..d505f6d4 100644 --- a/src/declarative/debugger/qdeclarativedebugtrace_p.h +++ b/src/declarative/debugger/qdeclarativedebugtrace_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEDEBUGTRACE_P_H #define QDECLARATIVEDEBUGTRACE_P_H -#include "qtquick1global.h" +#include "qtdeclarativeglobal.h" #include #include @@ -65,7 +65,7 @@ struct QDeclarativeDebugData }; class QUrl; -class Q_QUICK1_EXPORT QDeclarativeDebugTrace : public QDeclarativeDebugService +class Q_DECLARATIVE_EXPORT QDeclarativeDebugTrace : public QDeclarativeDebugService { public: enum Message { diff --git a/src/declarative/debugger/qdeclarativeenginedebug_p.h b/src/declarative/debugger/qdeclarativeenginedebug_p.h index f9fc8214..d375a215 100644 --- a/src/declarative/debugger/qdeclarativeenginedebug_p.h +++ b/src/declarative/debugger/qdeclarativeenginedebug_p.h @@ -45,7 +45,7 @@ #include #include -#include +#include QT_BEGIN_HEADER @@ -67,7 +67,7 @@ class QDeclarativeDebugObjectReference; class QDeclarativeDebugFileReference; class QDeclarativeDebugEngineReference; class QDeclarativeEngineDebugPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeEngineDebug : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeEngineDebug : public QObject { Q_OBJECT public: @@ -114,7 +114,7 @@ private: Q_DECLARE_PRIVATE(QDeclarativeEngineDebug) }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugWatch : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugWatch : public QObject { Q_OBJECT public: @@ -145,7 +145,7 @@ private: int m_objectDebugId; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugPropertyWatch : public QDeclarativeDebugWatch +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugPropertyWatch : public QDeclarativeDebugWatch { Q_OBJECT public: @@ -158,7 +158,7 @@ private: QString m_name; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugObjectExpressionWatch : public QDeclarativeDebugWatch +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugObjectExpressionWatch : public QDeclarativeDebugWatch { Q_OBJECT public: @@ -173,7 +173,7 @@ private: }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugQuery : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugQuery : public QObject { Q_OBJECT public: @@ -197,7 +197,7 @@ private: State m_state; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugFileReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugFileReference { public: QDeclarativeDebugFileReference(); @@ -218,7 +218,7 @@ private: int m_columnNumber; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugEngineReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugEngineReference { public: QDeclarativeDebugEngineReference(); @@ -235,7 +235,7 @@ private: QString m_name; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugObjectReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugObjectReference { public: QDeclarativeDebugObjectReference(); @@ -269,7 +269,7 @@ private: QList m_children; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugContextReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugContextReference { public: QDeclarativeDebugContextReference(); @@ -290,7 +290,7 @@ private: QList m_contexts; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugPropertyReference +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugPropertyReference { public: QDeclarativeDebugPropertyReference(); @@ -315,7 +315,7 @@ private: }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugEnginesQuery : public QDeclarativeDebugQuery +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugEnginesQuery : public QDeclarativeDebugQuery { Q_OBJECT public: @@ -330,7 +330,7 @@ private: QList m_engines; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugRootContextQuery : public QDeclarativeDebugQuery +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugRootContextQuery : public QDeclarativeDebugQuery { Q_OBJECT public: @@ -345,7 +345,7 @@ private: QDeclarativeDebugContextReference m_context; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugObjectQuery : public QDeclarativeDebugQuery +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugObjectQuery : public QDeclarativeDebugQuery { Q_OBJECT public: @@ -361,7 +361,7 @@ private: }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDebugExpressionQuery : public QDeclarativeDebugQuery +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugExpressionQuery : public QDeclarativeDebugQuery { Q_OBJECT public: diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice_p.h b/src/declarative/debugger/qdeclarativeenginedebugservice_p.h index 45372061..70a07e45 100644 --- a/src/declarative/debugger/qdeclarativeenginedebugservice_p.h +++ b/src/declarative/debugger/qdeclarativeenginedebugservice_p.h @@ -123,10 +123,10 @@ private: QDeclarativeWatcher *m_watch; QList > m_allStates; }; -Q_QUICK1_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugService::QDeclarativeObjectData &); -Q_QUICK1_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QDeclarativeEngineDebugService::QDeclarativeObjectData &); -Q_QUICK1_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugService::QDeclarativeObjectProperty &); -Q_QUICK1_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QDeclarativeEngineDebugService::QDeclarativeObjectProperty &); +Q_DECLARATIVE_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugService::QDeclarativeObjectData &); +Q_DECLARATIVE_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QDeclarativeEngineDebugService::QDeclarativeObjectData &); +Q_DECLARATIVE_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugService::QDeclarativeObjectProperty &); +Q_DECLARATIVE_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QDeclarativeEngineDebugService::QDeclarativeObjectProperty &); QT_END_NAMESPACE diff --git a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h index ec420796..39fb8004 100644 --- a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h +++ b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEOBSERVERINTERFACE_H #define QDECLARATIVEOBSERVERINTERFACE_H -#include +#include QT_BEGIN_HEADER @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_EXPORT QDeclarativeInspectorInterface +class Q_DECLARATIVE_EXPORT QDeclarativeInspectorInterface { public: QDeclarativeInspectorInterface() {} diff --git a/src/declarative/debugger/qdeclarativeinspectorservice.cpp b/src/declarative/debugger/qdeclarativeinspectorservice.cpp index f1571e1e..f2baead0 100644 --- a/src/declarative/debugger/qdeclarativeinspectorservice.cpp +++ b/src/declarative/debugger/qdeclarativeinspectorservice.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/debugger/qdeclarativeinspectorservice_p.h b/src/declarative/debugger/qdeclarativeinspectorservice_p.h index a7032de2..38076b5a 100644 --- a/src/declarative/debugger/qdeclarativeinspectorservice_p.h +++ b/src/declarative/debugger/qdeclarativeinspectorservice_p.h @@ -56,7 +56,7 @@ QT_MODULE(Declarative) class QDeclarativeView; class QDeclarativeInspectorInterface; -class Q_QUICK1_EXPORT QDeclarativeInspectorService : public QDeclarativeDebugService +class Q_DECLARATIVE_EXPORT QDeclarativeInspectorService : public QDeclarativeDebugService { Q_OBJECT diff --git a/src/declarative/debugger/qjsdebugservice.cpp b/src/declarative/debugger/qjsdebugservice.cpp index 4b0ea57b..0b626636 100644 --- a/src/declarative/debugger/qjsdebugservice.cpp +++ b/src/declarative/debugger/qjsdebugservice.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include Q_GLOBAL_STATIC(QJSDebugService, serviceInstance) diff --git a/src/declarative/debugger/qpacketprotocol_p.h b/src/declarative/debugger/qpacketprotocol_p.h index a26ecdae..21caa18d 100644 --- a/src/declarative/debugger/qpacketprotocol_p.h +++ b/src/declarative/debugger/qpacketprotocol_p.h @@ -45,7 +45,7 @@ #include #include -#include +#include QT_BEGIN_HEADER @@ -59,7 +59,7 @@ class QPacket; class QPacketAutoSend; class QPacketProtocolPrivate; -class Q_QUICK1_EXPORT QPacketProtocol : public QObject +class Q_DECLARATIVE_EXPORT QPacketProtocol : public QObject { Q_OBJECT public: @@ -91,7 +91,7 @@ private: }; -class Q_QUICK1_EXPORT QPacket : public QDataStream +class Q_DECLARATIVE_EXPORT QPacket : public QDataStream { public: QPacket(); @@ -109,7 +109,7 @@ protected: QBuffer * buf; }; -class Q_QUICK1_PRIVATE_EXPORT QPacketAutoSend : public QPacket +class Q_DECLARATIVE_PRIVATE_EXPORT QPacketAutoSend : public QPacket { public: virtual ~QPacketAutoSend(); diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 7c3d38f1..be3978aa 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -1,9 +1,9 @@ -TARGET = QtQuick1 +TARGET = QtDeclarative QT = core-private gui-private widgets-private script-private !isEmpty(QT.xmlpatterns.name): QT_PRIVATE = xmlpatterns else: DEFINES += QT_NO_XMLPATTERNS -MODULE=quick1 +MODULE=declarative load(qt_module) DEFINES += QT_NO_URL_CAST_FROM_STRING @@ -23,8 +23,8 @@ include(graphicsitems/graphicsitems.pri) include(debugger/debugger.pri) HEADERS += \ - qtquick1global.h \ - qtquick1global_p.h + qtdeclarativeglobal.h \ + qtdeclarativeglobal_p.h linux-g++-maemo:DEFINES += QDECLARATIVEVIEW_NOBACKGROUND diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p.h index 0bd226cd..22d69852 100644 --- a/src/declarative/graphicsitems/qdeclarativeanchors_p.h +++ b/src/declarative/graphicsitems/qdeclarativeanchors_p.h @@ -48,7 +48,7 @@ #include -#include +#include QT_BEGIN_HEADER @@ -58,7 +58,7 @@ QT_MODULE(Declarative) class QDeclarativeAnchorsPrivate; class QDeclarativeAnchorLine; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAnchors : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAnchors : public QObject { Q_OBJECT diff --git a/src/declarative/graphicsitems/qdeclarativeevents_p_p.h b/src/declarative/graphicsitems/qdeclarativeevents_p_p.h index f9aa9e81..46651314 100644 --- a/src/declarative/graphicsitems/qdeclarativeevents_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeevents_p_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICK1_EXPORT QDeclarativeKeyEvent : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeKeyEvent : public QObject { Q_OBJECT Q_PROPERTY(int key READ key) @@ -89,7 +89,7 @@ private: QKeyEvent event; }; -class Q_QUICK1_EXPORT QDeclarativeMouseEvent : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeMouseEvent : public QObject { Q_OBJECT Q_PROPERTY(int x READ x) diff --git a/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h b/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h index 6c169ec0..bbc0cd8b 100644 --- a/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h +++ b/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVEGRAPHICSWIDGET_P_H #include -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 9dc5cff2..825bae39 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -44,7 +44,7 @@ #include "private/qdeclarativeevents_p_p.h" #include #include -#include +#include #include #include diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h index 95f9458f..503911c0 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.h +++ b/src/declarative/graphicsitems/qdeclarativeitem.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVEITEM_H #define QDECLARATIVEITEM_H -#include -#include +#include +#include #include #include @@ -64,7 +64,7 @@ class QDeclarativeTransition; class QDeclarativeKeyEvent; class QDeclarativeAnchors; class QDeclarativeItemPrivate; -class Q_QUICK1_EXPORT QDeclarativeItem : public QGraphicsObject, public QDeclarativeParserStatus +class Q_DECLARATIVE_EXPORT QDeclarativeItem : public QGraphicsObject, public QDeclarativeParserStatus { Q_OBJECT Q_INTERFACES(QDeclarativeParserStatus) @@ -216,7 +216,7 @@ T qobject_cast(QGraphicsItem *item) } #ifndef QT_NO_DEBUG_STREAM -QDebug Q_QUICK1_EXPORT operator<<(QDebug debug, QDeclarativeItem *item); +QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, QDeclarativeItem *item); #endif QT_END_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativeitem_p.h b/src/declarative/graphicsitems/qdeclarativeitem_p.h index cab49b1a..34269a93 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem_p.h +++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h @@ -114,7 +114,7 @@ private: qreal m_height; }; -class Q_QUICK1_EXPORT QDeclarativeItemPrivate : public QGraphicsItemPrivate +class Q_DECLARATIVE_EXPORT QDeclarativeItemPrivate : public QGraphicsItemPrivate { Q_DECLARE_PUBLIC(QDeclarativeItem) diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p.h index 40bb6c36..70e47094 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners_p.h +++ b/src/declarative/graphicsitems/qdeclarativepositioners_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeBasePositionerPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeBasePositioner : public QDeclarativeImplicitSizeItem +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBasePositioner : public QDeclarativeImplicitSizeItem { Q_OBJECT diff --git a/src/declarative/graphicsitems/qdeclarativerectangle_p.h b/src/declarative/graphicsitems/qdeclarativerectangle_p.h index c11a8ab7..eb29efe8 100644 --- a/src/declarative/graphicsitems/qdeclarativerectangle_p.h +++ b/src/declarative/graphicsitems/qdeclarativerectangle_p.h @@ -46,14 +46,14 @@ #include -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_PRIVATE_EXPORT QDeclarativePen : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePen : public QObject { Q_OBJECT @@ -133,7 +133,7 @@ private: }; class QDeclarativeRectanglePrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeRectangle : public QDeclarativeItem +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeRectangle : public QDeclarativeItem { Q_OBJECT diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h index 852cf6f3..5d5d4d7e 100644 --- a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeScaleGrid : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeScaleGrid : public QObject { Q_OBJECT Q_ENUMS(TileRule) @@ -95,7 +95,7 @@ private: int _bottom; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeGridScaledImage +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeGridScaledImage { public: QDeclarativeGridScaledImage(); diff --git a/src/declarative/graphicsitems/qdeclarativetext_p.h b/src/declarative/graphicsitems/qdeclarativetext_p.h index 9602727f..650f324d 100644 --- a/src/declarative/graphicsitems/qdeclarativetext_p.h +++ b/src/declarative/graphicsitems/qdeclarativetext_p.h @@ -45,7 +45,7 @@ #include #include "qdeclarativeimplicitsizeitem_p.h" -#include +#include QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeTextPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeText : public QDeclarativeImplicitSizeItem +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeText : public QDeclarativeImplicitSizeItem { Q_OBJECT Q_ENUMS(HAlignment) diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index 5b3cc5b3..64bec11d 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -42,11 +42,11 @@ #ifndef QDECLARATIVE_H #define QDECLARATIVE_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -392,11 +392,11 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor, class QDeclarativeContext; class QDeclarativeEngine; -Q_QUICK1_EXPORT void qmlExecuteDeferred(QObject *); -Q_QUICK1_EXPORT QDeclarativeContext *qmlContext(const QObject *); -Q_QUICK1_EXPORT QDeclarativeEngine *qmlEngine(const QObject *); -Q_QUICK1_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true); -Q_QUICK1_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create); +Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *); +Q_DECLARATIVE_EXPORT QDeclarativeContext *qmlContext(const QObject *); +Q_DECLARATIVE_EXPORT QDeclarativeEngine *qmlEngine(const QObject *); +Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true); +Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create); template QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true) diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h index 88ac5ae0..ef64e536 100644 --- a/src/declarative/qml/qdeclarativebinding_p.h +++ b/src/declarative/qml/qdeclarativebinding_p.h @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAbstractBinding +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAbstractBinding { public: typedef QWeakPointer Pointer; @@ -143,7 +143,7 @@ private: class QDeclarativeContext; class QDeclarativeBindingPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeBinding : public QDeclarativeExpression, public QDeclarativeAbstractBinding +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBinding : public QDeclarativeExpression, public QDeclarativeAbstractBinding { Q_OBJECT public: diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp index 768b8986..bbcb063d 100644 --- a/src/declarative/qml/qdeclarativecompiledbindings.cpp +++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp @@ -44,7 +44,7 @@ #include "private/qdeclarativecompiledbindings_p.h" -#include +#include #include #include #include diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h index a2468370..3f69cb6d 100644 --- a/src/declarative/qml/qdeclarativecomponent.h +++ b/src/declarative/qml/qdeclarativecomponent.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVECOMPONENT_H #define QDECLARATIVECOMPONENT_H -#include -#include +#include +#include #include #include @@ -60,7 +60,7 @@ class QByteArray; class QDeclarativeComponentPrivate; class QDeclarativeEngine; class QDeclarativeComponentAttached; -class Q_QUICK1_EXPORT QDeclarativeComponent : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeComponent : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeComponent) diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h index 27a96ebc..d6eb5bb8 100644 --- a/src/declarative/qml/qdeclarativecontext.h +++ b/src/declarative/qml/qdeclarativecontext.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVECONTEXT_H #define QDECLARATIVECONTEXT_H -#include +#include #include #include #include @@ -62,7 +62,7 @@ class QDeclarativeContextPrivate; class QDeclarativeCompositeTypeData; class QDeclarativeContextData; -class Q_QUICK1_EXPORT QDeclarativeContext : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeContext : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeContext) diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h index de19520f..8d0103cb 100644 --- a/src/declarative/qml/qdeclarativecustomparser_p.h +++ b/src/declarative/qml/qdeclarativecustomparser_p.h @@ -70,7 +70,7 @@ QT_MODULE(Declarative) class QDeclarativeCompiler; class QDeclarativeCustomParserPropertyPrivate; -class Q_QUICK1_EXPORT QDeclarativeCustomParserProperty +class Q_DECLARATIVE_EXPORT QDeclarativeCustomParserProperty { public: QDeclarativeCustomParserProperty(); @@ -93,7 +93,7 @@ private: }; class QDeclarativeCustomParserNodePrivate; -class Q_QUICK1_EXPORT QDeclarativeCustomParserNode +class Q_DECLARATIVE_EXPORT QDeclarativeCustomParserNode { public: QDeclarativeCustomParserNode(); @@ -111,7 +111,7 @@ private: QDeclarativeCustomParserNodePrivate *d; }; -class Q_QUICK1_EXPORT QDeclarativeCustomParser +class Q_DECLARATIVE_EXPORT QDeclarativeCustomParser { public: enum Flag { diff --git a/src/declarative/qml/qdeclarativedom_p.h b/src/declarative/qml/qdeclarativedom_p.h index 02ec6319..95383d5e 100644 --- a/src/declarative/qml/qdeclarativedom_p.h +++ b/src/declarative/qml/qdeclarativedom_p.h @@ -58,7 +58,7 @@ #include #include -#include +#include QT_BEGIN_HEADER @@ -78,7 +78,7 @@ class QIODevice; class QDeclarativeDomDocumentPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomDocument +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomDocument { public: QDeclarativeDomDocument(); @@ -98,7 +98,7 @@ private: }; class QDeclarativeDomPropertyPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomProperty +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomProperty { public: QDeclarativeDomProperty(); @@ -125,7 +125,7 @@ private: }; class QDeclarativeDomDynamicPropertyPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomDynamicProperty +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomDynamicProperty { public: QDeclarativeDomDynamicProperty(); @@ -153,7 +153,7 @@ private: }; class QDeclarativeDomObjectPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomObject { public: QDeclarativeDomObject(); @@ -198,7 +198,7 @@ private: class QDeclarativeDomValuePrivate; class QDeclarativeDomBasicValuePrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValueLiteral +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValueLiteral { public: QDeclarativeDomValueLiteral(); @@ -213,7 +213,7 @@ private: QSharedDataPointer d; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValueBinding +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValueBinding { public: QDeclarativeDomValueBinding(); @@ -228,7 +228,7 @@ private: QSharedDataPointer d; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValueValueSource +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValueValueSource { public: QDeclarativeDomValueValueSource(); @@ -243,7 +243,7 @@ private: QSharedDataPointer d; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValueValueInterceptor +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValueValueInterceptor { public: QDeclarativeDomValueValueInterceptor(); @@ -259,7 +259,7 @@ private: }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomComponent : public QDeclarativeDomObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomComponent : public QDeclarativeDomObject { public: QDeclarativeDomComponent(); @@ -270,7 +270,7 @@ public: QDeclarativeDomObject componentRoot() const; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValue +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValue { public: enum Type { @@ -314,7 +314,7 @@ private: QSharedDataPointer d; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomList +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomList { public: QDeclarativeDomList(); @@ -335,7 +335,7 @@ private: }; class QDeclarativeDomImportPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomImport +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomImport { public: enum Type { Library, File }; diff --git a/src/declarative/qml/qdeclarativeengine.h b/src/declarative/qml/qdeclarativeengine.h index e7fe9ba6..2a803a58 100644 --- a/src/declarative/qml/qdeclarativeengine.h +++ b/src/declarative/qml/qdeclarativeengine.h @@ -46,8 +46,8 @@ #include #include #include -#include -#include +#include +#include QT_BEGIN_HEADER @@ -67,7 +67,7 @@ class QScriptContext; class QDeclarativeImageProvider; class QNetworkAccessManager; class QDeclarativeNetworkAccessManagerFactory; -class Q_QUICK1_EXPORT QDeclarativeEngine : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeEngine : public QObject { Q_PROPERTY(QString offlineStoragePath READ offlineStoragePath WRITE setOfflineStoragePath) Q_OBJECT diff --git a/src/declarative/qml/qdeclarativeerror.h b/src/declarative/qml/qdeclarativeerror.h index a00a80af..ba74f9f3 100644 --- a/src/declarative/qml/qdeclarativeerror.h +++ b/src/declarative/qml/qdeclarativeerror.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEERROR_H #define QDECLARATIVEERROR_H -#include +#include #include #include @@ -54,7 +54,7 @@ QT_MODULE(Declarative) class QDebug; class QDeclarativeErrorPrivate; -class Q_QUICK1_EXPORT QDeclarativeError +class Q_DECLARATIVE_EXPORT QDeclarativeError { public: QDeclarativeError(); @@ -78,7 +78,7 @@ private: QDeclarativeErrorPrivate *d; }; -QDebug Q_QUICK1_EXPORT operator<<(QDebug debug, const QDeclarativeError &error); +QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, const QDeclarativeError &error); QT_END_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h index fa5c5dbd..f7dbc796 100644 --- a/src/declarative/qml/qdeclarativeexpression.h +++ b/src/declarative/qml/qdeclarativeexpression.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEEXPRESSION_H #define QDECLARATIVEEXPRESSION_H -#include +#include #include #include @@ -60,7 +60,7 @@ class QDeclarativeContext; class QDeclarativeExpressionPrivate; class QDeclarativeContextData; class QScriptValue; -class Q_QUICK1_EXPORT QDeclarativeExpression : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeExpression : public QObject { Q_OBJECT public: diff --git a/src/declarative/qml/qdeclarativeextensioninterface.h b/src/declarative/qml/qdeclarativeextensioninterface.h index 91356a98..4655ea21 100644 --- a/src/declarative/qml/qdeclarativeextensioninterface.h +++ b/src/declarative/qml/qdeclarativeextensioninterface.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEEXTENSIONINTERFACE_H #define QDECLARATIVEEXTENSIONINTERFACE_H -#include +#include #include QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_MODULE(Declarative) class QDeclarativeEngine; -struct Q_QUICK1_EXPORT QDeclarativeExtensionInterface +struct Q_DECLARATIVE_EXPORT QDeclarativeExtensionInterface { virtual ~QDeclarativeExtensionInterface() {} virtual void registerTypes(const char *uri) = 0; diff --git a/src/declarative/qml/qdeclarativeextensionplugin.h b/src/declarative/qml/qdeclarativeextensionplugin.h index 961685d5..fe914904 100644 --- a/src/declarative/qml/qdeclarativeextensionplugin.h +++ b/src/declarative/qml/qdeclarativeextensionplugin.h @@ -44,7 +44,7 @@ #include -#include +#include QT_BEGIN_HEADER @@ -54,7 +54,7 @@ QT_MODULE(Declarative) class QDeclarativeEngine; -class Q_QUICK1_EXPORT QDeclarativeExtensionPlugin : public QObject, public QDeclarativeExtensionInterface +class Q_DECLARATIVE_EXPORT QDeclarativeExtensionPlugin : public QObject, public QDeclarativeExtensionInterface { Q_OBJECT Q_INTERFACES(QDeclarativeExtensionInterface) diff --git a/src/declarative/qml/qdeclarativeimageprovider.h b/src/declarative/qml/qdeclarativeimageprovider.h index 1acf2de0..39f89535 100644 --- a/src/declarative/qml/qdeclarativeimageprovider.h +++ b/src/declarative/qml/qdeclarativeimageprovider.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEIMAGEPROVIDER_H #define QDECLARATIVEIMAGEPROVIDER_H -#include +#include #include #include @@ -54,7 +54,7 @@ QT_MODULE(Declarative) class QDeclarativeImageProviderPrivate; -class Q_QUICK1_EXPORT QDeclarativeImageProvider +class Q_DECLARATIVE_EXPORT QDeclarativeImageProvider { public: enum ImageType { diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 4d86a795..e51d2485 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include #include @@ -708,7 +708,7 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) // Search order is applicationDirPath(), $QML_IMPORT_PATH, QLibraryInfo::ImportsPath - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath) + QString::fromLatin1("/QtQuick1"); + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath) + QString::fromLatin1("/QtDeclarative"); addImportPath(installImportsPath); diff --git a/src/declarative/qml/qdeclarativeinfo.h b/src/declarative/qml/qdeclarativeinfo.h index 5d37b6cb..58b97365 100644 --- a/src/declarative/qml/qdeclarativeinfo.h +++ b/src/declarative/qml/qdeclarativeinfo.h @@ -44,7 +44,7 @@ #include #include -#include +#include QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeInfoPrivate; -class Q_QUICK1_EXPORT QDeclarativeInfo : public QDebug +class Q_DECLARATIVE_EXPORT QDeclarativeInfo : public QDebug { public: QDeclarativeInfo(const QDeclarativeInfo &); @@ -85,17 +85,17 @@ public: #endif private: - friend Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); - friend Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error); - friend Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList &errors); + friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); + friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error); + friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList &errors); QDeclarativeInfo(QDeclarativeInfoPrivate *); QDeclarativeInfoPrivate *d; }; -Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); -Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error); -Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList &errors); +Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); +Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error); +Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList &errors); QT_END_NAMESPACE diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h index cfd284f2..39edc545 100644 --- a/src/declarative/qml/qdeclarativelist.h +++ b/src/declarative/qml/qdeclarativelist.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVELIST_H #define QDECLARATIVELIST_H -#include +#include #include #include @@ -114,7 +114,7 @@ private: class QDeclarativeEngine; class QDeclarativeListReferencePrivate; -class Q_QUICK1_EXPORT QDeclarativeListReference +class Q_DECLARATIVE_EXPORT QDeclarativeListReference { public: QDeclarativeListReference(); diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index 0c682021..9cbafb9a 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "private/qdeclarativemetatype_p.h" #include "private/qdeclarativeproxymetaobject_p.h" diff --git a/src/declarative/qml/qdeclarativemetatype_p.h b/src/declarative/qml/qdeclarativemetatype_p.h index 8748f91a..5753b209 100644 --- a/src/declarative/qml/qdeclarativemetatype_p.h +++ b/src/declarative/qml/qdeclarativemetatype_p.h @@ -58,7 +58,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE @@ -66,7 +66,7 @@ class QDeclarativeType; class QDeclarativeCustomParser; class QDeclarativeTypePrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeMetaType +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeMetaType { public: static bool canCopy(int type); @@ -108,7 +108,7 @@ public: static QList parentFunctions(); }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeType +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeType { public: QByteArray typeName() const; diff --git a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h index 606159f5..12c62850 100644 --- a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h +++ b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVENETWORKACCESSMANAGERFACTORY_H #define QDECLARATIVENETWORKACCESSMANAGERFACTORY_H -#include +#include #include QT_BEGIN_HEADER @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QNetworkAccessManager; -class Q_QUICK1_EXPORT QDeclarativeNetworkAccessManagerFactory +class Q_DECLARATIVE_EXPORT QDeclarativeNetworkAccessManagerFactory { public: virtual ~QDeclarativeNetworkAccessManagerFactory(); diff --git a/src/declarative/qml/qdeclarativeparser_p.h b/src/declarative/qml/qdeclarativeparser_p.h index 676206c2..25d13a0e 100644 --- a/src/declarative/qml/qdeclarativeparser_p.h +++ b/src/declarative/qml/qdeclarativeparser_p.h @@ -237,7 +237,7 @@ namespace QDeclarativeParser QList dynamicSlots; }; - class Q_QUICK1_EXPORT Variant + class Q_DECLARATIVE_EXPORT Variant { public: enum Type { diff --git a/src/declarative/qml/qdeclarativeparserstatus.h b/src/declarative/qml/qdeclarativeparserstatus.h index ffefe63f..9c646584 100644 --- a/src/declarative/qml/qdeclarativeparserstatus.h +++ b/src/declarative/qml/qdeclarativeparserstatus.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPARSERSTATUS_H #define QDECLARATIVEPARSERSTATUS_H -#include +#include #include QT_BEGIN_HEADER @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_EXPORT QDeclarativeParserStatus +class Q_DECLARATIVE_EXPORT QDeclarativeParserStatus { public: QDeclarativeParserStatus(); diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h index a8d5308d..79e32779 100644 --- a/src/declarative/qml/qdeclarativeprivate.h +++ b/src/declarative/qml/qdeclarativeprivate.h @@ -53,7 +53,7 @@ // We mean it. // -#include +#include #include QT_BEGIN_HEADER @@ -77,7 +77,7 @@ public: class QDeclarativeCustomParser; namespace QDeclarativePrivate { - void Q_QUICK1_EXPORT qdeclarativeelement_destructor(QObject *); + void Q_DECLARATIVE_EXPORT qdeclarativeelement_destructor(QObject *); template class QDeclarativeElement : public T { @@ -239,7 +239,7 @@ namespace QDeclarativePrivate AutoParentRegistration = 2 }; - int Q_QUICK1_EXPORT qmlregister(RegistrationType, void *); + int Q_DECLARATIVE_EXPORT qmlregister(RegistrationType, void *); } QT_END_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeproperty.h b/src/declarative/qml/qdeclarativeproperty.h index c46afb45..e4f99021 100644 --- a/src/declarative/qml/qdeclarativeproperty.h +++ b/src/declarative/qml/qdeclarativeproperty.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPROPERTY_H #define QDECLARATIVEPROPERTY_H -#include +#include #include QT_BEGIN_HEADER @@ -57,7 +57,7 @@ class QDeclarativeContext; class QDeclarativeEngine; class QDeclarativePropertyPrivate; -class Q_QUICK1_EXPORT QDeclarativeProperty +class Q_DECLARATIVE_EXPORT QDeclarativeProperty { public: enum PropertyTypeCategory { diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h index 36479c0e..6430232b 100644 --- a/src/declarative/qml/qdeclarativeproperty_p.h +++ b/src/declarative/qml/qdeclarativeproperty_p.h @@ -55,7 +55,7 @@ #include "qdeclarativeproperty.h" -#include +#include #include #include #include @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE class QDeclarativeContext; class QDeclarativeEnginePrivate; class QDeclarativeExpression; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativePropertyPrivate : public QDeclarativeRefCount +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePropertyPrivate : public QDeclarativeRefCount { public: enum WriteFlag { BypassInterceptor = 0x01, DontRemoveBinding = 0x02, RemoveBindingOnAliasWrite = 0x04 }; diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h index 7be52ff2..c78d2410 100644 --- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h +++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H #define QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H -#include +#include #include QT_BEGIN_HEADER @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeProperty; -class Q_QUICK1_EXPORT QDeclarativePropertyValueInterceptor +class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueInterceptor { public: QDeclarativePropertyValueInterceptor(); diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.h b/src/declarative/qml/qdeclarativepropertyvaluesource.h index 2d58fa4a..d69a52bd 100644 --- a/src/declarative/qml/qdeclarativepropertyvaluesource.h +++ b/src/declarative/qml/qdeclarativepropertyvaluesource.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPROPERTYVALUESOURCE_H #define QDECLARATIVEPROPERTYVALUESOURCE_H -#include +#include #include QT_BEGIN_HEADER @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeProperty; -class Q_QUICK1_EXPORT QDeclarativePropertyValueSource +class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueSource { public: QDeclarativePropertyValueSource(); diff --git a/src/declarative/qml/qdeclarativerefcount_p.h b/src/declarative/qml/qdeclarativerefcount_p.h index 75c812d1..346e742e 100644 --- a/src/declarative/qml/qdeclarativerefcount_p.h +++ b/src/declarative/qml/qdeclarativerefcount_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include +#include QT_BEGIN_HEADER @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_EXPORT QDeclarativeRefCount +class Q_DECLARATIVE_EXPORT QDeclarativeRefCount { public: QDeclarativeRefCount(); diff --git a/src/declarative/qml/qdeclarativescriptstring.h b/src/declarative/qml/qdeclarativescriptstring.h index 5af78175..2de39762 100644 --- a/src/declarative/qml/qdeclarativescriptstring.h +++ b/src/declarative/qml/qdeclarativescriptstring.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVESCRIPTSTRING_H #define QDECLARATIVESCRIPTSTRING_H -#include +#include #include #include #include @@ -56,7 +56,7 @@ QT_MODULE(Declarative) class QObject; class QDeclarativeContext; class QDeclarativeScriptStringPrivate; -class Q_QUICK1_EXPORT QDeclarativeScriptString +class Q_DECLARATIVE_EXPORT QDeclarativeScriptString { public: QDeclarativeScriptString(); diff --git a/src/declarative/qml/qdeclarativestringconverters_p.h b/src/declarative/qml/qdeclarativestringconverters_p.h index 639a89f2..dc6971f5 100644 --- a/src/declarative/qml/qdeclarativestringconverters_p.h +++ b/src/declarative/qml/qdeclarativestringconverters_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include +#include #include QT_BEGIN_NAMESPACE @@ -69,19 +69,19 @@ class QVector3D; // XXX - Bauhaus currently uses these methods which is why they're exported namespace QDeclarativeStringConverters { - QVariant Q_QUICK1_PRIVATE_EXPORT variantFromString(const QString &); - QVariant Q_QUICK1_PRIVATE_EXPORT variantFromString(const QString &, int preferredType, bool *ok = 0); + QVariant Q_DECLARATIVE_PRIVATE_EXPORT variantFromString(const QString &); + QVariant Q_DECLARATIVE_PRIVATE_EXPORT variantFromString(const QString &, int preferredType, bool *ok = 0); - QColor Q_QUICK1_PRIVATE_EXPORT colorFromString(const QString &, bool *ok = 0); + QColor Q_DECLARATIVE_PRIVATE_EXPORT colorFromString(const QString &, bool *ok = 0); #ifndef QT_NO_DATESTRING - QDate Q_QUICK1_PRIVATE_EXPORT dateFromString(const QString &, bool *ok = 0); - QTime Q_QUICK1_PRIVATE_EXPORT timeFromString(const QString &, bool *ok = 0); - QDateTime Q_QUICK1_PRIVATE_EXPORT dateTimeFromString(const QString &, bool *ok = 0); + QDate Q_DECLARATIVE_PRIVATE_EXPORT dateFromString(const QString &, bool *ok = 0); + QTime Q_DECLARATIVE_PRIVATE_EXPORT timeFromString(const QString &, bool *ok = 0); + QDateTime Q_DECLARATIVE_PRIVATE_EXPORT dateTimeFromString(const QString &, bool *ok = 0); #endif - QPointF Q_QUICK1_PRIVATE_EXPORT pointFFromString(const QString &, bool *ok = 0); - QSizeF Q_QUICK1_PRIVATE_EXPORT sizeFFromString(const QString &, bool *ok = 0); - QRectF Q_QUICK1_PRIVATE_EXPORT rectFFromString(const QString &, bool *ok = 0); - QVector3D Q_QUICK1_PRIVATE_EXPORT vector3DFromString(const QString &, bool *ok = 0); + QPointF Q_DECLARATIVE_PRIVATE_EXPORT pointFFromString(const QString &, bool *ok = 0); + QSizeF Q_DECLARATIVE_PRIVATE_EXPORT sizeFFromString(const QString &, bool *ok = 0); + QRectF Q_DECLARATIVE_PRIVATE_EXPORT rectFFromString(const QString &, bool *ok = 0); + QVector3D Q_DECLARATIVE_PRIVATE_EXPORT vector3DFromString(const QString &, bool *ok = 0); } QT_END_NAMESPACE diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp index 343d5a73..a7eeeeca 100644 --- a/src/declarative/qml/qdeclarativetypeloader.cpp +++ b/src/declarative/qml/qdeclarativetypeloader.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/declarative/qml/qdeclarativetypeloader_p.h b/src/declarative/qml/qdeclarativetypeloader_p.h index 53e92e52..397f06bb 100644 --- a/src/declarative/qml/qdeclarativetypeloader_p.h +++ b/src/declarative/qml/qdeclarativetypeloader_p.h @@ -55,8 +55,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h index b643efed..7d986bb1 100644 --- a/src/declarative/qml/qdeclarativevaluetype_p.h +++ b/src/declarative/qml/qdeclarativevaluetype_p.h @@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeValueType : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeValueType : public QObject { Q_OBJECT public: @@ -81,7 +81,7 @@ public: virtual void setValue(QVariant) = 0; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeValueTypeFactory +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeValueTypeFactory { public: QDeclarativeValueTypeFactory(); diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp index 2dfe3d88..fcfc70df 100644 --- a/src/declarative/qml/qdeclarativeworkerscript.cpp +++ b/src/declarative/qml/qdeclarativeworkerscript.cpp @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include "qdeclarativenetworkaccessmanagerfactory.h" diff --git a/src/declarative/qml/qperformancetimer_p.h b/src/declarative/qml/qperformancetimer_p.h index 98cf9c25..a1a52a1b 100644 --- a/src/declarative/qml/qperformancetimer_p.h +++ b/src/declarative/qml/qperformancetimer_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qtquick1global.h" +#include "qtdeclarativeglobal.h" QT_BEGIN_HEADER @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_EXPORT QPerformanceTimer +class Q_DECLARATIVE_EXPORT QPerformanceTimer { public: void start(); diff --git a/src/declarative/qtdeclarativeglobal.h b/src/declarative/qtdeclarativeglobal.h new file mode 100644 index 00000000..39e11018 --- /dev/null +++ b/src/declarative/qtdeclarativeglobal.h @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtQml module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** 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, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTDECLARATIVEGLOBAL_H +#define QTDECLARATIVEGLOBAL_H + +#include + +// This definition is in the process of being removed from qtbase - once it +// has been expunged, this will no longer be necssary: +#if defined(Q_DECLARATIVE_EXPORT) +# undef Q_DECLARATIVE_EXPORT +#endif + +#ifndef QT_STATIC +# if defined(QT_BUILD_DECLARATIVE_LIB) +# define Q_DECLARATIVE_EXPORT Q_DECL_EXPORT +# else +# define Q_DECLARATIVE_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_DECLARATIVE_EXPORT +#endif + +#endif // QTDECLARATIVEGLOBAL_H diff --git a/src/declarative/qtdeclarativeglobal_p.h b/src/declarative/qtdeclarativeglobal_p.h new file mode 100644 index 00000000..f18c5c6c --- /dev/null +++ b/src/declarative/qtdeclarativeglobal_p.h @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtQml module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** 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, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTDECLARATIVEGLOBAL_P_H +#define QTDECLARATIVEGLOBAL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qtdeclarativeglobal.h" + +#define Q_DECLARATIVE_PRIVATE_EXPORT Q_DECLARATIVE_EXPORT + +#endif // QTDECLARATIVEGLOBAL_P_H diff --git a/src/declarative/qtquick1global.h b/src/declarative/qtquick1global.h deleted file mode 100644 index 033833ab..00000000 --- a/src/declarative/qtquick1global.h +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** 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, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, 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. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QTQUICK1GLOBAL_H -#define QTQUICK1GLOBAL_H - -#include - -// This definition is in the process of being removed from qtbase - once it -// has been expunged, this will no longer be necssary: -#if defined(Q_QUICK1_EXPORT) -# undef Q_QUICK1_EXPORT -#endif - -#ifndef QT_STATIC -# if defined(QT_BUILD_QUICK1_LIB) -# define Q_QUICK1_EXPORT Q_DECL_EXPORT -# else -# define Q_QUICK1_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_QUICK1_EXPORT -#endif - -#endif // QTQUICK1GLOBAL_H diff --git a/src/declarative/qtquick1global_p.h b/src/declarative/qtquick1global_p.h deleted file mode 100644 index 38d9c7a2..00000000 --- a/src/declarative/qtquick1global_p.h +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** 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, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, 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. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QTQUICK1GLOBAL_P_H -#define QTQUICK1GLOBAL_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include "qtquick1global.h" - -#define Q_QUICK1_PRIVATE_EXPORT Q_QUICK1_EXPORT - -#endif // QTQUICK1GLOBAL_P_H diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h index 3f29d2d6..746d9f75 100644 --- a/src/declarative/util/qdeclarativeanimation_p.h +++ b/src/declarative/util/qdeclarativeanimation_p.h @@ -63,7 +63,7 @@ QT_MODULE(Declarative) class QDeclarativeAbstractAnimationPrivate; class QDeclarativeAnimationGroup; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeAbstractAnimation) @@ -165,7 +165,7 @@ protected: }; class QDeclarativeScriptActionPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeScriptAction : public QDeclarativeAbstractAnimation +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeScriptAction : public QDeclarativeAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeScriptAction) diff --git a/src/declarative/util/qdeclarativeapplication_p.h b/src/declarative/util/qdeclarativeapplication_p.h index f1eea59a..9afcd623 100644 --- a/src/declarative/util/qdeclarativeapplication_p.h +++ b/src/declarative/util/qdeclarativeapplication_p.h @@ -44,7 +44,7 @@ #include #include -#include +#include QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeApplicationPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeApplication : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeApplication : public QObject { Q_OBJECT Q_PROPERTY(bool active READ active NOTIFY activeChanged) diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h index 40f8926b..6646d03b 100644 --- a/src/declarative/util/qdeclarativebehavior_p.h +++ b/src/declarative/util/qdeclarativebehavior_p.h @@ -57,7 +57,7 @@ QT_MODULE(Declarative) class QDeclarativeAbstractAnimation; class QDeclarativeBehaviorPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeBehavior : public QObject, public QDeclarativePropertyValueInterceptor +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBehavior : public QObject, public QDeclarativePropertyValueInterceptor { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeBehavior) diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/util/qdeclarativelistmodel_p.h index 5c06aa61..52e442c7 100644 --- a/src/declarative/util/qdeclarativelistmodel_p.h +++ b/src/declarative/util/qdeclarativelistmodel_p.h @@ -64,7 +64,7 @@ class NestedListModel; class QDeclarativeListModelWorkerAgent; struct ModelNode; class FlatListScriptClass; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeListModel : public QListModelInterface +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeListModel : public QListModelInterface { Q_OBJECT Q_PROPERTY(int count READ count NOTIFY countChanged) diff --git a/src/declarative/util/qdeclarativeopenmetaobject_p.h b/src/declarative/util/qdeclarativeopenmetaobject_p.h index 52486337..de09c514 100644 --- a/src/declarative/util/qdeclarativeopenmetaobject_p.h +++ b/src/declarative/util/qdeclarativeopenmetaobject_p.h @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include @@ -58,7 +58,7 @@ QT_MODULE(Declarative) class QDeclarativeEngine; class QMetaPropertyBuilder; class QDeclarativeOpenMetaObjectTypePrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeOpenMetaObjectType : public QDeclarativeRefCount +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeOpenMetaObjectType : public QDeclarativeRefCount { public: QDeclarativeOpenMetaObjectType(const QMetaObject *base, QDeclarativeEngine *engine); @@ -79,7 +79,7 @@ private: }; class QDeclarativeOpenMetaObjectPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeOpenMetaObject : public QAbstractDynamicMetaObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeOpenMetaObject : public QAbstractDynamicMetaObject { public: QDeclarativeOpenMetaObject(QObject *, bool = true); diff --git a/src/declarative/util/qdeclarativepixmapcache_p.h b/src/declarative/util/qdeclarativepixmapcache_p.h index dddeb4b5..868b4c68 100644 --- a/src/declarative/util/qdeclarativepixmapcache_p.h +++ b/src/declarative/util/qdeclarativepixmapcache_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPIXMAPCACHE_H #define QDECLARATIVEPIXMAPCACHE_H -#include +#include #include #include @@ -57,7 +57,7 @@ QT_MODULE(Declarative) class QDeclarativeEngine; class QDeclarativePixmapData; -class Q_QUICK1_EXPORT QDeclarativePixmap +class Q_DECLARATIVE_EXPORT QDeclarativePixmap { Q_DECLARE_TR_FUNCTIONS(QDeclarativePixmap) public: diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/declarative/util/qdeclarativepropertychanges_p.h index e8f5b09e..eaa19db2 100644 --- a/src/declarative/util/qdeclarativepropertychanges_p.h +++ b/src/declarative/util/qdeclarativepropertychanges_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativePropertyChangesPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativePropertyChanges : public QDeclarativeStateOperation +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePropertyChanges : public QDeclarativeStateOperation { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativePropertyChanges) diff --git a/src/declarative/util/qdeclarativepropertymap.h b/src/declarative/util/qdeclarativepropertymap.h index aeaba91d..25dd12c8 100644 --- a/src/declarative/util/qdeclarativepropertymap.h +++ b/src/declarative/util/qdeclarativepropertymap.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPROPERTYMAP_H #define QDECLARATIVEPROPERTYMAP_H -#include +#include #include #include #include @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativePropertyMapPrivate; -class Q_QUICK1_EXPORT QDeclarativePropertyMap : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativePropertyMap : public QObject { Q_OBJECT public: diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h index 797e871c..e879edf7 100644 --- a/src/declarative/util/qdeclarativestate_p.h +++ b/src/declarative/util/qdeclarativestate_p.h @@ -46,7 +46,7 @@ #include #include #include -#include +#include QT_BEGIN_HEADER @@ -58,7 +58,7 @@ class QDeclarativeActionEvent; class QDeclarativeAbstractBinding; class QDeclarativeBinding; class QDeclarativeExpression; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAction +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAction { public: QDeclarativeAction(); @@ -115,7 +115,7 @@ public: class QDeclarativeStateGroup; class QDeclarativeState; class QDeclarativeStateOperationPrivate; -class Q_QUICK1_EXPORT QDeclarativeStateOperation : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeStateOperation : public QObject { Q_OBJECT public: @@ -140,7 +140,7 @@ typedef QDeclarativeStateOperation::ActionList QDeclarativeStateActions; class QDeclarativeTransition; class QDeclarativeStatePrivate; -class Q_QUICK1_EXPORT QDeclarativeState : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeState : public QObject { Q_OBJECT diff --git a/src/declarative/util/qdeclarativestategroup_p.h b/src/declarative/util/qdeclarativestategroup_p.h index ff25f86c..4609af50 100644 --- a/src/declarative/util/qdeclarativestategroup_p.h +++ b/src/declarative/util/qdeclarativestategroup_p.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeStateGroupPrivate; -class Q_QUICK1_EXPORT QDeclarativeStateGroup : public QObject, public QDeclarativeParserStatus +class Q_DECLARATIVE_EXPORT QDeclarativeStateGroup : public QObject, public QDeclarativeParserStatus { Q_OBJECT Q_INTERFACES(QDeclarativeParserStatus) diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h index 203c1280..d18153aa 100644 --- a/src/declarative/util/qdeclarativestateoperations_p.h +++ b/src/declarative/util/qdeclarativestateoperations_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeParentChangePrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeParentChange : public QDeclarativeStateOperation, public QDeclarativeActionEvent +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeParentChange : public QDeclarativeStateOperation, public QDeclarativeActionEvent { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeParentChange) @@ -251,7 +251,7 @@ private: }; class QDeclarativeAnchorChangesPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAnchorChanges : public QDeclarativeStateOperation, public QDeclarativeActionEvent +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAnchorChanges : public QDeclarativeStateOperation, public QDeclarativeActionEvent { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeAnchorChanges) diff --git a/src/declarative/util/qdeclarativetimer_p.h b/src/declarative/util/qdeclarativetimer_p.h index a982aac3..111723e5 100644 --- a/src/declarative/util/qdeclarativetimer_p.h +++ b/src/declarative/util/qdeclarativetimer_p.h @@ -47,7 +47,7 @@ #include #include -#include +#include QT_BEGIN_HEADER @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeTimerPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeTimer : public QObject, public QDeclarativeParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeTimer) diff --git a/src/declarative/util/qdeclarativetransition_p.h b/src/declarative/util/qdeclarativetransition_p.h index db1aa54a..91472909 100644 --- a/src/declarative/util/qdeclarativetransition_p.h +++ b/src/declarative/util/qdeclarativetransition_p.h @@ -57,7 +57,7 @@ QT_MODULE(Declarative) class QDeclarativeAbstractAnimation; class QDeclarativeTransitionPrivate; class QDeclarativeTransitionManager; -class Q_QUICK1_EXPORT QDeclarativeTransition : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeTransition : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeTransition) diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h index f3d18ac2..70995eec 100644 --- a/src/declarative/util/qdeclarativeview.h +++ b/src/declarative/util/qdeclarativeview.h @@ -47,7 +47,7 @@ #include #include #include -#include +#include QT_BEGIN_HEADER @@ -61,7 +61,7 @@ class QDeclarativeContext; class QDeclarativeError; class QDeclarativeViewPrivate; -class Q_QUICK1_EXPORT QDeclarativeView : public QGraphicsView +class Q_DECLARATIVE_EXPORT QDeclarativeView : public QGraphicsView { Q_OBJECT Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode) diff --git a/src/declarative/util/qlistmodelinterface_p.h b/src/declarative/util/qlistmodelinterface_p.h index beccea34..ceaecdeb 100644 --- a/src/declarative/util/qlistmodelinterface_p.h +++ b/src/declarative/util/qlistmodelinterface_p.h @@ -45,7 +45,7 @@ #include #include -#include +#include QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_PRIVATE_EXPORT QListModelInterface : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QListModelInterface : public QObject { Q_OBJECT public: diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index 526417ed..32ecac61 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -1,15 +1,15 @@ TARGET = qmlfolderlistmodelplugin -TARGETPATH = QtQuick1/Qt/labs/folderlistmodel +TARGETPATH = QtDeclarative/Qt/labs/folderlistmodel include(../qimportbase.pri) -QT += widgets quick1 script +QT += widgets declarative script SOURCES += qdeclarativefolderlistmodel.cpp plugin.cpp HEADERS += qdeclarativefolderlistmodel.h OTHER_FILES += folderlistmodel.json -DESTDIR = $$QT.quick1.imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/folderlistmodel/plugin.cpp b/src/imports/folderlistmodel/plugin.cpp index dab7e479..76ec6a65 100644 --- a/src/imports/folderlistmodel/plugin.cpp +++ b/src/imports/folderlistmodel/plugin.cpp @@ -38,8 +38,8 @@ ** ****************************************************************************/ -#include -#include +#include +#include #include "qdeclarativefolderlistmodel.h" diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index 9bc82bf5..918f7a9a 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -1,15 +1,15 @@ TARGET = qmlgesturesplugin -TARGETPATH = QtQuick1/Qt/labs/gestures +TARGETPATH = QtDeclarative/Qt/labs/gestures include(../qimportbase.pri) -QT += quick1 quick1-private widgets widgets-private gui gui-private core-private script-private +QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private SOURCES += qdeclarativegesturearea.cpp plugin.cpp HEADERS += qdeclarativegesturearea_p.h OTHER_FILES += gestures.json -DESTDIR = $$QT.quick1.imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/gestures/plugin.cpp b/src/imports/gestures/plugin.cpp index 2d34f2d0..5c938fe0 100644 --- a/src/imports/gestures/plugin.cpp +++ b/src/imports/gestures/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include -#include +#include +#include #include "qdeclarativegesturearea_p.h" diff --git a/src/imports/particles/particles.cpp b/src/imports/particles/particles.cpp index 0f5ee3a6..15f1ca4f 100644 --- a/src/imports/particles/particles.cpp +++ b/src/imports/particles/particles.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include -#include +#include +#include #include "qdeclarativeparticles_p.h" diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index b4ce049d..029d6595 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -1,8 +1,8 @@ TARGET = qmlparticlesplugin -TARGETPATH = QtQuick1/Qt/labs/particles +TARGETPATH = QtDeclarative/Qt/labs/particles include(../qimportbase.pri) -QT += quick1 quick1-private core-private gui-private widgets-private +QT += declarative declarative-private core-private gui-private widgets-private SOURCES += \ qdeclarativeparticles.cpp \ @@ -13,7 +13,7 @@ HEADERS += \ OTHER_FILES += particles.json -DESTDIR = $$QT.quick1.imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/particles/qdeclarativeparticles_p.h b/src/imports/particles/qdeclarativeparticles_p.h index 69f646c2..fc58ad92 100644 --- a/src/imports/particles/qdeclarativeparticles_p.h +++ b/src/imports/particles/qdeclarativeparticles_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPARTICLES_H #define QDECLARATIVEPARTICLES_H -#include +#include QT_BEGIN_HEADER diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri index 81c737af..b1ecbea4 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/qimportbase.pri @@ -12,7 +12,7 @@ isEmpty(TARGET) { QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir copy2build.input = QMLDIRFILE -copy2build.output = $$QT.quick1.imports/$$TARGETPATH/qmldir +copy2build.output = $$QT.declarative.imports/$$TARGETPATH/qmldir !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copy2build.name = COPY ${QMAKE_FILE_IN} diff --git a/src/imports/shaders/qmlshadersplugin_plugin.cpp b/src/imports/shaders/qmlshadersplugin_plugin.cpp index 7004550d..eb234bd5 100644 --- a/src/imports/shaders/qmlshadersplugin_plugin.cpp +++ b/src/imports/shaders/qmlshadersplugin_plugin.cpp @@ -43,7 +43,7 @@ #include "shadereffectitem.h" #include "shadereffectsource.h" -#include +#include void qmlshaderspluginPlugin::registerTypes(const char *uri) { diff --git a/src/imports/shaders/qmlshadersplugin_plugin.h b/src/imports/shaders/qmlshadersplugin_plugin.h index 3b7998a9..ae980e4f 100644 --- a/src/imports/shaders/qmlshadersplugin_plugin.h +++ b/src/imports/shaders/qmlshadersplugin_plugin.h @@ -42,7 +42,7 @@ #ifndef QMLSHADERSPLUGIN_PLUGIN_H #define QMLSHADERSPLUGIN_PLUGIN_H -#include +#include class qmlshaderspluginPlugin : public QDeclarativeExtensionPlugin { diff --git a/src/imports/shaders/shaders.pro b/src/imports/shaders/shaders.pro index ae9cb8b1..16e8e536 100644 --- a/src/imports/shaders/shaders.pro +++ b/src/imports/shaders/shaders.pro @@ -1,8 +1,8 @@ TARGET = qmlshadersplugin -TARGETPATH = QtQuick1/Qt/labs/shaders +TARGETPATH = QtDeclarative/Qt/labs/shaders include(../qimportbase.pri) -QT += quick1 widgets opengl +QT += declarative widgets opengl SOURCES += \ qmlshadersplugin_plugin.cpp \ @@ -23,7 +23,7 @@ HEADERS += \ OTHER_FILES += shaders.json -DESTDIR = $$QT.quick1.imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/imports/webview/webview.pro b/src/imports/webview/webview.pro index 9ed375db..e46d9efe 100644 --- a/src/imports/webview/webview.pro +++ b/src/imports/webview/webview.pro @@ -2,14 +2,14 @@ TARGET = qmlwebkitplugin TARGETPATH = QtQuick1/QtWebKit include(../qimportbase.pri) -QT += quick1 quick1-private widgets widgets-private gui gui-private core-private script-private webkit +QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private webkit SOURCES += qdeclarativewebview.cpp plugin.cpp HEADERS += qdeclarativewebview_p.h OTHER_FILES += plugin.json -DESTDIR = $$QT.quick1.imports/$$TARGETPATH +DESTDIR = $$QT.declarative.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir diff --git a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp index 0d6bfee3..df6a1be4 100644 --- a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -54,9 +54,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800 diff --git a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h index 9d767440..9c1d84a4 100644 --- a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h +++ b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h @@ -52,7 +52,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#include +#include class QmlApplicationViewer : public QDeclarativeView { diff --git a/src/plugins/qdeclarativeview/qdeclarativeview.pro b/src/plugins/qdeclarativeview/qdeclarativeview.pro index 6b63dfb2..2f8009cb 100644 --- a/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ b/src/plugins/qdeclarativeview/qdeclarativeview.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = qdeclarativeview CONFIG += qt warn_on plugin designer -QT += quick1 widgets designer +QT += declarative widgets designer DESTDIR = $$QT.designer.plugins/designer contains(TEMPLATE, ".*lib"):TARGET = $$qtLibraryTarget($$TARGET) diff --git a/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp b/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp index e3eaca64..2b61a9cb 100644 --- a/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp +++ b/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include static const char toolTipC[] = "QtDeclarative view widget"; @@ -79,7 +79,7 @@ QString QDeclarativeViewPlugin::whatsThis() const QString QDeclarativeViewPlugin::includeFile() const { - return QStringLiteral("QtQuick1/QDeclarativeView"); + return QStringLiteral("QtDeclarative/QDeclarativeView"); } QIcon QDeclarativeViewPlugin::icon() const diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp index 1386ac4a..9d0cee64 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp @@ -44,10 +44,10 @@ #include "abstracttool.h" #include "qdeclarativeinspectorprotocol.h" -#include -#include +#include +#include #include -#include +#include #include diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp index c40e8536..ab1acf0c 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp @@ -52,8 +52,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp index 31fc1753..b6b6c0ae 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp @@ -48,7 +48,7 @@ #include "editor/livelayeritem.h" #include "editor/boundingrecthighlighter.h" -#include +#include #include namespace QmlJSDebugger { diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h index 4ad457e9..1ac012fb 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h @@ -47,7 +47,7 @@ #include "abstractviewinspector.h" #include -#include +#include namespace QmlJSDebugger { namespace QtQuick1 { diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h index 8316c5f1..a0cbdf1f 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h @@ -45,11 +45,11 @@ #include "qdeclarativeviewinspector.h" #include -#include +#include #include #include -#include +#include namespace QmlJSDebugger { namespace QtQuick1 { diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index 9e62390e..46ba748b 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -1,9 +1,9 @@ TARGET = qmldbg_inspector -QT += quick1 quick1-private gui widgets core-private +QT += declarative declarative-private gui widgets core-private load(qt_plugin) -DESTDIR = $$QT.quick1.plugins/qmltooling +DESTDIR = $$QT.declarative.plugins/qmltooling INCLUDEPATH *= $$PWD diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h b/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h index 02e4f904..f65e70a7 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h @@ -42,7 +42,7 @@ #ifndef QMLINSPECTORCONSTANTS_H #define QMLINSPECTORCONSTANTS_H -#include +#include namespace QmlJSDebugger { namespace Constants { diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp index bb81aa4f..edd91d2f 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp @@ -43,8 +43,8 @@ #include "qdeclarativeviewinspector.h" #include -#include -#include +#include +#include namespace QmlJSDebugger { namespace QtQuick1 { diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h index 2e751af2..69d1d628 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h +++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h @@ -43,7 +43,7 @@ #define QDECLARATIVEINSPECTORPLUGIN_H #include -#include +#include namespace QmlJSDebugger { diff --git a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro index a479cf93..b6857be6 100644 --- a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro +++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro @@ -1,9 +1,9 @@ -TARGET = qmldbg_tcp_qtquick1 -QT += quick1 quick1-private network +TARGET = qmldbg_tcp_qtdeclarative +QT += declarative declarative-private network load(qt_plugin) -DESTDIR = $$QT.quick1.plugins/qmltooling +DESTDIR = $$QT.declarative.plugins/qmltooling SOURCES += \ qtcpserverconnection.cpp diff --git a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h index 14480714..b5798e4e 100644 --- a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h +++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h @@ -42,7 +42,7 @@ #ifndef QTCPSERVERCONNECTION_H #define QTCPSERVERCONNECTION_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/sync.profile b/sync.profile index 3f912d0e..fc0aa162 100644 --- a/sync.profile +++ b/sync.profile @@ -1,5 +1,5 @@ %modules = ( # path to module name map - "QtQuick1" => "$basedir/src/declarative", + "QtDeclarative" => "$basedir/src/declarative", ); # Module dependencies. # Every module that is required to build this module should have one entry. diff --git a/tests/auto/cmake/test_modules/CMakeLists.txt b/tests/auto/cmake/test_modules/CMakeLists.txt index 1a1352ff..95459d19 100644 --- a/tests/auto/cmake/test_modules/CMakeLists.txt +++ b/tests/auto/cmake/test_modules/CMakeLists.txt @@ -6,19 +6,19 @@ project(test_modules) find_package(Qt5Script REQUIRED) find_package(Qt5Widgets REQUIRED) -find_package(Qt5Quick1 REQUIRED) +find_package(Qt5Declarative REQUIRED) include_directories( - ${Qt5Quick1_INCLUDE_DIRS} + ${Qt5Declarative_INCLUDE_DIRS} ) add_definitions( - ${Qt5Quick1_DEFINITIONS} + ${Qt5Declarative_DEFINITIONS} ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") add_executable(mainapp main.cpp) target_link_libraries(mainapp - ${Qt5Quick1_LIBRARIES} + ${Qt5Declarative_LIBRARIES} ) diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index 57c1642d..111962a5 100644 --- a/tests/auto/declarative/examples/examples.pro +++ b/tests/auto/declarative/examples/examples.pro @@ -3,7 +3,7 @@ testcase.timeout = 400 # this test is slow TARGET = tst_examples QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 +contains(QT_CONFIG,declarative): QT += declarative macx:CONFIG -= app_bundle SOURCES += tst_examples.cpp diff --git a/tests/auto/declarative/moduleqt47/moduleqt47.pro b/tests/auto/declarative/moduleqt47/moduleqt47.pro index c7e54046..93da5262 100644 --- a/tests/auto/declarative/moduleqt47/moduleqt47.pro +++ b/tests/auto/declarative/moduleqt47/moduleqt47.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_moduleqt47 QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 gui widgets +contains(QT_CONFIG,declarative): QT += declarative gui widgets macx:CONFIG -= app_bundle SOURCES += tst_moduleqt47.cpp diff --git a/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp b/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp index 74f4093b..1978aae3 100644 --- a/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp +++ b/tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include #include -#include -#include +#include +#include class tst_moduleqt47 : public QObject { diff --git a/tests/auto/declarative/parserstress/parserstress.pro b/tests/auto/declarative/parserstress/parserstress.pro index cc43281e..e314f426 100644 --- a/tests/auto/declarative/parserstress/parserstress.pro +++ b/tests/auto/declarative/parserstress/parserstress.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_parserstress QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 +contains(QT_CONFIG,declarative): QT += declarative macx:CONFIG -= app_bundle SOURCES += tst_parserstress.cpp diff --git a/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro b/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro index ed77ae76..912676d0 100644 --- a/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro +++ b/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeanchors QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets widgets-private gui gui-private core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets widgets-private gui gui-private core-private SOURCES += tst_qdeclarativeanchors.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp index 79d46507..965fd0e7 100644 --- a/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp +++ b/tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp @@ -43,13 +43,13 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include -#include -#include +#include +#include Q_DECLARE_METATYPE(QDeclarativeAnchors::Anchor) Q_DECLARE_METATYPE(QDeclarativeAnchorLine::AnchorLine) diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro b/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro index 22c388b4..c49b305b 100644 --- a/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro +++ b/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeanimatedimage QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private network widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private network widgets HEADERS += ../shared/testhttpserver.h SOURCES += tst_qdeclarativeanimatedimage.cpp ../shared/testhttpserver.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp index de9accca..f2c93346 100644 --- a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp +++ b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp @@ -40,14 +40,14 @@ ****************************************************************************/ #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include +#include #include "../shared/testhttpserver.h" diff --git a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro index 37ba135c..77fc0707 100644 --- a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro +++ b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeanimations QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private core-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private gui-private widgets-private SOURCES += tst_qdeclarativeanimations.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp index 87063d1d..afd0b3d3 100644 --- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp +++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro b/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro index a9d3669a..cd896bb1 100644 --- a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro +++ b/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeapplication QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 gui-private widgets +contains(QT_CONFIG,declarative): QT += declarative gui-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeapplication.cpp diff --git a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp index af8e28dc..3904663a 100644 --- a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp +++ b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro index 8c22e208..18b04f57 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro +++ b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativebehaviors QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private core-private widgets-private gui-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private widgets-private gui-private SOURCES += tst_qdeclarativebehaviors.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp index 3fe2330f..e6eea8ae 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp +++ b/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro index 8e8a14e0..09446c74 100644 --- a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro +++ b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativebinding QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativebinding.cpp diff --git a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp index 9770fbf3..7636909c 100644 --- a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp +++ b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include #include diff --git a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro index 8cbc8de1..0ed28acf 100644 --- a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro +++ b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeborderimage QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets network +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp index 250c7846..fdad66f1 100644 --- a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp +++ b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp @@ -46,13 +46,13 @@ #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include "../shared/testhttpserver.h" diff --git a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro index ad5d8dbf..5bd9e282 100644 --- a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro +++ b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativecomponent QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 +contains(QT_CONFIG,declarative): QT += declarative QT += script network widgets macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp index 39a42dd1..573bdb44 100644 --- a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp +++ b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp @@ -42,10 +42,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include class tst_qdeclarativecomponent : public QObject diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro index 8b84993f..e71c6327 100644 --- a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro +++ b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeconnection QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui core-private script-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui core-private script-private gui-private widgets-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeconnection.cpp diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp index 9f90af82..7729f9d1 100644 --- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp +++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include #include -#include +#include class tst_qdeclarativeconnection : public QObject diff --git a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro index ef0d2f3b..ef0ff142 100644 --- a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro +++ b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativecontext QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 +contains(QT_CONFIG,declarative): QT += declarative SOURCES += tst_qdeclarativecontext.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro b/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro index e5fc671f..70b12e8b 100644 --- a/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro +++ b/tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedebug QT += testlib -contains(QT_CONFIG,quick1): QT += network quick1 quick1-private core-private script-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += network declarative declarative-private core-private script-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp index 7c59dcea..0c108af9 100644 --- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp +++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp @@ -45,11 +45,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro index 0d887850..c99265b5 100644 --- a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro +++ b/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedebugclient QT += testlib -contains(QT_CONFIG,quick1): QT += network quick1 quick1-private core-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += network declarative declarative-private core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp index 9a0937bd..4d2aba4e 100644 --- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp +++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include #include diff --git a/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h index d1d4a75a..ae509fdd 100644 --- a/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h +++ b/tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h @@ -53,7 +53,7 @@ class QDeclarativeEngine; // Helper methods to access private API through a stable interface // This is used in the qmljsdebugger library of QtCreator. -class Q_QUICK1_EXPORT QDeclarativeDebugHelper +class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper { public: static QScriptEngine *getScriptEngine(QDeclarativeEngine *engine); diff --git a/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro b/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro index 867d9b52..1cde1be0 100644 --- a/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro +++ b/tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedebughelper QT += testlib -contains(QT_CONFIG,quick1): QT += network quick1 quick1-private script script-private core-private +contains(QT_CONFIG,declarative): QT += network declarative declarative-private script script-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativedebughelper.cpp diff --git a/tests/auto/declarative/qdeclarativedebugjs/app/app.pro b/tests/auto/declarative/qdeclarativedebugjs/app/app.pro index 157328d9..82336dc0 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/app/app.pro +++ b/tests/auto/declarative/qdeclarativedebugjs/app/app.pro @@ -1,6 +1,6 @@ TEMPLATE = app -QT += quick1 quick1-private gui widgets +QT += declarative declarative-private gui widgets CONFIG += declarative_debug CONFIG += console diff --git a/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp b/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp index d462b811..40d7bc13 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp +++ b/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp index 7325be4f..6c1197bc 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp +++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp @@ -41,10 +41,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro index 6f8a8577..4f972747 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro +++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro @@ -3,7 +3,7 @@ testcase.timeout = 600 # this test is slow TARGET = tst_qdeclarativedebugjs QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private network script core-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private network script core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro index b517c11d..e27b324e 100644 --- a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro +++ b/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedebugservice QT += testlib -contains(QT_CONFIG,quick1): QT += network quick1 quick1-private core-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += network declarative declarative-private core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp index 66aed242..f6982f87 100644 --- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp +++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro b/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro index e3056c71..480ac463 100644 --- a/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro +++ b/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedom QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativedom.cpp diff --git a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp index 90d0ed8d..37fba35a 100644 --- a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp +++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro index 325f5bc8..92f8d09f 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro +++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeecmascript QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script script-private network widgets core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private script script-private network widgets core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeecmascript.cpp \ diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h index 8b88813e..f7afe0e8 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h +++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h @@ -42,19 +42,19 @@ #define TESTTYPES_H #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include #include #include #include -#include -#include +#include +#include class MyQmlAttachedObject : public QObject { diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 339db83c..4e6499a1 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -40,13 +40,13 @@ ****************************************************************************/ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro index d7424a24..8004009f 100644 --- a/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro +++ b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeengine QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 network +contains(QT_CONFIG,declarative): QT += declarative network macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeengine.cpp diff --git a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro index bb129e37..df5efe09 100644 --- a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro +++ b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeerror QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 +contains(QT_CONFIG,declarative): QT += declarative SOURCES += tst_qdeclarativeerror.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro b/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro index 98fa93df..bc613081 100644 --- a/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro +++ b/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeflickable QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets script-private core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets script-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeflickable.cpp diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp index 98e55c69..a0ba6697 100644 --- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp +++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro b/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro index ed19953b..c9770933 100644 --- a/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro +++ b/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeflipable QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeflipable.cpp diff --git a/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp index 831b7929..091cb362 100644 --- a/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp +++ b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro b/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro index 471fd85b..42ea0b8a 100644 --- a/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro +++ b/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativefocusscope QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets SOURCES += tst_qdeclarativefocusscope.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp index a6103d72..8ff45f82 100644 --- a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp +++ b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp @@ -41,13 +41,13 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include class tst_qdeclarativefocusscope : public QObject { diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro index 7ff1f0dd..fc876d13 100644 --- a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro +++ b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativefolderlistmodel QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 +contains(QT_CONFIG,declarative): QT += declarative macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativefolderlistmodel.cpp diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp index 2522c6dc..990bf419 100644 --- a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp +++ b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include #include -#include -#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro index 0a163fe6..510cac65 100644 --- a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro +++ b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativefontloader QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui network +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp index 62dd3aa7..714164da 100644 --- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp +++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp @@ -42,9 +42,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include "../shared/testhttpserver.h" diff --git a/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro b/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro index 5b76ece3..63979826 100644 --- a/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro +++ b/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativegridview QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets widgets-private gui gui-private core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativegridview.cpp diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp index f0d268c8..e6eac67d 100644 --- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp +++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp @@ -41,16 +41,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include class tst_QDeclarativeGridView : public QObject { diff --git a/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro index 4bb3bb47..2db10a00 100644 --- a/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro +++ b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeimage QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets network +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp index 1d2c9115..15b5229e 100644 --- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -44,14 +44,14 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include -#include -#include +#include +#include #include #include diff --git a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro index 443bd4f3..f57f9603 100644 --- a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro +++ b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeimageprovider QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private QT += network macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp index d8894ed7..7e5ffb86 100644 --- a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp +++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include #include -#include -#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro index 8579bc5c..b71a6591 100644 --- a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro +++ b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeinfo QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 widgets +contains(QT_CONFIG,declarative): QT += declarative widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeinfo.cpp diff --git a/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro index ae16bd9b..ae354f0e 100644 --- a/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro +++ b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeinstruction QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script script-private core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private script script-private core-private SOURCES += tst_qdeclarativeinstruction.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro b/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro index febd5d56..d25b77a4 100644 --- a/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro +++ b/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeitem QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui gui-private widgets-private core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui gui-private widgets-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeitem.cpp diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp index fc1585cb..ef5705d0 100644 --- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp +++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro index fc1dd2a3..11a31e9f 100644 --- a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro +++ b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelanguage QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script-private core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private script-private core-private QT += script network macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h index a4a12988..606297b1 100644 --- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h +++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h @@ -47,12 +47,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index fa1f0bf0..eff8b8ad 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include #include -#include -#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro b/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro index 757ac1f5..87416bc6 100644 --- a/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro +++ b/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelayoutitem QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativelayoutitem.cpp diff --git a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro index 9bccc2ad..c9711b6c 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro +++ b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelistmodel QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script-private core-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private script-private core-private gui-private widgets-private QT += script macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp index 48818c93..482d2acd 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp +++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro index 8934703b..4c5dfeeb 100644 --- a/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro +++ b/tests/auto/declarative/qdeclarativelistreference/qdeclarativelistreference.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelistreference QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 +contains(QT_CONFIG,declarative): QT += declarative macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativelistreference.cpp diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp index 9047b3c2..9e60d6c2 100644 --- a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp +++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp @@ -46,9 +46,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include class tst_qdeclarativelistreference : public QDeclarativeDataTest diff --git a/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro b/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro index f7e05710..b5911ac8 100644 --- a/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro +++ b/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativelistview QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets widgets-private gui-private core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets widgets-private gui-private core-private script-private macx:CONFIG -= app_bundle HEADERS += incrementalmodel.h diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp index 935609c0..1bf624ee 100644 --- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp +++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp @@ -41,16 +41,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "incrementalmodel.h" class tst_QDeclarativeListView : public QObject diff --git a/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro index 0d20098f..81b993c1 100644 --- a/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro +++ b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeloader QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui network widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui network widgets macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp index dcdd01f5..1d268d58 100644 --- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp +++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp @@ -44,8 +44,8 @@ #include #include -#include -#include +#include +#include #include #include "testhttpserver.h" diff --git a/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro index 3c3cd811..256f3ebd 100644 --- a/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro +++ b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativemetatype QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets SOURCES += tst_qdeclarativemetatype.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro index 18bb86e8..73fe8dcb 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2.1 include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp index cdbd2d2c..dbd209ba 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include class MyPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro index b541feec..ee453f63 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2 include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp index 4ed053b2..8d06d49f 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include class MyPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp index 801f056a..c6ca8777 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include class MyPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro index b4b04f3f..15e71ee8 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp index 4d41b145..f62e89e3 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include class BarPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro index ff373856..9e5d8a1f 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative DESTDIR = ../imports/com/nokia/AutoTestQmlMixedPluginType include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp index 206386f7..c51d73e1 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include class FloorPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro index 60d20baa..a688df46 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative DESTDIR = ../imports/com/nokia/AutoTestQmlVersionPluginType include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp index 1c00bc0e..ab7fab26 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include class MyPlugin : public QDeclarativeExtensionPlugin diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro index d0b71171..57e22835 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative DESTDIR = ../imports/com/nokia/AutoTestPluginWithQmlFile include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp index f405ad2e..8c48d085 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include class MyPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro index 9be54cc8..202d4903 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative TARGET = Plugin DESTDIR = ../imports/com/nokia/WrongCase diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/plugin.cpp index 3c4dba7c..3f7d9f56 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include // Note: this plugin is unused! diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro index 021e8cc7..f5400602 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core quick1 +QT = core declarative DESTDIR = ../imports/com/nokia/PureQmlModule include(../qmldir_copier.pri) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp index 8c91b29c..b357eea6 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp @@ -41,8 +41,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro index aa0355c0..ef95c170 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativemoduleplugin -QT += quick1 network testlib +QT += declarative network testlib CONFIG -= app_bundle HEADERS = ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro b/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro index 61f856a7..660c90bb 100644 --- a/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro +++ b/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativemousearea QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets gui network +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets gui network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp index 12397e2e..5933d8e3 100644 --- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp +++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp @@ -45,10 +45,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include class tst_QDeclarativeMouseArea: public QObject { diff --git a/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro b/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro index 136e6ae2..014cd170 100644 --- a/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro +++ b/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeparticles QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 widgets +contains(QT_CONFIG,declarative): QT += declarative widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeparticles.cpp diff --git a/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro b/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro index 557b2b69..67fc41fb 100644 --- a/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro +++ b/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepathview QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepathview.cpp diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp index a17d70cb..247c19e3 100644 --- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp +++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp @@ -40,17 +40,17 @@ ****************************************************************************/ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro b/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro index 768c0d2d..19e9272c 100644 --- a/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro +++ b/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepincharea QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui-private widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepincharea.cpp diff --git a/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp b/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp index b253908e..ccaf8532 100644 --- a/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp +++ b/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp @@ -45,8 +45,8 @@ #include #include #include -#include -#include +#include +#include #include class tst_QDeclarativePinchArea: public QObject diff --git a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro index 38975854..1cc45276 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro +++ b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepixmapcache QT += testlib -contains(QT_CONFIG,quick1): QT += concurrent quick1 quick1-private network +contains(QT_CONFIG,declarative): QT += concurrent declarative declarative-private network macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepixmapcache.cpp diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp index 89acc1fe..d85fdefc 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp +++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp @@ -41,8 +41,8 @@ #include #include #include -#include -#include +#include +#include #include #include "testhttpserver.h" diff --git a/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro b/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro index 342cfebc..a6aecebf 100644 --- a/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro +++ b/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepositioners QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private core-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private gui-private widgets-private SOURCES += tst_qdeclarativepositioners.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro index 3e457b69..732774b8 100644 --- a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro +++ b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeproperty QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script-private core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private script-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeproperty.cpp diff --git a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp index b28cd341..2fe7cb13 100644 --- a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp +++ b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro index 57784346..d9706deb 100644 --- a/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro +++ b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativepropertymap QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepropertymap.cpp diff --git a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp index 8c76bb4d..b4fd2162 100644 --- a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp +++ b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro index 5496edd4..fa372083 100644 --- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro +++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeqt QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script script-private core-private widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private script script-private core-private widgets SOURCES += tst_qdeclarativeqt.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro b/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro index 0f884230..9cb17a57 100644 --- a/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro +++ b/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativerepeater QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativerepeater.cpp diff --git a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp index 87142789..d4fb9e37 100644 --- a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp +++ b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp @@ -43,10 +43,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro b/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro index a5dde298..556675ee 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativesmoothedanimation QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui core-private script-private widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui core-private script-private widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesmoothedanimation.cpp diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp b/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp index e8e36ddf..bedd3d80 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro b/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro index 79368203..da587545 100644 --- a/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro +++ b/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativespringanimation QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativespringanimation.cpp diff --git a/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp b/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp index 7b3afec0..c3583b7d 100644 --- a/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp +++ b/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include #include diff --git a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro index a58a3bbb..76730f32 100644 --- a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro +++ b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativestates QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private core-private script-private widgets-private gui-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private script-private widgets-private gui-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativestates.cpp diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp index 274ee197..f57afba5 100644 --- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp +++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro b/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro index b4b932fa..edf81986 100644 --- a/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro +++ b/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativestyledtext QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private QT += network macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro index d85f8b9b..3a08b5e0 100644 --- a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro +++ b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativesystempalette QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesystempalette.cpp diff --git a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp index c10b0e93..1779c6d8 100644 --- a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp +++ b/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp @@ -41,8 +41,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro index 77e83957..bd0ba7c4 100644 --- a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro +++ b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativetext QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui gui-private widgets widgets-private core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui gui-private widgets widgets-private core-private script-private QT += network macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp index 414bf3b9..ecafd795 100644 --- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp +++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include #include -#include -#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro index e657d152..566ca6c6 100644 --- a/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro +++ b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativetextedit QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui gui-private widgets widgets-private network core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui gui-private widgets widgets-private network core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetextedit.cpp ../shared/testhttpserver.cpp diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index 45c686fd..9c899445 100644 --- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -44,14 +44,14 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro b/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro index d89c29ed..83ee832a 100644 --- a/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro +++ b/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativetextinput QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui gui-private widgets widgets-private core-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui gui-private widgets widgets-private core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetextinput.cpp diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp index e705cf3a..f418372e 100644 --- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro index 6cf72b80..4f15073a 100644 --- a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro +++ b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativetimer QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetimer.cpp diff --git a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp index b451dd0d..decd2c34 100644 --- a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp +++ b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include #include -#include -#include +#include +#include #include -#include +#include #include class tst_qdeclarativetimer : public QObject diff --git a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro index ad6821c6..11611bea 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro +++ b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativevaluetypes QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private core-private script-private macx:CONFIG -= app_bundle HEADERS += testtypes.h diff --git a/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro b/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro index 1bbf45b7..98824f4d 100644 --- a/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro +++ b/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeview QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 gui widgets +contains(QT_CONFIG,declarative): QT += declarative gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeview.cpp diff --git a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp index b0e017d8..1d6dd121 100644 --- a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp +++ b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include class tst_QDeclarativeView : public QObject diff --git a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro index f60dbdfd..76dc50d8 100644 --- a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro +++ b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeviewer QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 gui +contains(QT_CONFIG,declarative): QT += declarative gui macx:CONFIG -= app_bundle include(../../../../tools/qml/qml.pri) diff --git a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp index bcc9f158..3536f06b 100644 --- a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp +++ b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include "qmlruntime.h" diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro b/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro index 061f1310..25615747 100644 --- a/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro +++ b/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativevisualdatamodel QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private gui widgets core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativevisualdatamodel.cpp diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp index 69a5b271..eeef9ab0 100644 --- a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp +++ b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp @@ -41,11 +41,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro b/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro index 6c447805..1c1a5fac 100644 --- a/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro +++ b/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro @@ -9,7 +9,7 @@ SOURCES += ../shared/debugutil.cpp INCLUDEPATH += $$PWD/../../../../src/imports/webview -QT += testlib network webkit widgets quick1 quick1-private core-private widgets-private gui-private +QT += testlib network webkit widgets declarative declarative-private core-private widgets-private gui-private exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc diff --git a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro index dd298932..8301f7dc 100644 --- a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro +++ b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeworkerscript QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private script core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeworkerscript.cpp diff --git a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp index 9c224f2c..77c9c75a 100644 --- a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp +++ b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp @@ -46,9 +46,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro index 69ef5c25..85679451 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro @@ -3,7 +3,7 @@ testcase.timeout = 1200 # this is a slow test TARGET = tst_qdeclarativexmlhttprequest QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 network +contains(QT_CONFIG,declarative): QT += declarative network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro index 131ea4b8..0776efca 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro +++ b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativexmllistmodel QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script gui network core-private script-private xmlpatterns +contains(QT_CONFIG,declarative): QT += declarative declarative-private script gui network core-private script-private xmlpatterns macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativexmllistmodel.cpp diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp index ff70c006..e8c1d114 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp +++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp @@ -46,15 +46,15 @@ #include #include -#include +#include #include #include #include #include #include -#include -#include +#include +#include #include typedef QPair QDeclarativeXmlListRange; diff --git a/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro b/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro index c671cb38..7053b003 100644 --- a/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro +++ b/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qmlshadersplugin QT += testlib -QT += opengl quick1 gui widgets +QT += opengl declarative gui widgets SOURCES += tst_qmlshadersplugin.cpp SOURCES += \ diff --git a/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp b/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp index c15a8bdf..a69f2efd 100644 --- a/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp +++ b/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include #include "../../../../src/imports/shaders/shadereffectitem.h" #include "../../../../src/imports/shaders/shadereffectsource.h" #include "../../../../src/imports/shaders/shadereffect.h" diff --git a/tests/auto/declarative/qmlvisual/qmlvisual.pro b/tests/auto/declarative/qmlvisual/qmlvisual.pro index f79bce69..bf991199 100644 --- a/tests/auto/declarative/qmlvisual/qmlvisual.pro +++ b/tests/auto/declarative/qmlvisual/qmlvisual.pro @@ -3,7 +3,7 @@ testcase.timeout = 600 # this test is slow TARGET = tst_qmlvisual QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 gui widgets +contains(QT_CONFIG,declarative): QT += declarative gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qmlvisual.cpp diff --git a/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro b/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro index 92b3be20..131c53da 100644 --- a/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro +++ b/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qpacketprotocol QT += testlib -contains(QT_CONFIG,quick1): QT += network quick1 quick1-private core-private gui-private widgets-private +contains(QT_CONFIG,declarative): QT += network declarative declarative-private core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h diff --git a/tests/auto/declarative/qperformancetimer/qperformancetimer.pro b/tests/auto/declarative/qperformancetimer/qperformancetimer.pro index afd59c67..8e80a4a2 100644 --- a/tests/auto/declarative/qperformancetimer/qperformancetimer.pro +++ b/tests/auto/declarative/qperformancetimer/qperformancetimer.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qperformancetimer QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private SOURCES += tst_qperformancetimer.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/shared/debugutil_p.h b/tests/auto/declarative/shared/debugutil_p.h index 1c27fdbb..884e77a7 100644 --- a/tests/auto/declarative/shared/debugutil_p.h +++ b/tests/auto/declarative/shared/debugutil_p.h @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/tests/auto/declarative/shared/qdeclarativedatatest.cpp b/tests/auto/declarative/shared/qdeclarativedatatest.cpp index 83d7fdfd..27fc4b90 100644 --- a/tests/auto/declarative/shared/qdeclarativedatatest.cpp +++ b/tests/auto/declarative/shared/qdeclarativedatatest.cpp @@ -41,10 +41,10 @@ #include "qdeclarativedatatest.h" -#include -#include -#include -#include +#include +#include +#include +#include #include QDeclarativeDataTest *QDeclarativeDataTest::m_instance = 0; diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro index 4b6ab95e..201fc143 100644 --- a/tests/auto/headersclean/headersclean.pro +++ b/tests/auto/headersclean/headersclean.pro @@ -1,4 +1,4 @@ -QT = core testlib gui quick1 +QT = core testlib gui declarative HEADERSCLEAN_PRI = $${QT.core.sources}/../../tests/auto/other/headersclean/headersclean.pri isEmpty(QT.core.sources)|!include($$HEADERSCLEAN_PRI) { warning("headersclean.pri from QtCore sources not available. test disabled") diff --git a/tests/auto/headersclean/qt_headersclean_headers.h b/tests/auto/headersclean/qt_headersclean_headers.h index c1e1b60f..2133ce46 100644 --- a/tests/auto/headersclean/qt_headersclean_headers.h +++ b/tests/auto/headersclean/qt_headersclean_headers.h @@ -42,6 +42,6 @@ #ifndef QT_HEADERSCLEAN_HEADERS #define QT_HEADERSCLEAN_HEADERS -#include +#include #endif diff --git a/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.cpp b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.cpp index db89b199..f9389619 100644 --- a/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -45,9 +45,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #if defined(QMLJSDEBUGGER) #include diff --git a/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.h b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.h index d0e226c4..3b1cc4cb 100644 --- a/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.h +++ b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.h @@ -43,7 +43,7 @@ #ifndef QMLAPPLICATIONVIEWER_H #define QMLAPPLICATIONVIEWER_H -#include +#include class QmlApplicationViewer : public QDeclarativeView { diff --git a/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.pri b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.pri index 06e4d270..14b3ef2d 100644 --- a/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/tests/manual/declarative/qmlshadersplugin/qmlapplicationviewer/qmlapplicationviewer.pri @@ -5,7 +5,7 @@ # It is recommended not to modify this file, since newer versions of Qt Creator # may offer an updated version of it. -QT += quick1 widgets +QT += declarative widgets SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/tests/manual/declarative/qmlshadersplugin/qmlshadersplugin.pro b/tests/manual/declarative/qmlshadersplugin/qmlshadersplugin.pro index 764f1770..74377f04 100644 --- a/tests/manual/declarative/qmlshadersplugin/qmlshadersplugin.pro +++ b/tests/manual/declarative/qmlshadersplugin/qmlshadersplugin.pro @@ -1,4 +1,4 @@ -QT += quick1 opengl widgets +QT += declarative opengl widgets # Add more folders to ship with the application, here folder_01.source = qml/qmlshadersplugintest diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro index cbe3ebe2..b8abe874 100644 --- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = qdeclarativeview CONFIG += qt warn_on plugin designer -QT += quick1 +QT += declarative include(../plugins.pri) build_all:!build_pass { diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp index 1a6a7bf0..32c574fb 100644 --- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp +++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include static const char toolTipC[] = "QtDeclarative view widget"; diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri index 67cf0a4d..c5f38808 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -1,4 +1,4 @@ -QT += quick1 quick1-private script network sql core-private gui-private widgets-private +QT += declarative declarative-private script network sql core-private gui-private widgets-private contains(QT_CONFIG, opengl) { QT += opengl DEFINES += GL_SUPPORTED diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 4e5e53e2..797fc2cf 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += qt uic quick1_debug quick1 -DESTDIR = $$QT.quick1.bins +CONFIG += qt uic declarative_debug declarative +DESTDIR = $$QT.declarative.bins include(qml.pri) diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 53d7e0cb..9b9ca363 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index 53d202e7..642ea4c5 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -1,7 +1,7 @@ -DESTDIR = $$QT.quick1.bins +DESTDIR = $$QT.declarative.bins TARGET = qml1plugindump -QT += core-private quick1-private +QT += core-private declarative-private SOURCES += \ main.cpp \ -- cgit v1.2.3