diff --git a/src/tools/qml/qmlviewer/Info_mac.plist b/src/tools/qml/qmlobserver/Info_mac.plist similarity index 100% rename from src/tools/qml/qmlviewer/Info_mac.plist rename to src/tools/qml/qmlobserver/Info_mac.plist diff --git a/src/tools/qml/qmlviewer/content/Browser.qml b/src/tools/qml/qmlobserver/content/Browser.qml similarity index 100% rename from src/tools/qml/qmlviewer/content/Browser.qml rename to src/tools/qml/qmlobserver/content/Browser.qml diff --git a/src/tools/qml/qmlviewer/content/images/folder.png b/src/tools/qml/qmlobserver/content/images/folder.png similarity index 100% rename from src/tools/qml/qmlviewer/content/images/folder.png rename to src/tools/qml/qmlobserver/content/images/folder.png diff --git a/src/tools/qml/qmlviewer/content/images/titlebar.png b/src/tools/qml/qmlobserver/content/images/titlebar.png similarity index 100% rename from src/tools/qml/qmlviewer/content/images/titlebar.png rename to src/tools/qml/qmlobserver/content/images/titlebar.png diff --git a/src/tools/qml/qmlviewer/content/images/titlebar.sci b/src/tools/qml/qmlobserver/content/images/titlebar.sci similarity index 100% rename from src/tools/qml/qmlviewer/content/images/titlebar.sci rename to src/tools/qml/qmlobserver/content/images/titlebar.sci diff --git a/src/tools/qml/qmlviewer/content/images/up.png b/src/tools/qml/qmlobserver/content/images/up.png similarity index 100% rename from src/tools/qml/qmlviewer/content/images/up.png rename to src/tools/qml/qmlobserver/content/images/up.png diff --git a/src/tools/qml/qmlviewer/deviceorientation.cpp b/src/tools/qml/qmlobserver/deviceorientation.cpp similarity index 100% rename from src/tools/qml/qmlviewer/deviceorientation.cpp rename to src/tools/qml/qmlobserver/deviceorientation.cpp diff --git a/src/tools/qml/qmlviewer/deviceorientation.h b/src/tools/qml/qmlobserver/deviceorientation.h similarity index 100% rename from src/tools/qml/qmlviewer/deviceorientation.h rename to src/tools/qml/qmlobserver/deviceorientation.h diff --git a/src/tools/qml/qmlviewer/deviceorientation_maemo5.cpp b/src/tools/qml/qmlobserver/deviceorientation_maemo5.cpp similarity index 100% rename from src/tools/qml/qmlviewer/deviceorientation_maemo5.cpp rename to src/tools/qml/qmlobserver/deviceorientation_maemo5.cpp diff --git a/src/tools/qml/qmlviewer/editor/abstractformeditortool.cpp b/src/tools/qml/qmlobserver/editor/abstractformeditortool.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/abstractformeditortool.cpp rename to src/tools/qml/qmlobserver/editor/abstractformeditortool.cpp diff --git a/src/tools/qml/qmlviewer/editor/abstractformeditortool.h b/src/tools/qml/qmlobserver/editor/abstractformeditortool.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/abstractformeditortool.h rename to src/tools/qml/qmlobserver/editor/abstractformeditortool.h diff --git a/src/tools/qml/qmlviewer/editor/boundingrecthighlighter.cpp b/src/tools/qml/qmlobserver/editor/boundingrecthighlighter.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/boundingrecthighlighter.cpp rename to src/tools/qml/qmlobserver/editor/boundingrecthighlighter.cpp diff --git a/src/tools/qml/qmlviewer/editor/boundingrecthighlighter.h b/src/tools/qml/qmlobserver/editor/boundingrecthighlighter.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/boundingrecthighlighter.h rename to src/tools/qml/qmlobserver/editor/boundingrecthighlighter.h diff --git a/src/tools/qml/qmlviewer/editor/colorpickertool.cpp b/src/tools/qml/qmlobserver/editor/colorpickertool.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/colorpickertool.cpp rename to src/tools/qml/qmlobserver/editor/colorpickertool.cpp diff --git a/src/tools/qml/qmlviewer/editor/colorpickertool.h b/src/tools/qml/qmlobserver/editor/colorpickertool.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/colorpickertool.h rename to src/tools/qml/qmlobserver/editor/colorpickertool.h diff --git a/src/tools/qml/qmlviewer/editor/editor.pri b/src/tools/qml/qmlobserver/editor/editor.pri similarity index 100% rename from src/tools/qml/qmlviewer/editor/editor.pri rename to src/tools/qml/qmlobserver/editor/editor.pri diff --git a/src/tools/qml/qmlviewer/editor/editor.qrc b/src/tools/qml/qmlobserver/editor/editor.qrc similarity index 100% rename from src/tools/qml/qmlviewer/editor/editor.qrc rename to src/tools/qml/qmlobserver/editor/editor.qrc diff --git a/src/tools/qml/qmlviewer/editor/images/color-picker.png b/src/tools/qml/qmlobserver/editor/images/color-picker.png similarity index 100% rename from src/tools/qml/qmlviewer/editor/images/color-picker.png rename to src/tools/qml/qmlobserver/editor/images/color-picker.png diff --git a/src/tools/qml/qmlviewer/editor/images/designmode.png b/src/tools/qml/qmlobserver/editor/images/designmode.png similarity index 100% rename from src/tools/qml/qmlviewer/editor/images/designmode.png rename to src/tools/qml/qmlobserver/editor/images/designmode.png diff --git a/src/tools/qml/qmlviewer/editor/images/from-qml.png b/src/tools/qml/qmlobserver/editor/images/from-qml.png similarity index 100% rename from src/tools/qml/qmlviewer/editor/images/from-qml.png rename to src/tools/qml/qmlobserver/editor/images/from-qml.png diff --git a/src/tools/qml/qmlviewer/editor/images/pause.png b/src/tools/qml/qmlobserver/editor/images/pause.png similarity index 100% rename from src/tools/qml/qmlviewer/editor/images/pause.png rename to src/tools/qml/qmlobserver/editor/images/pause.png diff --git a/src/tools/qml/qmlviewer/editor/images/play.png b/src/tools/qml/qmlobserver/editor/images/play.png similarity index 100% rename from src/tools/qml/qmlviewer/editor/images/play.png rename to src/tools/qml/qmlobserver/editor/images/play.png diff --git a/src/tools/qml/qmlviewer/editor/images/resize_handle.png b/src/tools/qml/qmlobserver/editor/images/resize_handle.png similarity index 100% rename from src/tools/qml/qmlviewer/editor/images/resize_handle.png rename to src/tools/qml/qmlobserver/editor/images/resize_handle.png diff --git a/src/tools/qml/qmlviewer/editor/images/select-marquee.png b/src/tools/qml/qmlobserver/editor/images/select-marquee.png similarity index 100% rename from src/tools/qml/qmlviewer/editor/images/select-marquee.png rename to src/tools/qml/qmlobserver/editor/images/select-marquee.png diff --git a/src/tools/qml/qmlviewer/editor/images/select.png b/src/tools/qml/qmlobserver/editor/images/select.png similarity index 100% rename from src/tools/qml/qmlviewer/editor/images/select.png rename to src/tools/qml/qmlobserver/editor/images/select.png diff --git a/src/tools/qml/qmlviewer/editor/images/to-qml.png b/src/tools/qml/qmlobserver/editor/images/to-qml.png similarity index 100% rename from src/tools/qml/qmlviewer/editor/images/to-qml.png rename to src/tools/qml/qmlobserver/editor/images/to-qml.png diff --git a/src/tools/qml/qmlviewer/editor/images/zoom.png b/src/tools/qml/qmlobserver/editor/images/zoom.png similarity index 100% rename from src/tools/qml/qmlviewer/editor/images/zoom.png rename to src/tools/qml/qmlobserver/editor/images/zoom.png diff --git a/src/tools/qml/qmlviewer/editor/layeritem.cpp b/src/tools/qml/qmlobserver/editor/layeritem.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/layeritem.cpp rename to src/tools/qml/qmlobserver/editor/layeritem.cpp diff --git a/src/tools/qml/qmlviewer/editor/layeritem.h b/src/tools/qml/qmlobserver/editor/layeritem.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/layeritem.h rename to src/tools/qml/qmlobserver/editor/layeritem.h diff --git a/src/tools/qml/qmlviewer/editor/movemanipulator.cpp b/src/tools/qml/qmlobserver/editor/movemanipulator.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/movemanipulator.cpp rename to src/tools/qml/qmlobserver/editor/movemanipulator.cpp diff --git a/src/tools/qml/qmlviewer/editor/movemanipulator.h b/src/tools/qml/qmlobserver/editor/movemanipulator.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/movemanipulator.h rename to src/tools/qml/qmlobserver/editor/movemanipulator.h diff --git a/src/tools/qml/qmlviewer/editor/movetool.cpp b/src/tools/qml/qmlobserver/editor/movetool.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/movetool.cpp rename to src/tools/qml/qmlobserver/editor/movetool.cpp diff --git a/src/tools/qml/qmlviewer/editor/movetool.h b/src/tools/qml/qmlobserver/editor/movetool.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/movetool.h rename to src/tools/qml/qmlobserver/editor/movetool.h diff --git a/src/tools/qml/qmlviewer/editor/qmltoolbar.cpp b/src/tools/qml/qmlobserver/editor/qmltoolbar.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/qmltoolbar.cpp rename to src/tools/qml/qmlobserver/editor/qmltoolbar.cpp diff --git a/src/tools/qml/qmlviewer/editor/qmltoolbar.h b/src/tools/qml/qmlobserver/editor/qmltoolbar.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/qmltoolbar.h rename to src/tools/qml/qmlobserver/editor/qmltoolbar.h diff --git a/src/tools/qml/qmlviewer/editor/qmlviewerconstants.h b/src/tools/qml/qmlobserver/editor/qmlviewerconstants.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/qmlviewerconstants.h rename to src/tools/qml/qmlobserver/editor/qmlviewerconstants.h diff --git a/src/tools/qml/qmlviewer/editor/resize_handle.png b/src/tools/qml/qmlobserver/editor/resize_handle.png similarity index 100% rename from src/tools/qml/qmlviewer/editor/resize_handle.png rename to src/tools/qml/qmlobserver/editor/resize_handle.png diff --git a/src/tools/qml/qmlviewer/editor/resizecontroller.cpp b/src/tools/qml/qmlobserver/editor/resizecontroller.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/resizecontroller.cpp rename to src/tools/qml/qmlobserver/editor/resizecontroller.cpp diff --git a/src/tools/qml/qmlviewer/editor/resizecontroller.h b/src/tools/qml/qmlobserver/editor/resizecontroller.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/resizecontroller.h rename to src/tools/qml/qmlobserver/editor/resizecontroller.h diff --git a/src/tools/qml/qmlviewer/editor/resizehandleitem.cpp b/src/tools/qml/qmlobserver/editor/resizehandleitem.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/resizehandleitem.cpp rename to src/tools/qml/qmlobserver/editor/resizehandleitem.cpp diff --git a/src/tools/qml/qmlviewer/editor/resizehandleitem.h b/src/tools/qml/qmlobserver/editor/resizehandleitem.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/resizehandleitem.h rename to src/tools/qml/qmlobserver/editor/resizehandleitem.h diff --git a/src/tools/qml/qmlviewer/editor/resizeindicator.cpp b/src/tools/qml/qmlobserver/editor/resizeindicator.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/resizeindicator.cpp rename to src/tools/qml/qmlobserver/editor/resizeindicator.cpp diff --git a/src/tools/qml/qmlviewer/editor/resizeindicator.h b/src/tools/qml/qmlobserver/editor/resizeindicator.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/resizeindicator.h rename to src/tools/qml/qmlobserver/editor/resizeindicator.h diff --git a/src/tools/qml/qmlviewer/editor/resizemanipulator.cpp b/src/tools/qml/qmlobserver/editor/resizemanipulator.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/resizemanipulator.cpp rename to src/tools/qml/qmlobserver/editor/resizemanipulator.cpp diff --git a/src/tools/qml/qmlviewer/editor/resizemanipulator.h b/src/tools/qml/qmlobserver/editor/resizemanipulator.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/resizemanipulator.h rename to src/tools/qml/qmlobserver/editor/resizemanipulator.h diff --git a/src/tools/qml/qmlviewer/editor/resizetool.cpp b/src/tools/qml/qmlobserver/editor/resizetool.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/resizetool.cpp rename to src/tools/qml/qmlobserver/editor/resizetool.cpp diff --git a/src/tools/qml/qmlviewer/editor/resizetool.h b/src/tools/qml/qmlobserver/editor/resizetool.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/resizetool.h rename to src/tools/qml/qmlobserver/editor/resizetool.h diff --git a/src/tools/qml/qmlviewer/editor/rubberbandselectionmanipulator.cpp b/src/tools/qml/qmlobserver/editor/rubberbandselectionmanipulator.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/rubberbandselectionmanipulator.cpp rename to src/tools/qml/qmlobserver/editor/rubberbandselectionmanipulator.cpp diff --git a/src/tools/qml/qmlviewer/editor/rubberbandselectionmanipulator.h b/src/tools/qml/qmlobserver/editor/rubberbandselectionmanipulator.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/rubberbandselectionmanipulator.h rename to src/tools/qml/qmlobserver/editor/rubberbandselectionmanipulator.h diff --git a/src/tools/qml/qmlviewer/editor/selectionindicator.cpp b/src/tools/qml/qmlobserver/editor/selectionindicator.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/selectionindicator.cpp rename to src/tools/qml/qmlobserver/editor/selectionindicator.cpp diff --git a/src/tools/qml/qmlviewer/editor/selectionindicator.h b/src/tools/qml/qmlobserver/editor/selectionindicator.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/selectionindicator.h rename to src/tools/qml/qmlobserver/editor/selectionindicator.h diff --git a/src/tools/qml/qmlviewer/editor/selectionrectangle.cpp b/src/tools/qml/qmlobserver/editor/selectionrectangle.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/selectionrectangle.cpp rename to src/tools/qml/qmlobserver/editor/selectionrectangle.cpp diff --git a/src/tools/qml/qmlviewer/editor/selectionrectangle.h b/src/tools/qml/qmlobserver/editor/selectionrectangle.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/selectionrectangle.h rename to src/tools/qml/qmlobserver/editor/selectionrectangle.h diff --git a/src/tools/qml/qmlviewer/editor/selectiontool.cpp b/src/tools/qml/qmlobserver/editor/selectiontool.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/selectiontool.cpp rename to src/tools/qml/qmlobserver/editor/selectiontool.cpp diff --git a/src/tools/qml/qmlviewer/editor/selectiontool.h b/src/tools/qml/qmlobserver/editor/selectiontool.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/selectiontool.h rename to src/tools/qml/qmlobserver/editor/selectiontool.h diff --git a/src/tools/qml/qmlviewer/editor/singleselectionmanipulator.cpp b/src/tools/qml/qmlobserver/editor/singleselectionmanipulator.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/singleselectionmanipulator.cpp rename to src/tools/qml/qmlobserver/editor/singleselectionmanipulator.cpp diff --git a/src/tools/qml/qmlviewer/editor/singleselectionmanipulator.h b/src/tools/qml/qmlobserver/editor/singleselectionmanipulator.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/singleselectionmanipulator.h rename to src/tools/qml/qmlobserver/editor/singleselectionmanipulator.h diff --git a/src/tools/qml/qmlviewer/editor/snappinglinecreator.cpp b/src/tools/qml/qmlobserver/editor/snappinglinecreator.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/snappinglinecreator.cpp rename to src/tools/qml/qmlobserver/editor/snappinglinecreator.cpp diff --git a/src/tools/qml/qmlviewer/editor/snappinglinecreator.h b/src/tools/qml/qmlobserver/editor/snappinglinecreator.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/snappinglinecreator.h rename to src/tools/qml/qmlobserver/editor/snappinglinecreator.h diff --git a/src/tools/qml/qmlviewer/editor/subcomponenteditortool.cpp b/src/tools/qml/qmlobserver/editor/subcomponenteditortool.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/subcomponenteditortool.cpp rename to src/tools/qml/qmlobserver/editor/subcomponenteditortool.cpp diff --git a/src/tools/qml/qmlviewer/editor/subcomponenteditortool.h b/src/tools/qml/qmlobserver/editor/subcomponenteditortool.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/subcomponenteditortool.h rename to src/tools/qml/qmlobserver/editor/subcomponenteditortool.h diff --git a/src/tools/qml/qmlviewer/editor/subcomponentmasklayeritem.cpp b/src/tools/qml/qmlobserver/editor/subcomponentmasklayeritem.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/subcomponentmasklayeritem.cpp rename to src/tools/qml/qmlobserver/editor/subcomponentmasklayeritem.cpp diff --git a/src/tools/qml/qmlviewer/editor/subcomponentmasklayeritem.h b/src/tools/qml/qmlobserver/editor/subcomponentmasklayeritem.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/subcomponentmasklayeritem.h rename to src/tools/qml/qmlobserver/editor/subcomponentmasklayeritem.h diff --git a/src/tools/qml/qmlviewer/editor/toolbarcolorbox.cpp b/src/tools/qml/qmlobserver/editor/toolbarcolorbox.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/toolbarcolorbox.cpp rename to src/tools/qml/qmlobserver/editor/toolbarcolorbox.cpp diff --git a/src/tools/qml/qmlviewer/editor/toolbarcolorbox.h b/src/tools/qml/qmlobserver/editor/toolbarcolorbox.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/toolbarcolorbox.h rename to src/tools/qml/qmlobserver/editor/toolbarcolorbox.h diff --git a/src/tools/qml/qmlviewer/editor/zoomtool.cpp b/src/tools/qml/qmlobserver/editor/zoomtool.cpp similarity index 100% rename from src/tools/qml/qmlviewer/editor/zoomtool.cpp rename to src/tools/qml/qmlobserver/editor/zoomtool.cpp diff --git a/src/tools/qml/qmlviewer/editor/zoomtool.h b/src/tools/qml/qmlobserver/editor/zoomtool.h similarity index 100% rename from src/tools/qml/qmlviewer/editor/zoomtool.h rename to src/tools/qml/qmlobserver/editor/zoomtool.h diff --git a/src/tools/qml/qmlviewer/jsdebuggeragent.cpp b/src/tools/qml/qmlobserver/jsdebuggeragent.cpp similarity index 100% rename from src/tools/qml/qmlviewer/jsdebuggeragent.cpp rename to src/tools/qml/qmlobserver/jsdebuggeragent.cpp diff --git a/src/tools/qml/qmlviewer/jsdebuggeragent.h b/src/tools/qml/qmlobserver/jsdebuggeragent.h similarity index 100% rename from src/tools/qml/qmlviewer/jsdebuggeragent.h rename to src/tools/qml/qmlobserver/jsdebuggeragent.h diff --git a/src/tools/qml/qmlviewer/loggerwidget.cpp b/src/tools/qml/qmlobserver/loggerwidget.cpp similarity index 100% rename from src/tools/qml/qmlviewer/loggerwidget.cpp rename to src/tools/qml/qmlobserver/loggerwidget.cpp diff --git a/src/tools/qml/qmlviewer/loggerwidget.h b/src/tools/qml/qmlobserver/loggerwidget.h similarity index 100% rename from src/tools/qml/qmlviewer/loggerwidget.h rename to src/tools/qml/qmlobserver/loggerwidget.h diff --git a/src/tools/qml/qmlviewer/main.cpp b/src/tools/qml/qmlobserver/main.cpp similarity index 100% rename from src/tools/qml/qmlviewer/main.cpp rename to src/tools/qml/qmlobserver/main.cpp diff --git a/src/tools/qml/qmlviewer/proxysettings.cpp b/src/tools/qml/qmlobserver/proxysettings.cpp similarity index 100% rename from src/tools/qml/qmlviewer/proxysettings.cpp rename to src/tools/qml/qmlobserver/proxysettings.cpp diff --git a/src/tools/qml/qmlviewer/proxysettings.h b/src/tools/qml/qmlobserver/proxysettings.h similarity index 100% rename from src/tools/qml/qmlviewer/proxysettings.h rename to src/tools/qml/qmlobserver/proxysettings.h diff --git a/src/tools/qml/qmlviewer/proxysettings.ui b/src/tools/qml/qmlobserver/proxysettings.ui similarity index 100% rename from src/tools/qml/qmlviewer/proxysettings.ui rename to src/tools/qml/qmlobserver/proxysettings.ui diff --git a/src/tools/qml/qmlviewer/proxysettings_maemo5.ui b/src/tools/qml/qmlobserver/proxysettings_maemo5.ui similarity index 100% rename from src/tools/qml/qmlviewer/proxysettings_maemo5.ui rename to src/tools/qml/qmlobserver/proxysettings_maemo5.ui diff --git a/src/tools/qml/qmlviewer/qdeclarativedesigndebugserver.cpp b/src/tools/qml/qmlobserver/qdeclarativedesigndebugserver.cpp similarity index 100% rename from src/tools/qml/qmlviewer/qdeclarativedesigndebugserver.cpp rename to src/tools/qml/qmlobserver/qdeclarativedesigndebugserver.cpp diff --git a/src/tools/qml/qmlviewer/qdeclarativedesigndebugserver.h b/src/tools/qml/qmlobserver/qdeclarativedesigndebugserver.h similarity index 100% rename from src/tools/qml/qmlviewer/qdeclarativedesigndebugserver.h rename to src/tools/qml/qmlobserver/qdeclarativedesigndebugserver.h diff --git a/src/tools/qml/qmlviewer/qdeclarativedesignview.cpp b/src/tools/qml/qmlobserver/qdeclarativedesignview.cpp similarity index 100% rename from src/tools/qml/qmlviewer/qdeclarativedesignview.cpp rename to src/tools/qml/qmlobserver/qdeclarativedesignview.cpp diff --git a/src/tools/qml/qmlviewer/qdeclarativedesignview.h b/src/tools/qml/qmlobserver/qdeclarativedesignview.h similarity index 100% rename from src/tools/qml/qmlviewer/qdeclarativedesignview.h rename to src/tools/qml/qmlobserver/qdeclarativedesignview.h diff --git a/src/tools/qml/qmlviewer/qdeclarativetester.cpp b/src/tools/qml/qmlobserver/qdeclarativetester.cpp similarity index 100% rename from src/tools/qml/qmlviewer/qdeclarativetester.cpp rename to src/tools/qml/qmlobserver/qdeclarativetester.cpp diff --git a/src/tools/qml/qmlviewer/qdeclarativetester.h b/src/tools/qml/qmlobserver/qdeclarativetester.h similarity index 100% rename from src/tools/qml/qmlviewer/qdeclarativetester.h rename to src/tools/qml/qmlobserver/qdeclarativetester.h diff --git a/src/tools/qml/qmlviewer/qml.icns b/src/tools/qml/qmlobserver/qml.icns similarity index 100% rename from src/tools/qml/qmlviewer/qml.icns rename to src/tools/qml/qmlobserver/qml.icns diff --git a/src/tools/qml/qmlviewer/qml.pri b/src/tools/qml/qmlobserver/qml.pri similarity index 100% rename from src/tools/qml/qmlviewer/qml.pri rename to src/tools/qml/qmlobserver/qml.pri diff --git a/src/tools/qml/qmlviewer/qmlruntime.cpp b/src/tools/qml/qmlobserver/qmlruntime.cpp similarity index 100% rename from src/tools/qml/qmlviewer/qmlruntime.cpp rename to src/tools/qml/qmlobserver/qmlruntime.cpp diff --git a/src/tools/qml/qmlviewer/qmlruntime.h b/src/tools/qml/qmlobserver/qmlruntime.h similarity index 100% rename from src/tools/qml/qmlviewer/qmlruntime.h rename to src/tools/qml/qmlobserver/qmlruntime.h diff --git a/src/tools/qml/qmlviewer/qmlruntime.qrc b/src/tools/qml/qmlobserver/qmlruntime.qrc similarity index 100% rename from src/tools/qml/qmlviewer/qmlruntime.qrc rename to src/tools/qml/qmlobserver/qmlruntime.qrc diff --git a/src/tools/qml/qmlviewer/qmlviewer.pro b/src/tools/qml/qmlobserver/qmlviewer.pro similarity index 100% rename from src/tools/qml/qmlviewer/qmlviewer.pro rename to src/tools/qml/qmlobserver/qmlviewer.pro diff --git a/src/tools/qml/qmlviewer/recopts.ui b/src/tools/qml/qmlobserver/recopts.ui similarity index 100% rename from src/tools/qml/qmlviewer/recopts.ui rename to src/tools/qml/qmlobserver/recopts.ui diff --git a/src/tools/qml/qmlviewer/recopts_maemo5.ui b/src/tools/qml/qmlobserver/recopts_maemo5.ui similarity index 100% rename from src/tools/qml/qmlviewer/recopts_maemo5.ui rename to src/tools/qml/qmlobserver/recopts_maemo5.ui diff --git a/src/tools/qml/qmlviewer/texteditautoresizer_maemo5.h b/src/tools/qml/qmlobserver/texteditautoresizer_maemo5.h similarity index 100% rename from src/tools/qml/qmlviewer/texteditautoresizer_maemo5.h rename to src/tools/qml/qmlobserver/texteditautoresizer_maemo5.h