diff --git a/qtcreator.qbp b/qtcreator.qbp index 07cfa28a8fb..420b5321c8d 100644 --- a/qtcreator.qbp +++ b/qtcreator.qbp @@ -52,6 +52,7 @@ Project { "src/plugins/mercurial/mercurial.qbs", "src/plugins/perforce/perforce.qbs", "src/plugins/projectexplorer/projectexplorer.qbs", + "src/plugins/qmldesigner/qmldesigner.qbs", "src/plugins/qmljseditor/qmljseditor.qbs", "src/plugins/qmljsinspector/qmljsinspector.qbs", "src/plugins/qmljstools/qmljstools.qbs", @@ -151,6 +152,7 @@ Project { qbs.installDir: 'bin' files: "bin/qtcreator.sh" fileTags: "install" + qbs.installDir: "bin" } Group { diff --git a/share/qtcreator/dumper/dumper.py b/share/qtcreator/dumper/dumper.py index 4a1af665c25..973f80afe4c 100644 --- a/share/qtcreator/dumper/dumper.py +++ b/share/qtcreator/dumper/dumper.py @@ -1673,26 +1673,22 @@ class Dumper: if self.useDynamicType and tryDynamic: - dtypeName = dynamicTypeName(value.cast(type)) - else: - dtypeName = typeName + self.putItem(expensiveUpcast(value), False) + return format = self.formats.get(self.currentIName) if format is None: - format = self.typeformats.get(stripForFormat(dtypeName)) + format = self.typeformats.get(stripForFormat(typeName)) if self.useFancy and (format is None or format >= 1): self.putAddress(value.address) - self.putType(dtypeName) + self.putType(typeName) - if dtypeName in qqDumpers: - if tryDynamic: - qqDumpers[dtypeName](self, expensiveUpcast(value)) - else: - qqDumpers[dtypeName](self, value) + if typeName in qqDumpers: + qqDumpers[typeName](self, value) return - nsStrippedType = self.stripNamespaceFromType(dtypeName)\ + nsStrippedType = self.stripNamespaceFromType(typeName)\ .replace("::", "__") # The following block is only needed for D. @@ -1727,7 +1723,7 @@ class Dumper: fields = extractFields(type) #fields = type.fields() - self.putType(dtypeName) + self.putType(typeName) self.putAddress(value.address) self.putValue("{...}") diff --git a/share/share.qbs b/share/share.qbs index b607753bee7..4013b119311 100644 --- a/share/share.qbs +++ b/share/share.qbs @@ -7,1195 +7,1251 @@ Product { Group { qbs.installDir: "share/qtcreator/designer" fileTags: ["install"] + prefix: "qtcreator/designer/" files: [ - "qtcreator/designer/templates.xml", + "templates.xml", ] } Group { qbs.installDir: "share/qtcreator/designer/templates" fileTags: ["install"] + prefix: "qtcreator/designer/templates/" files: [ - "qtcreator/designer/templates/Dialog_with_Buttons_Bottom.ui", - "qtcreator/designer/templates/Dialog_with_Buttons_Right.ui", - "qtcreator/designer/templates/Dialog_without_Buttons.ui", - "qtcreator/designer/templates/Main_Window.ui", - "qtcreator/designer/templates/Widget.ui", + "Dialog_with_Buttons_Bottom.ui", + "Dialog_with_Buttons_Right.ui", + "Dialog_without_Buttons.ui", + "Main_Window.ui", + "Widget.ui", ] } Group { qbs.installDir: "share/qtcreator/dumper" fileTags: ["install"] + prefix: "qtcreator/dumper/" files: [ - "qtcreator/dumper/LGPL_EXCEPTION.TXT", - "qtcreator/dumper/LICENSE.LGPL", - "qtcreator/dumper/bridge.py", - "qtcreator/dumper/dumper.cpp", - "qtcreator/dumper/dumper.h", - "qtcreator/dumper/dumper.pro", - "qtcreator/dumper/dumper.py", - "qtcreator/dumper/dumper_p.h", - "qtcreator/dumper/pdumper.py", - "qtcreator/dumper/qttypes.py", + "LGPL_EXCEPTION.TXT", + "LICENSE.LGPL", + "bridge.py", + "dumper.cpp", + "dumper.h", + "dumper.pro", + "dumper.py", + "dumper_p.h", + "pdumper.py", + "qttypes.py", ] } Group { qbs.installDir: "share/qtcreator/dumper/test" fileTags: ["install"] + prefix: "qtcreator/dumper/test/" files: [ - "qtcreator/dumper/test/dumpertest.pro", - "qtcreator/dumper/test/main.cpp", + "dumpertest.pro", + "main.cpp", ] } Group { qbs.installDir: "share/qtcreator/generic-highlighter" fileTags: ["install"] + prefix: "qtcreator/generic-highlighter/" files: [ - "qtcreator/generic-highlighter/alert.xml", - "qtcreator/generic-highlighter/autoconf.xml", - "qtcreator/generic-highlighter/bash.xml", - "qtcreator/generic-highlighter/cmake.xml", - "qtcreator/generic-highlighter/css.xml", - "qtcreator/generic-highlighter/doxygen.xml", - "qtcreator/generic-highlighter/dtd.xml", - "qtcreator/generic-highlighter/html.xml", - "qtcreator/generic-highlighter/ini.xml", - "qtcreator/generic-highlighter/java.xml", - "qtcreator/generic-highlighter/javadoc.xml", - "qtcreator/generic-highlighter/perl.xml", - "qtcreator/generic-highlighter/ruby.xml", - "qtcreator/generic-highlighter/valgrind-suppression.xml", - "qtcreator/generic-highlighter/xml.xml", - "qtcreator/generic-highlighter/yacc.xml", + "alert.xml", + "autoconf.xml", + "bash.xml", + "cmake.xml", + "css.xml", + "doxygen.xml", + "dtd.xml", + "html.xml", + "ini.xml", + "java.xml", + "javadoc.xml", + "perl.xml", + "ruby.xml", + "valgrind-suppression.xml", + "xml.xml", + "yacc.xml", ] } Group { qbs.installDir: "share/qtcreator/glsl" fileTags: ["install"] + prefix: "qtcreator/glsl/" files: [ - "qtcreator/glsl/glsl_120.frag", - "qtcreator/glsl/glsl_120.vert", - "qtcreator/glsl/glsl_120_common.glsl", - "qtcreator/glsl/glsl_es_100.frag", - "qtcreator/glsl/glsl_es_100.vert", - "qtcreator/glsl/glsl_es_100_common.glsl", + "glsl_120.frag", + "glsl_120.vert", + "glsl_120_common.glsl", + "glsl_es_100.frag", + "glsl_es_100.vert", + "glsl_es_100_common.glsl", ] } Group { qbs.installDir: "share/qtcreator/patches" fileTags: ["install"] + prefix: "qtcreator/patches/" files: [ - "qtcreator/patches/.gitattributes", - "qtcreator/patches/README", - "qtcreator/patches/gdb-expand-line-sal-maybe.patch", - "qtcreator/patches/gdb-increased-dcache-line-size.patch", - "qtcreator/patches/gdb-stepping-for-maemo.patch", - "qtcreator/patches/gdb-without-dwarf-name-canonicalization.patch", - "qtcreator/patches/gdb-work-around-trk-single-step.patch", + ".gitattributes", + "README", + "gdb-expand-line-sal-maybe.patch", + "gdb-increased-dcache-line-size.patch", + "gdb-stepping-for-maemo.patch", + "gdb-without-dwarf-name-canonicalization.patch", + "gdb-work-around-trk-single-step.patch", ] } Group { qbs.installDir: "share/qtcreator/qml-type-descriptions" fileTags: ["install"] + prefix: "qtcreator/qml-type-descriptions/" files: [ - "qtcreator/qml-type-descriptions/builtins.qmltypes", - "qtcreator/qml-type-descriptions/qmlproject.qmltypes", - "qtcreator/qml-type-descriptions/qmlruntime.qmltypes", - "qtcreator/qml-type-descriptions/qt-labs-folderlistmodel.qmltypes", - "qtcreator/qml-type-descriptions/qt-labs-gestures.qmltypes", - "qtcreator/qml-type-descriptions/qt-labs-particles.qmltypes", - "qtcreator/qml-type-descriptions/qtmobility-connectivity.qmltypes", - "qtcreator/qml-type-descriptions/qtmobility-contacts.qmltypes", - "qtcreator/qml-type-descriptions/qtmobility-feedback.qmltypes", - "qtcreator/qml-type-descriptions/qtmobility-gallery.qmltypes", - "qtcreator/qml-type-descriptions/qtmobility-location.qmltypes", - "qtcreator/qml-type-descriptions/qtmobility-messaging.qmltypes", - "qtcreator/qml-type-descriptions/qtmobility-organizer.qmltypes", - "qtcreator/qml-type-descriptions/qtmobility-publishsubscribe.qmltypes", - "qtcreator/qml-type-descriptions/qtmobility-sensors.qmltypes", - "qtcreator/qml-type-descriptions/qtmobility-serviceframework.qmltypes", - "qtcreator/qml-type-descriptions/qtmobility-systeminfo.qmltypes", - "qtcreator/qml-type-descriptions/qtmultimediakit.qmltypes", - "qtcreator/qml-type-descriptions/qtwebkit.qmltypes", + "builtins.qmltypes", + "qmlproject.qmltypes", + "qmlruntime.qmltypes", + "qt-labs-folderlistmodel.qmltypes", + "qt-labs-gestures.qmltypes", + "qt-labs-particles.qmltypes", + "qtmobility-connectivity.qmltypes", + "qtmobility-contacts.qmltypes", + "qtmobility-feedback.qmltypes", + "qtmobility-gallery.qmltypes", + "qtmobility-location.qmltypes", + "qtmobility-messaging.qmltypes", + "qtmobility-organizer.qmltypes", + "qtmobility-publishsubscribe.qmltypes", + "qtmobility-sensors.qmltypes", + "qtmobility-serviceframework.qmltypes", + "qtmobility-systeminfo.qmltypes", + "qtmultimediakit.qmltypes", + "qtwebkit.qmltypes", ] } Group { qbs.installDir: "share/qtcreator/qml/qmldump" fileTags: ["install"] + prefix: "qtcreator/qml/qmldump/" files: [ - "qtcreator/qml/qmldump/Info.plist.in", - "qtcreator/qml/qmldump/LGPL_EXCEPTION.TXT", - "qtcreator/qml/qmldump/LICENSE.LGPL", - "qtcreator/qml/qmldump/main.cpp", - "qtcreator/qml/qmldump/qmldump.pro", - "qtcreator/qml/qmldump/qmlstreamwriter.cpp", - "qtcreator/qml/qmldump/qmlstreamwriter.h", + "Info.plist.in", + "LGPL_EXCEPTION.TXT", + "LICENSE.LGPL", + "main.cpp", + "qmldump.pro", + "qmlstreamwriter.cpp", + "qmlstreamwriter.h", ] } Group { qbs.installDir: "share/qtcreator/qml/qmljsdebugger" fileTags: ["install"] + prefix: "qtcreator/qml/qmljsdebugger/" files: [ - "qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp", - "qtcreator/qml/qmljsdebugger/qdeclarativeinspectorservice.cpp", - "qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp", - "qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector_p.h", - "qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri", - "qtcreator/qml/qmljsdebugger/qmljsdebugger-src.pri", - "qtcreator/qml/qmljsdebugger/qmljsdebugger.pro", + "jsdebuggeragent.cpp", + "qdeclarativeinspectorservice.cpp", + "qdeclarativeviewinspector.cpp", + "qdeclarativeviewinspector_p.h", + "qmljsdebugger-lib.pri", + "qmljsdebugger-src.pri", + "qmljsdebugger.pro", ] } Group { qbs.installDir: "share/qtcreator/qml/qmljsdebugger/editor" fileTags: ["install"] + prefix: "qtcreator/qml/qmljsdebugger/editor/" files: [ - "qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.cpp", - "qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.h", - "qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp", - "qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h", - "qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp", - "qtcreator/qml/qmljsdebugger/editor/colorpickertool.h", - "qtcreator/qml/qmljsdebugger/editor/livelayeritem.cpp", - "qtcreator/qml/qmljsdebugger/editor/livelayeritem.h", - "qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.cpp", - "qtcreator/qml/qmljsdebugger/editor/liverubberbandselectionmanipulator.h", - "qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.cpp", - "qtcreator/qml/qmljsdebugger/editor/liveselectionindicator.h", - "qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.cpp", - "qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.h", - "qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp", - "qtcreator/qml/qmljsdebugger/editor/liveselectiontool.h", - "qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.cpp", - "qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.h", - "qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp", - "qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h", - "qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp", - "qtcreator/qml/qmljsdebugger/editor/zoomtool.h", + "abstractliveedittool.cpp", + "abstractliveedittool.h", + "boundingrecthighlighter.cpp", + "boundingrecthighlighter.h", + "colorpickertool.cpp", + "colorpickertool.h", + "livelayeritem.cpp", + "livelayeritem.h", + "liverubberbandselectionmanipulator.cpp", + "liverubberbandselectionmanipulator.h", + "liveselectionindicator.cpp", + "liveselectionindicator.h", + "liveselectionrectangle.cpp", + "liveselectionrectangle.h", + "liveselectiontool.cpp", + "liveselectiontool.h", + "livesingleselectionmanipulator.cpp", + "livesingleselectionmanipulator.h", + "subcomponentmasklayeritem.cpp", + "subcomponentmasklayeritem.h", + "zoomtool.cpp", + "zoomtool.h", ] } Group { qbs.installDir: "share/qtcreator/qml/qmljsdebugger/include" fileTags: ["install"] + prefix: "qtcreator/qml/qmljsdebugger/include/" files: [ - "qtcreator/qml/qmljsdebugger/include/jsdebuggeragent.h", - "qtcreator/qml/qmljsdebugger/include/qdeclarativeinspectorservice.h", - "qtcreator/qml/qmljsdebugger/include/qdeclarativeviewinspector.h", - "qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h", - "qtcreator/qml/qmljsdebugger/include/qmlinspectorconstants.h", - "qtcreator/qml/qmljsdebugger/include/qmljsdebugger_global.h", + "jsdebuggeragent.h", + "qdeclarativeinspectorservice.h", + "qdeclarativeviewinspector.h", + "qdeclarativeviewobserver.h", + "qmlinspectorconstants.h", + "qmljsdebugger_global.h", ] } Group { qbs.installDir: "share/qtcreator/qml/qmljsdebugger/include/qt_private" fileTags: ["install"] + prefix: "qtcreator/qml/qmljsdebugger/include/qt_private/" files: [ - "qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebughelper_p.h", - "qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativedebugservice_p.h", - "qtcreator/qml/qmljsdebugger/include/qt_private/qdeclarativestate_p.h", + "qdeclarativedebughelper_p.h", + "qdeclarativedebugservice_p.h", + "qdeclarativestate_p.h", ] } Group { qbs.installDir: "share/qtcreator/qml/qmljsdebugger/protocol" fileTags: ["install"] + prefix: "qtcreator/qml/qmljsdebugger/protocol/" files: [ - "qtcreator/qml/qmljsdebugger/protocol/inspectorprotocol.h", - "qtcreator/qml/qmljsdebugger/protocol/protocol.pri", + "inspectorprotocol.h", + "protocol.pri", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlobserver" fileTags: ["install"] + prefix: "qtcreator/qml/qmlobserver/" files: [ - "qtcreator/qml/qmlobserver/Info.plist.in", - "qtcreator/qml/qmlobserver/LGPL_EXCEPTION.TXT", - "qtcreator/qml/qmlobserver/LICENSE.LGPL", - "qtcreator/qml/qmlobserver/deviceorientation.cpp", - "qtcreator/qml/qmlobserver/deviceorientation.h", - "qtcreator/qml/qmlobserver/deviceorientation_harmattan.cpp", - "qtcreator/qml/qmlobserver/deviceorientation_maemo5.cpp", - "qtcreator/qml/qmlobserver/deviceorientation_symbian.cpp", - "qtcreator/qml/qmlobserver/loggerwidget.cpp", - "qtcreator/qml/qmlobserver/loggerwidget.h", - "qtcreator/qml/qmlobserver/main.cpp", - "qtcreator/qml/qmlobserver/proxysettings.cpp", - "qtcreator/qml/qmlobserver/proxysettings.h", - "qtcreator/qml/qmlobserver/proxysettings.ui", - "qtcreator/qml/qmlobserver/proxysettings_maemo5.ui", - "qtcreator/qml/qmlobserver/qdeclarativetester.cpp", - "qtcreator/qml/qmlobserver/qdeclarativetester.h", - "qtcreator/qml/qmlobserver/qml.icns", - "qtcreator/qml/qmlobserver/qml.pri", - "qtcreator/qml/qmlobserver/qmlobserver.pro", - "qtcreator/qml/qmlobserver/qmlruntime.cpp", - "qtcreator/qml/qmlobserver/qmlruntime.h", - "qtcreator/qml/qmlobserver/recopts.ui", - "qtcreator/qml/qmlobserver/recopts_maemo5.ui", - "qtcreator/qml/qmlobserver/texteditautoresizer_maemo5.h", + "Info.plist.in", + "LGPL_EXCEPTION.TXT", + "LICENSE.LGPL", + "deviceorientation.cpp", + "deviceorientation.h", + "deviceorientation_harmattan.cpp", + "deviceorientation_maemo5.cpp", + "deviceorientation_symbian.cpp", + "loggerwidget.cpp", + "loggerwidget.h", + "main.cpp", + "proxysettings.cpp", + "proxysettings.h", + "proxysettings.ui", + "proxysettings_maemo5.ui", + "qdeclarativetester.cpp", + "qdeclarativetester.h", + "qml.icns", + "qml.pri", + "qmlobserver.pro", + "qmlruntime.cpp", + "qmlruntime.h", + "recopts.ui", + "recopts_maemo5.ui", + "texteditautoresizer_maemo5.h", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlobserver/browser" fileTags: ["install"] + prefix: "qtcreator/qml/qmlobserver/browser/" files: [ - "qtcreator/qml/qmlobserver/browser/Browser.qml", - "qtcreator/qml/qmlobserver/browser/browser.qrc", + "Browser.qml", + "browser.qrc", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlobserver/browser/images" fileTags: ["install"] + prefix: "qtcreator/qml/qmlobserver/browser/images/" files: [ - "qtcreator/qml/qmlobserver/browser/images/folder.png", - "qtcreator/qml/qmlobserver/browser/images/titlebar.png", - "qtcreator/qml/qmlobserver/browser/images/titlebar.sci", - "qtcreator/qml/qmlobserver/browser/images/up.png", + "folder.png", + "titlebar.png", + "titlebar.sci", + "up.png", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlobserver/startup" fileTags: ["install"] + prefix: "qtcreator/qml/qmlobserver/startup/" files: [ - "qtcreator/qml/qmlobserver/startup/Logo.qml", - "qtcreator/qml/qmlobserver/startup/qt-back.png", - "qtcreator/qml/qmlobserver/startup/qt-blue.jpg", - "qtcreator/qml/qmlobserver/startup/qt-front.png", - "qtcreator/qml/qmlobserver/startup/qt-sketch.jpg", - "qtcreator/qml/qmlobserver/startup/qt-text.png", - "qtcreator/qml/qmlobserver/startup/quick-blur.png", - "qtcreator/qml/qmlobserver/startup/quick-regular.png", - "qtcreator/qml/qmlobserver/startup/shadow.png", - "qtcreator/qml/qmlobserver/startup/startup.qml", - "qtcreator/qml/qmlobserver/startup/startup.qrc", - "qtcreator/qml/qmlobserver/startup/white-star.png", + "Logo.qml", + "qt-back.png", + "qt-blue.jpg", + "qt-front.png", + "qt-sketch.jpg", + "qt-text.png", + "quick-blur.png", + "quick-regular.png", + "shadow.png", + "startup.qml", + "startup.qrc", + "white-star.png", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlpuppet" fileTags: ["install"] + prefix: "qtcreator/qml/qmlpuppet/" files: [ - "qtcreator/qml/qmlpuppet/qmlpuppet.pro", - "qtcreator/qml/qmlpuppet/qmlpuppet.qrc", - "qtcreator/qml/qmlpuppet/qmlpuppet_utilities.pri", + "qmlpuppet.pro", + "qmlpuppet.qrc", + "qmlpuppet_utilities.pri", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlpuppet/commands" fileTags: ["install"] + prefix: "qtcreator/qml/qmlpuppet/commands/" files: [ - "qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.cpp", - "qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h", - "qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp", - "qtcreator/qml/qmlpuppet/commands/changebindingscommand.h", - "qtcreator/qml/qmlpuppet/commands/changefileurlcommand.cpp", - "qtcreator/qml/qmlpuppet/commands/changefileurlcommand.h", - "qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp", - "qtcreator/qml/qmlpuppet/commands/changeidscommand.h", - "qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp", - "qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h", - "qtcreator/qml/qmlpuppet/commands/changestatecommand.cpp", - "qtcreator/qml/qmlpuppet/commands/changestatecommand.h", - "qtcreator/qml/qmlpuppet/commands/changevaluescommand.cpp", - "qtcreator/qml/qmlpuppet/commands/changevaluescommand.h", - "qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.cpp", - "qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.h", - "qtcreator/qml/qmlpuppet/commands/clearscenecommand.cpp", - "qtcreator/qml/qmlpuppet/commands/clearscenecommand.h", - "qtcreator/qml/qmlpuppet/commands/commands.pri", - "qtcreator/qml/qmlpuppet/commands/completecomponentcommand.cpp", - "qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h", - "qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.cpp", - "qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h", - "qtcreator/qml/qmlpuppet/commands/createinstancescommand.cpp", - "qtcreator/qml/qmlpuppet/commands/createinstancescommand.h", - "qtcreator/qml/qmlpuppet/commands/createscenecommand.cpp", - "qtcreator/qml/qmlpuppet/commands/createscenecommand.h", - "qtcreator/qml/qmlpuppet/commands/informationchangedcommand.cpp", - "qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h", - "qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.cpp", - "qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h", - "qtcreator/qml/qmlpuppet/commands/removeinstancescommand.cpp", - "qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h", - "qtcreator/qml/qmlpuppet/commands/removepropertiescommand.cpp", - "qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h", - "qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.cpp", - "qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h", - "qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.cpp", - "qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.h", - "qtcreator/qml/qmlpuppet/commands/synchronizecommand.cpp", - "qtcreator/qml/qmlpuppet/commands/synchronizecommand.h", - "qtcreator/qml/qmlpuppet/commands/tokencommand.cpp", - "qtcreator/qml/qmlpuppet/commands/tokencommand.h", - "qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp", - "qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h", + "changeauxiliarycommand.cpp", + "changeauxiliarycommand.h", + "changebindingscommand.cpp", + "changebindingscommand.h", + "changefileurlcommand.cpp", + "changefileurlcommand.h", + "changeidscommand.cpp", + "changeidscommand.h", + "changenodesourcecommand.cpp", + "changenodesourcecommand.h", + "changestatecommand.cpp", + "changestatecommand.h", + "changevaluescommand.cpp", + "changevaluescommand.h", + "childrenchangedcommand.cpp", + "childrenchangedcommand.h", + "clearscenecommand.cpp", + "clearscenecommand.h", + "commands.pri", + "completecomponentcommand.cpp", + "completecomponentcommand.h", + "componentcompletedcommand.cpp", + "componentcompletedcommand.h", + "createinstancescommand.cpp", + "createinstancescommand.h", + "createscenecommand.cpp", + "createscenecommand.h", + "informationchangedcommand.cpp", + "informationchangedcommand.h", + "pixmapchangedcommand.cpp", + "pixmapchangedcommand.h", + "removeinstancescommand.cpp", + "removeinstancescommand.h", + "removepropertiescommand.cpp", + "removepropertiescommand.h", + "reparentinstancescommand.cpp", + "reparentinstancescommand.h", + "statepreviewimagechangedcommand.cpp", + "statepreviewimagechangedcommand.h", + "synchronizecommand.cpp", + "synchronizecommand.h", + "tokencommand.cpp", + "tokencommand.h", + "valueschangedcommand.cpp", + "valueschangedcommand.h", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlpuppet/container" fileTags: ["install"] + prefix: "qtcreator/qml/qmlpuppet/container/" files: [ - "qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp", - "qtcreator/qml/qmlpuppet/container/addimportcontainer.h", - "qtcreator/qml/qmlpuppet/container/container.pri", - "qtcreator/qml/qmlpuppet/container/idcontainer.cpp", - "qtcreator/qml/qmlpuppet/container/idcontainer.h", - "qtcreator/qml/qmlpuppet/container/imagecontainer.cpp", - "qtcreator/qml/qmlpuppet/container/imagecontainer.h", - "qtcreator/qml/qmlpuppet/container/informationcontainer.cpp", - "qtcreator/qml/qmlpuppet/container/informationcontainer.h", - "qtcreator/qml/qmlpuppet/container/instancecontainer.cpp", - "qtcreator/qml/qmlpuppet/container/instancecontainer.h", - "qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.cpp", - "qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h", - "qtcreator/qml/qmlpuppet/container/propertybindingcontainer.cpp", - "qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h", - "qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.cpp", - "qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h", - "qtcreator/qml/qmlpuppet/container/reparentcontainer.cpp", - "qtcreator/qml/qmlpuppet/container/reparentcontainer.h", + "addimportcontainer.cpp", + "addimportcontainer.h", + "container.pri", + "idcontainer.cpp", + "idcontainer.h", + "imagecontainer.cpp", + "imagecontainer.h", + "informationcontainer.cpp", + "informationcontainer.h", + "instancecontainer.cpp", + "instancecontainer.h", + "propertyabstractcontainer.cpp", + "propertyabstractcontainer.h", + "propertybindingcontainer.cpp", + "propertybindingcontainer.h", + "propertyvaluecontainer.cpp", + "propertyvaluecontainer.h", + "reparentcontainer.cpp", + "reparentcontainer.h", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlpuppet/html" fileTags: ["install"] + prefix: "qtcreator/qml/qmlpuppet/html/" files: [ - "qtcreator/qml/qmlpuppet/html/welcome.html", + "welcome.html", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlpuppet/images" fileTags: ["install"] + prefix: "qtcreator/qml/qmlpuppet/images/" files: [ - "qtcreator/qml/qmlpuppet/images/template_image.png", - "qtcreator/qml/qmlpuppet/images/webkit.png", + "template_image.png", + "webkit.png", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlpuppet/instances" fileTags: ["install"] + prefix: "qtcreator/qml/qmlpuppet/instances/" files: [ - "qtcreator/qml/qmlpuppet/instances/anchorchangesnodeinstance.cpp", - "qtcreator/qml/qmlpuppet/instances/anchorchangesnodeinstance.h", - "qtcreator/qml/qmlpuppet/instances/behaviornodeinstance.cpp", - "qtcreator/qml/qmlpuppet/instances/behaviornodeinstance.h", - "qtcreator/qml/qmlpuppet/instances/childrenchangeeventfilter.cpp", - "qtcreator/qml/qmlpuppet/instances/childrenchangeeventfilter.h", - "qtcreator/qml/qmlpuppet/instances/componentnodeinstance.cpp", - "qtcreator/qml/qmlpuppet/instances/componentnodeinstance.h", - "qtcreator/qml/qmlpuppet/instances/dummycontextobject.cpp", - "qtcreator/qml/qmlpuppet/instances/dummycontextobject.h", - "qtcreator/qml/qmlpuppet/instances/dummynodeinstance.cpp", - "qtcreator/qml/qmlpuppet/instances/dummynodeinstance.h", - "qtcreator/qml/qmlpuppet/instances/instances.pri", - "qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp", - "qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h", - "qtcreator/qml/qmlpuppet/instances/nodeinstancemetaobject.cpp", - "qtcreator/qml/qmlpuppet/instances/nodeinstancemetaobject.h", - "qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp", - "qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.h", - "qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.cpp", - "qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.h", - "qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp", - "qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h", - "qtcreator/qml/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp", - "qtcreator/qml/qmlpuppet/instances/qmlpropertychangesnodeinstance.h", - "qtcreator/qml/qmlpuppet/instances/qmlstatenodeinstance.cpp", - "qtcreator/qml/qmlpuppet/instances/qmlstatenodeinstance.h", - "qtcreator/qml/qmlpuppet/instances/qmltransitionnodeinstance.cpp", - "qtcreator/qml/qmlpuppet/instances/qmltransitionnodeinstance.h", - "qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp", - "qtcreator/qml/qmlpuppet/instances/servernodeinstance.h", + "anchorchangesnodeinstance.cpp", + "anchorchangesnodeinstance.h", + "behaviornodeinstance.cpp", + "behaviornodeinstance.h", + "childrenchangeeventfilter.cpp", + "childrenchangeeventfilter.h", + "componentnodeinstance.cpp", + "componentnodeinstance.h", + "dummycontextobject.cpp", + "dummycontextobject.h", + "dummynodeinstance.cpp", + "dummynodeinstance.h", + "instances.pri", + "nodeinstanceclientproxy.cpp", + "nodeinstanceclientproxy.h", + "nodeinstancemetaobject.cpp", + "nodeinstancemetaobject.h", + "nodeinstanceserver.cpp", + "nodeinstanceserver.h", + "nodeinstancesignalspy.cpp", + "nodeinstancesignalspy.h", + "objectnodeinstance.cpp", + "objectnodeinstance.h", + "qmlpropertychangesnodeinstance.cpp", + "qmlpropertychangesnodeinstance.h", + "qmlstatenodeinstance.cpp", + "qmlstatenodeinstance.h", + "qmltransitionnodeinstance.cpp", + "qmltransitionnodeinstance.h", + "servernodeinstance.cpp", + "servernodeinstance.h", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlpuppet/interfaces" fileTags: ["install"] + prefix: "qtcreator/qml/qmlpuppet/interfaces/" files: [ - "qtcreator/qml/qmlpuppet/interfaces/commondefines.h", - "qtcreator/qml/qmlpuppet/interfaces/interfaces.pri", - "qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h", - "qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp", - "qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h", + "commondefines.h", + "interfaces.pri", + "nodeinstanceclientinterface.h", + "nodeinstanceserverinterface.cpp", + "nodeinstanceserverinterface.h", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlpuppet/qml2puppet" fileTags: ["install"] + prefix: "qtcreator/qml/qmlpuppet/qml2puppet/" files: [ - "qtcreator/qml/qmlpuppet/qml2puppet/Info.plist.in", - "qtcreator/qml/qmlpuppet/qml2puppet/main.cpp", - "qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro", + "Info.plist.in", + "main.cpp", + "qml2puppet.pro", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlpuppet/qml2puppet/instances" fileTags: ["install"] + prefix: "qtcreator/qml/qmlpuppet/qml2puppet/instances/" files: [ - "qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri", - "qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp", - "qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h", - "qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp", - "qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h", - "qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.cpp", - "qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h", - "qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp", - "qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h", - "qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp", - "qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h", - "qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp", - "qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h", + "instances.pri", + "qt5informationnodeinstanceserver.cpp", + "qt5informationnodeinstanceserver.h", + "qt5nodeinstanceclientproxy.cpp", + "qt5nodeinstanceclientproxy.h", + "qt5nodeinstanceserver.cpp", + "qt5nodeinstanceserver.h", + "qt5previewnodeinstanceserver.cpp", + "qt5previewnodeinstanceserver.h", + "qt5rendernodeinstanceserver.cpp", + "qt5rendernodeinstanceserver.h", + "sgitemnodeinstance.cpp", + "sgitemnodeinstance.h", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlpuppet/qmlpuppet" fileTags: ["install"] + prefix: "qtcreator/qml/qmlpuppet/qmlpuppet/" files: [ - "qtcreator/qml/qmlpuppet/qmlpuppet/Info.plist.in", - "qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp", - "qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri", - "qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pro", + "Info.plist.in", + "main.cpp", + "qmlpuppet.pri", + "qmlpuppet.pro", ] } Group { qbs.installDir: "share/qtcreator/qml/qmlpuppet/qmlpuppet/instances" fileTags: ["install"] + prefix: "qtcreator/qml/qmlpuppet/qmlpuppet/instances/" files: [ - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.cpp", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.h", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/instances.pri", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/positionernodeinstance.cpp", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/positionernodeinstance.h", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.cpp", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.cpp", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4informationnodeinstanceserver.h", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.cpp", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceclientproxy.h", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.h", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.cpp", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4previewnodeinstanceserver.h", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.cpp", - "qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4rendernodeinstanceserver.h", + "graphicsobjectnodeinstance.cpp", + "graphicsobjectnodeinstance.h", + "instances.pri", + "positionernodeinstance.cpp", + "positionernodeinstance.h", + "qmlgraphicsitemnodeinstance.cpp", + "qmlgraphicsitemnodeinstance.h", + "qt4informationnodeinstanceserver.cpp", + "qt4informationnodeinstanceserver.h", + "qt4nodeinstanceclientproxy.cpp", + "qt4nodeinstanceclientproxy.h", + "qt4nodeinstanceserver.cpp", + "qt4nodeinstanceserver.h", + "qt4previewnodeinstanceserver.cpp", + "qt4previewnodeinstanceserver.h", + "qt4rendernodeinstanceserver.cpp", + "qt4rendernodeinstanceserver.h", ] } Group { qbs.installDir: "share/qtcreator/qmldesigner/propertyeditor/Qt" fileTags: ["install"] + prefix: "qtcreator/qmldesigner/propertyeditor/Qt/" files: [ - "qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/FlagedButton.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/FlickableGroupBox.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/FlowSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/GridViewSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/Label.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/MouseAreaSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/PathViewSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/TextEditor.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/Type.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/anchorbottom.css", - "qtcreator/qmldesigner/propertyeditor/Qt/anchorbox.css", - "qtcreator/qmldesigner/propertyeditor/Qt/anchorfill.css", - "qtcreator/qmldesigner/propertyeditor/Qt/anchorhorizontal.css", - "qtcreator/qmldesigner/propertyeditor/Qt/anchorleft.css", - "qtcreator/qmldesigner/propertyeditor/Qt/anchorright.css", - "qtcreator/qmldesigner/propertyeditor/Qt/anchorspacer.css", - "qtcreator/qmldesigner/propertyeditor/Qt/anchortop.css", - "qtcreator/qmldesigner/propertyeditor/Qt/anchorvertical.css", - "qtcreator/qmldesigner/propertyeditor/Qt/applybutton.css", - "qtcreator/qmldesigner/propertyeditor/Qt/aspectlock.css", - "qtcreator/qmldesigner/propertyeditor/Qt/cancelbutton.css", - "qtcreator/qmldesigner/propertyeditor/Qt/checkbox_tr.css", - "qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml", - "qtcreator/qmldesigner/propertyeditor/Qt/layoutWidget.css", - "qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css", - "qtcreator/qmldesigner/propertyeditor/Qt/specialCheckBox.css", - "qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonleft.css", - "qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonmiddle.css", - "qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonright.css", - "qtcreator/qmldesigner/propertyeditor/Qt/switch.css", - "qtcreator/qmldesigner/propertyeditor/Qt/typeLabel.css", + "AlignmentHorizontalButtons.qml", + "AlignmentVerticalButtons.qml", + "AnchorBox.qml", + "AnchorButtons.qml", + "BorderImageSpecifics.qml", + "CheckBox.qml", + "ColorGroupBox.qml", + "ColorLabel.qml", + "ColorScheme.qml", + "ColorTypeButtons.qml", + "ComboBox.qml", + "DoubleSpinBox.qml", + "DoubleSpinBoxAlternate.qml", + "ExpressionEditor.qml", + "Extended.qml", + "ExtendedFunctionButton.qml", + "ExtendedPane.qml", + "ExtendedSwitches.qml", + "FlagedButton.qml", + "FlickableGroupBox.qml", + "FlickableSpecifics.qml", + "FlipableSpecifics.qml", + "FlowSpecifics.qml", + "FontComboBox.qml", + "FontGroupBox.qml", + "FontStyleButtons.qml", + "Geometry.qml", + "GridSpecifics.qml", + "GridViewSpecifics.qml", + "GroupBox.qml", + "GroupBoxOption.qml", + "HorizontalLayout.qml", + "HorizontalWhiteLine.qml", + "ImageSpecifics.qml", + "IntEditor.qml", + "ItemPane.qml", + "Label.qml", + "Layout.qml", + "LayoutPane.qml", + "LineEdit.qml", + "ListViewSpecifics.qml", + "Modifiers.qml", + "MouseAreaSpecifics.qml", + "PathViewSpecifics.qml", + "PlaceHolder.qml", + "PropertyFrame.qml", + "RectangleColorGroupBox.qml", + "RectangleSpecifics.qml", + "RowSpecifics.qml", + "ScrollArea.qml", + "SliderWidget.qml", + "SpinBox.qml", + "StandardTextColorGroupBox.qml", + "StandardTextGroupBox.qml", + "Switches.qml", + "TextEditSpecifics.qml", + "TextEditor.qml", + "TextInputGroupBox.qml", + "TextInputSpecifics.qml", + "TextSpecifics.qml", + "Transformation.qml", + "Type.qml", + "VerticalLayout.qml", + "Visibility.qml", + "anchorbottom.css", + "anchorbox.css", + "anchorfill.css", + "anchorhorizontal.css", + "anchorleft.css", + "anchorright.css", + "anchorspacer.css", + "anchortop.css", + "anchorvertical.css", + "applybutton.css", + "aspectlock.css", + "cancelbutton.css", + "checkbox_tr.css", + "emptyPane.qml", + "layoutWidget.css", + "propertyEditor.css", + "specialCheckBox.css", + "styledbuttonleft.css", + "styledbuttonmiddle.css", + "styledbuttonright.css", + "switch.css", + "typeLabel.css", ] } Group { qbs.installDir: "share/qtcreator/qmldesigner/propertyeditor/Qt/images" fileTags: ["install"] + prefix: "qtcreator/qmldesigner/propertyeditor/Qt/images/" files: [ - "qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentbottom-h-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentbottom-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentcenterh-h-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentcenterh-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentleft-h-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentleft-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentmiddle-h-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentmiddle-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentright-h-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentright-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/alignmenttop-h-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/alignmenttop-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/apply.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/behaivour.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/blended-image-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/bold-h-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/bold-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/button.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/cancel.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/default-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/downArrow.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/expression.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/extended.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/grid-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_gradient.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_none.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_solid.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/image-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/italic-h-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/italic-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/item-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/layout.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/leftArrow.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/list-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/mouse-area-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/placeholder.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/rect-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/reset-button.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/rightArrow.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/standard.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/strikeout-h-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/strikeout-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/submenu.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/text-edit-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/text-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/underline-h-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/underline-icon.png", - "qtcreator/qmldesigner/propertyeditor/Qt/images/upArrow.png", + "alignmentbottom-h-icon.png", + "alignmentbottom-icon.png", + "alignmentcenterh-h-icon.png", + "alignmentcenterh-icon.png", + "alignmentleft-h-icon.png", + "alignmentleft-icon.png", + "alignmentmiddle-h-icon.png", + "alignmentmiddle-icon.png", + "alignmentright-h-icon.png", + "alignmentright-icon.png", + "alignmenttop-h-icon.png", + "alignmenttop-icon.png", + "apply.png", + "behaivour.png", + "blended-image-icon.png", + "bold-h-icon.png", + "bold-icon.png", + "button.png", + "cancel.png", + "default-icon.png", + "downArrow.png", + "expression.png", + "extended.png", + "grid-icon.png", + "icon_color_gradient.png", + "icon_color_none.png", + "icon_color_solid.png", + "image-icon.png", + "italic-h-icon.png", + "italic-icon.png", + "item-icon.png", + "layout.png", + "leftArrow.png", + "list-icon.png", + "mouse-area-icon.png", + "placeholder.png", + "rect-icon.png", + "reset-button.png", + "rightArrow.png", + "standard.png", + "strikeout-h-icon.png", + "strikeout-icon.png", + "submenu.png", + "text-edit-icon.png", + "text-icon.png", + "underline-h-icon.png", + "underline-icon.png", + "upArrow.png", ] } Group { qbs.installDir: "share/qtcreator/qmldesigner/propertyeditor/QtWebKit" fileTags: ["install"] + prefix: "qtcreator/qmldesigner/propertyeditor/QtWebKit/" files: [ - "qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml", + "WebViewSpecifics.qml", ] } Group { qbs.installDir: "share/qtcreator/qmlicons/Qt/16x16" fileTags: ["install"] + prefix: "qtcreator/qmlicons/Qt/16x16/" files: [ - "qtcreator/qmlicons/Qt/16x16/BorderImage.png", - "qtcreator/qmlicons/Qt/16x16/BusyIndicator.png", - "qtcreator/qmlicons/Qt/16x16/Button.png", - "qtcreator/qmlicons/Qt/16x16/ButtonColumn.png", - "qtcreator/qmlicons/Qt/16x16/ButtonRow.png", - "qtcreator/qmlicons/Qt/16x16/CheckBox.png", - "qtcreator/qmlicons/Qt/16x16/ChoiceList.png", - "qtcreator/qmlicons/Qt/16x16/ColorAnimation.png", - "qtcreator/qmlicons/Qt/16x16/Component.png", - "qtcreator/qmlicons/Qt/16x16/CountBubble.png", - "qtcreator/qmlicons/Qt/16x16/DatePickerDialog.png", - "qtcreator/qmlicons/Qt/16x16/Flickable.png", - "qtcreator/qmlicons/Qt/16x16/Flipable.png", - "qtcreator/qmlicons/Qt/16x16/FocusScope.png", - "qtcreator/qmlicons/Qt/16x16/GridView.png", - "qtcreator/qmlicons/Qt/16x16/Image.png", - "qtcreator/qmlicons/Qt/16x16/InfoBanner.png", - "qtcreator/qmlicons/Qt/16x16/Item.png", - "qtcreator/qmlicons/Qt/16x16/ListButton.png", - "qtcreator/qmlicons/Qt/16x16/ListDelegate.png", - "qtcreator/qmlicons/Qt/16x16/ListView.png", - "qtcreator/qmlicons/Qt/16x16/MoreIndicator.png", - "qtcreator/qmlicons/Qt/16x16/MouseArea.png", - "qtcreator/qmlicons/Qt/16x16/PageIndicator.png", - "qtcreator/qmlicons/Qt/16x16/ParallelAnimation.png", - "qtcreator/qmlicons/Qt/16x16/PathView.png", - "qtcreator/qmlicons/Qt/16x16/PauseAnimation.png", - "qtcreator/qmlicons/Qt/16x16/ProgressBar.png", - "qtcreator/qmlicons/Qt/16x16/PropertyChanges.png", - "qtcreator/qmlicons/Qt/16x16/RadioButton.png", - "qtcreator/qmlicons/Qt/16x16/RatingIndicator.png", - "qtcreator/qmlicons/Qt/16x16/Rectangle.png", - "qtcreator/qmlicons/Qt/16x16/SequentialAnimation.png", - "qtcreator/qmlicons/Qt/16x16/Slider.png", - "qtcreator/qmlicons/Qt/16x16/State.png", - "qtcreator/qmlicons/Qt/16x16/Switch.png", - "qtcreator/qmlicons/Qt/16x16/TabBar.png", - "qtcreator/qmlicons/Qt/16x16/TabButton.png", - "qtcreator/qmlicons/Qt/16x16/Text.png", - "qtcreator/qmlicons/Qt/16x16/TextArea.png", - "qtcreator/qmlicons/Qt/16x16/TextEdit.png", - "qtcreator/qmlicons/Qt/16x16/TextField.png", - "qtcreator/qmlicons/Qt/16x16/TextInput.png", - "qtcreator/qmlicons/Qt/16x16/TimePickerDialog.png", - "qtcreator/qmlicons/Qt/16x16/ToolBar.png", - "qtcreator/qmlicons/Qt/16x16/Transition.png", - "qtcreator/qmlicons/Qt/16x16/Tumbler.png", - "qtcreator/qmlicons/Qt/16x16/TumblerButton.png", - "qtcreator/qmlicons/Qt/16x16/TumblerColumn.png", - "qtcreator/qmlicons/Qt/16x16/TumblerDialog.png", - "qtcreator/qmlicons/Qt/16x16/Window.png", - "qtcreator/qmlicons/Qt/16x16/item-icon16.png", + "BorderImage.png", + "BusyIndicator.png", + "Button.png", + "ButtonColumn.png", + "ButtonRow.png", + "CheckBox.png", + "ChoiceList.png", + "ColorAnimation.png", + "Component.png", + "CountBubble.png", + "DatePickerDialog.png", + "Flickable.png", + "Flipable.png", + "FocusScope.png", + "GridView.png", + "Image.png", + "InfoBanner.png", + "Item.png", + "ListButton.png", + "ListDelegate.png", + "ListView.png", + "MoreIndicator.png", + "MouseArea.png", + "PageIndicator.png", + "ParallelAnimation.png", + "PathView.png", + "PauseAnimation.png", + "ProgressBar.png", + "PropertyChanges.png", + "RadioButton.png", + "RatingIndicator.png", + "Rectangle.png", + "SequentialAnimation.png", + "Slider.png", + "State.png", + "Switch.png", + "TabBar.png", + "TabButton.png", + "Text.png", + "TextArea.png", + "TextEdit.png", + "TextField.png", + "TextInput.png", + "TimePickerDialog.png", + "ToolBar.png", + "Transition.png", + "Tumbler.png", + "TumblerButton.png", + "TumblerColumn.png", + "TumblerDialog.png", + "Window.png", + "item-icon16.png", ] } Group { qbs.installDir: "share/qtcreator/qmlicons/QtWebkit/16x16" fileTags: ["install"] + prefix: "qtcreator/qmlicons/QtWebkit/16x16/" files: [ - "qtcreator/qmlicons/QtWebkit/16x16/WebView.png", + "WebView.png", ] } Group { qbs.installDir: "share/qtcreator/schemes" fileTags: ["install"] + prefix: "qtcreator/schemes/" files: [ - "qtcreator/schemes/MS_Visual_C++.kms", - "qtcreator/schemes/Xcode.kms", + "MS_Visual_C++.kms", + "Xcode.kms", ] } Group { qbs.installDir: "share/qtcreator/scripts" fileTags: ["install"] + prefix: "qtcreator/scripts/" files: [ - "qtcreator/scripts/openTerminal.command", + "openTerminal.command", ] } Group { qbs.installDir: "share/qtcreator/snippets" fileTags: ["install"] + prefix: "qtcreator/snippets/" files: [ - "qtcreator/snippets/cpp.xml", - "qtcreator/snippets/qml.xml", - "qtcreator/snippets/text.xml", + "cpp.xml", + "qml.xml", + "text.xml", ] } Group { qbs.installDir: "share/qtcreator/styles" fileTags: ["install"] + prefix: "qtcreator/styles/" files: [ - "qtcreator/styles/darkvim.xml", - "qtcreator/styles/default.xml", - "qtcreator/styles/grayscale.xml", - "qtcreator/styles/inkpot.xml", - "qtcreator/styles/intellij.xml", + "darkvim.xml", + "default.xml", + "grayscale.xml", + "inkpot.xml", + "intellij.xml", ] } Group { qbs.installDir: "share/qtcreator/templates/html5app" fileTags: ["install"] + prefix: "qtcreator/templates/html5app/" files: [ - "qtcreator/templates/html5app/app.pro", - "qtcreator/templates/html5app/main.cpp", + "app.pro", + "main.cpp", ] } Group { qbs.installDir: "share/qtcreator/templates/html5app/html" fileTags: ["install"] + prefix: "qtcreator/templates/html5app/html/" files: [ - "qtcreator/templates/html5app/html/index.html", + "index.html", ] } Group { qbs.installDir: "share/qtcreator/templates/html5app/html5applicationviewer" fileTags: ["install"] + prefix: "qtcreator/templates/html5app/html5applicationviewer/" files: [ - "qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.cpp", - "qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.h", - "qtcreator/templates/html5app/html5applicationviewer/html5applicationviewer.pri", + "html5applicationviewer.cpp", + "html5applicationviewer.h", + "html5applicationviewer.pri", ] } Group { qbs.installDir: "share/qtcreator/templates/html5app/html5applicationviewer/touchnavigation" fileTags: ["install"] + prefix: "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/" files: [ - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/navigationcontroller.cpp", - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/navigationcontroller.h", - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/touchnavigation.pri", - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webnavigation.cpp", - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webnavigation.h", - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webtouchevent.cpp", - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webtouchevent.h", - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webtouchnavigation.cpp", - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webtouchnavigation.h", - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webtouchphysics.cpp", - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webtouchphysics.h", - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webtouchphysicsinterface.cpp", - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webtouchphysicsinterface.h", - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webtouchscroller.cpp", - "qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webtouchscroller.h", + "navigationcontroller.cpp", + "navigationcontroller.h", + "touchnavigation.pri", + "webnavigation.cpp", + "webnavigation.h", + "webtouchevent.cpp", + "webtouchevent.h", + "webtouchnavigation.cpp", + "webtouchnavigation.h", + "webtouchphysics.cpp", + "webtouchphysics.h", + "webtouchphysicsinterface.cpp", + "webtouchphysicsinterface.h", + "webtouchscroller.cpp", + "webtouchscroller.h", ] } Group { qbs.installDir: "share/qtcreator/templates/mobileapp" fileTags: ["install"] + prefix: "qtcreator/templates/mobileapp/" files: [ - "qtcreator/templates/mobileapp/app.pro", - "qtcreator/templates/mobileapp/main.cpp", - "qtcreator/templates/mobileapp/mainwindow.cpp", - "qtcreator/templates/mobileapp/mainwindow.h", - "qtcreator/templates/mobileapp/mainwindow.ui", + "app.pro", + "main.cpp", + "mainwindow.cpp", + "mainwindow.h", + "mainwindow.ui", ] } Group { qbs.installDir: "share/qtcreator/templates/qt4project" fileTags: ["install"] + prefix: "qtcreator/templates/qt4project/" files: [ - "qtcreator/templates/qt4project/main.cpp", - "qtcreator/templates/qt4project/mywidget.cpp", - "qtcreator/templates/qt4project/mywidget.h", - "qtcreator/templates/qt4project/mywidget_form.cpp", - "qtcreator/templates/qt4project/mywidget_form.h", - "qtcreator/templates/qt4project/widget.ui", + "main.cpp", + "mywidget.cpp", + "mywidget.h", + "mywidget_form.cpp", + "mywidget_form.h", + "widget.ui", ] } Group { qbs.installDir: "share/qtcreator/templates/qt4project/customwidgetwizard" fileTags: ["install"] + prefix: "qtcreator/templates/qt4project/customwidgetwizard/" files: [ - "qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.cpp", - "qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.h", - "qtcreator/templates/qt4project/customwidgetwizard/tpl_plugin.pro", - "qtcreator/templates/qt4project/customwidgetwizard/tpl_resources.qrc", - "qtcreator/templates/qt4project/customwidgetwizard/tpl_single.cpp", - "qtcreator/templates/qt4project/customwidgetwizard/tpl_single.h", - "qtcreator/templates/qt4project/customwidgetwizard/tpl_widget.cpp", - "qtcreator/templates/qt4project/customwidgetwizard/tpl_widget.h", - "qtcreator/templates/qt4project/customwidgetwizard/tpl_widget_include.pri", - "qtcreator/templates/qt4project/customwidgetwizard/tpl_widget_lib.pro", + "tpl_collection.cpp", + "tpl_collection.h", + "tpl_plugin.pro", + "tpl_resources.qrc", + "tpl_single.cpp", + "tpl_single.h", + "tpl_widget.cpp", + "tpl_widget.h", + "tpl_widget_include.pri", + "tpl_widget_lib.pro", ] } Group { qbs.installDir: "share/qtcreator/templates/qtquickapp" fileTags: ["install"] + prefix: "qtcreator/templates/qtquickapp/" files: [ - "qtcreator/templates/qtquickapp/app.pro", - "qtcreator/templates/qtquickapp/main.cpp", + "app.pro", + "main.cpp", ] } Group { qbs.installDir: "share/qtcreator/templates/qtquickapp/qml/app/meego10" fileTags: ["install"] + prefix: "qtcreator/templates/qtquickapp/qml/app/meego10/" files: [ - "qtcreator/templates/qtquickapp/qml/app/meego10/MainPage.qml", - "qtcreator/templates/qtquickapp/qml/app/meego10/main.qml", + "MainPage.qml", + "main.qml", ] } Group { qbs.installDir: "share/qtcreator/templates/qtquickapp/qml/app/qtquick10" fileTags: ["install"] + prefix: "qtcreator/templates/qtquickapp/qml/app/qtquick10/" files: [ - "qtcreator/templates/qtquickapp/qml/app/qtquick10/main.qml", + "main.qml", ] } Group { qbs.installDir: "share/qtcreator/templates/qtquickapp/qml/app/symbian11" fileTags: ["install"] + prefix: "qtcreator/templates/qtquickapp/qml/app/symbian11/" files: [ - "qtcreator/templates/qtquickapp/qml/app/symbian11/MainPage.qml", - "qtcreator/templates/qtquickapp/qml/app/symbian11/main.qml", + "MainPage.qml", + "main.qml", ] } Group { qbs.installDir: "share/qtcreator/templates/qtquickapp/qmlapplicationviewer" fileTags: ["install"] + prefix: "qtcreator/templates/qtquickapp/qmlapplicationviewer/" files: [ - "qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp", - "qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.h", - "qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri", + "qmlapplicationviewer.cpp", + "qmlapplicationviewer.h", + "qmlapplicationviewer.pri", ] } Group { qbs.installDir: "share/qtcreator/templates/shared" fileTags: ["install"] + prefix: "qtcreator/templates/shared/" files: [ - "qtcreator/templates/shared/app.desktop", - "qtcreator/templates/shared/deployment.pri", - "qtcreator/templates/shared/icon64.png", - "qtcreator/templates/shared/icon80.png", - "qtcreator/templates/shared/manifest.aegis", - "qtcreator/templates/shared/symbianicon.svg", + "app.desktop", + "deployment.pri", + "icon64.png", + "icon80.png", + "manifest.aegis", + "symbianicon.svg", ] } Group { qbs.installDir: "share/qtcreator/templates/wizards" fileTags: ["install"] + prefix: "qtcreator/templates/wizards/" files: [ - "qtcreator/templates/wizards/README.txt", + "README.txt", ] } Group { qbs.installDir: "share/qtcreator/templates/wizards/helloworld" fileTags: ["install"] + prefix: "qtcreator/templates/wizards/helloworld/" files: [ - "qtcreator/templates/wizards/helloworld/console.png", - "qtcreator/templates/wizards/helloworld/main.cpp", - "qtcreator/templates/wizards/helloworld/project.pro", - "qtcreator/templates/wizards/helloworld/wizard_sample.xml", + "console.png", + "main.cpp", + "project.pro", + "wizard_sample.xml", ] } Group { qbs.installDir: "share/qtcreator/templates/wizards/listmodel" fileTags: ["install"] + prefix: "qtcreator/templates/wizards/listmodel/" files: [ - "qtcreator/templates/wizards/listmodel/listmodel.cpp", - "qtcreator/templates/wizards/listmodel/listmodel.h", - "qtcreator/templates/wizards/listmodel/wizard_sample.xml", + "listmodel.cpp", + "listmodel.h", + "wizard_sample.xml", ] } Group { qbs.installDir: "share/qtcreator/templates/wizards/plaincapp" fileTags: ["install"] + prefix: "qtcreator/templates/wizards/plaincapp/" files: [ - "qtcreator/templates/wizards/plaincapp/console.png", - "qtcreator/templates/wizards/plaincapp/main.c", - "qtcreator/templates/wizards/plaincapp/project.pro", - "qtcreator/templates/wizards/plaincapp/wizard.xml", + "console.png", + "main.c", + "project.pro", + "wizard.xml", ] } Group { qbs.installDir: "share/qtcreator/templates/wizards/plaincapp-cmake" fileTags: ["install"] + prefix: "qtcreator/templates/wizards/plaincapp-cmake/" files: [ - "qtcreator/templates/wizards/plaincapp-cmake/CMakeLists.txt", - "qtcreator/templates/wizards/plaincapp-cmake/console.png", - "qtcreator/templates/wizards/plaincapp-cmake/main.c", - "qtcreator/templates/wizards/plaincapp-cmake/wizard.xml", + "CMakeLists.txt", + "console.png", + "main.c", + "wizard.xml", ] } Group { qbs.installDir: "share/qtcreator/templates/wizards/plaincppapp" fileTags: ["install"] + prefix: "qtcreator/templates/wizards/plaincppapp/" files: [ - "qtcreator/templates/wizards/plaincppapp/console.png", - "qtcreator/templates/wizards/plaincppapp/main.cpp", - "qtcreator/templates/wizards/plaincppapp/project.pro", - "qtcreator/templates/wizards/plaincppapp/wizard.xml", + "console.png", + "main.cpp", + "project.pro", + "wizard.xml", ] } Group { qbs.installDir: "share/qtcreator/templates/wizards/plaincppapp-cmake" fileTags: ["install"] + prefix: "qtcreator/templates/wizards/plaincppapp-cmake/" files: [ - "qtcreator/templates/wizards/plaincppapp-cmake/CMakeLists.txt", - "qtcreator/templates/wizards/plaincppapp-cmake/console.png", - "qtcreator/templates/wizards/plaincppapp-cmake/main.cpp", - "qtcreator/templates/wizards/plaincppapp-cmake/wizard.xml", + "CMakeLists.txt", + "console.png", + "main.cpp", + "wizard.xml", ] } Group { qbs.installDir: "share/qtcreator/templates/wizards/qml-extension" fileTags: ["install"] + prefix: "qtcreator/templates/wizards/qml-extension/" files: [ - "qtcreator/templates/wizards/qml-extension/lib.png", - "qtcreator/templates/wizards/qml-extension/object.cpp", - "qtcreator/templates/wizards/qml-extension/object.h", - "qtcreator/templates/wizards/qml-extension/plugin.cpp", - "qtcreator/templates/wizards/qml-extension/plugin.h", - "qtcreator/templates/wizards/qml-extension/project.pro", - "qtcreator/templates/wizards/qml-extension/qmldir", - "qtcreator/templates/wizards/qml-extension/wizard.xml", + "lib.png", + "object.cpp", + "object.h", + "plugin.cpp", + "plugin.h", + "project.pro", + "qmldir", + "wizard.xml", ] } Group { qbs.installDir: "share/qtcreator/templates/wizards/qtcreatorplugin" fileTags: ["install"] + prefix: "qtcreator/templates/wizards/qtcreatorplugin/" files: [ - "qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec.in", - "qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp", - "qtcreator/templates/wizards/qtcreatorplugin/myplugin.h", - "qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro", - "qtcreator/templates/wizards/qtcreatorplugin/myplugin_global.h", - "qtcreator/templates/wizards/qtcreatorplugin/mypluginconstants.h", - "qtcreator/templates/wizards/qtcreatorplugin/qtcreator_logo_24.png", - "qtcreator/templates/wizards/qtcreatorplugin/wizard.xml", + "MyPlugin.pluginspec.in", + "myplugin.cpp", + "myplugin.h", + "myplugin.pro", + "myplugin_global.h", + "mypluginconstants.h", + "qtcreator_logo_24.png", + "wizard.xml", ] } Group { qbs.installDir: "share/qtcreator/templates/wizards/scriptgeneratedproject" fileTags: ["install"] + prefix: "qtcreator/templates/wizards/scriptgeneratedproject/" files: [ - "qtcreator/templates/wizards/scriptgeneratedproject/generate.pl", - "qtcreator/templates/wizards/scriptgeneratedproject/wizard_sample.xml", + "generate.pl", + "wizard_sample.xml", ] } Group { qbs.installDir: "share/qtcreator/translations" fileTags: ["install"] + prefix: "qtcreator/translations/" files: [ - "qtcreator/translations/README", - "qtcreator/translations/check-ts.pl", - "qtcreator/translations/check-ts.xq", - "qtcreator/translations/extract-customwizards.xq", - "qtcreator/translations/extract-externaltools.xq", - "qtcreator/translations/extract-mimetypes.xq", - "qtcreator/translations/qtcreator_cs.ts", - "qtcreator/translations/qtcreator_de.ts", - "qtcreator/translations/qtcreator_es.ts", - "qtcreator/translations/qtcreator_fr.ts", - "qtcreator/translations/qtcreator_hu.ts", - "qtcreator/translations/qtcreator_it.ts", - "qtcreator/translations/qtcreator_ja.ts", - "qtcreator/translations/qtcreator_pl.ts", - "qtcreator/translations/qtcreator_ru.ts", - "qtcreator/translations/qtcreator_sl.ts", - "qtcreator/translations/qtcreator_uk.ts", - "qtcreator/translations/qtcreator_zh_CN.ts", - "qtcreator/translations/translations.pro", + "README", + "check-ts.pl", + "check-ts.xq", + "extract-customwizards.xq", + "extract-externaltools.xq", + "extract-mimetypes.xq", + "translations.pro", ] } Group { qbs.installDir: "share/qtcreator/welcomescreen" fileTags: ["install"] + prefix: "qtcreator/welcomescreen/" files: [ - "qtcreator/welcomescreen/develop.qml", - "qtcreator/welcomescreen/examples.qml", - "qtcreator/welcomescreen/examples_fallback.xml", - "qtcreator/welcomescreen/gettingstarted.qml", - "qtcreator/welcomescreen/images_areaofinterest.xml", - "qtcreator/welcomescreen/qtcreator_tutorials.xml", - "qtcreator/welcomescreen/tutorials.qml", - "qtcreator/welcomescreen/welcomescreen.qml", - "qtcreator/welcomescreen/welcomescreen.qmlproject", + "develop.qml", + "examples.qml", + "examples_fallback.xml", + "gettingstarted.qml", + "images_areaofinterest.xml", + "qtcreator_tutorials.xml", + "tutorials.qml", + "welcomescreen.qml", + "welcomescreen.qmlproject", ] } Group { qbs.installDir: "share/qtcreator/welcomescreen/dummydata" fileTags: ["install"] + prefix: "qtcreator/welcomescreen/dummydata/" files: [ - "qtcreator/welcomescreen/dummydata/examplesModel.qml", - "qtcreator/welcomescreen/dummydata/pagesModel.qml", - "qtcreator/welcomescreen/dummydata/projectList.qml", - "qtcreator/welcomescreen/dummydata/sessionList.qml", - "qtcreator/welcomescreen/dummydata/tutorialsModel.qml", + "examplesModel.qml", + "pagesModel.qml", + "projectList.qml", + "sessionList.qml", + "tutorialsModel.qml", ] } Group { qbs.installDir: "share/qtcreator/welcomescreen/widgets" fileTags: ["install"] + prefix: "qtcreator/welcomescreen/widgets/" files: [ - "qtcreator/welcomescreen/widgets/CustomColors.qml", - "qtcreator/welcomescreen/widgets/CustomFonts.qml", - "qtcreator/welcomescreen/widgets/CustomTab.qml", - "qtcreator/welcomescreen/widgets/CustomizedGridView.qml", - "qtcreator/welcomescreen/widgets/Delegate.qml", - "qtcreator/welcomescreen/widgets/Feedback.qml", - "qtcreator/welcomescreen/widgets/GettingStartedItem.qml", - "qtcreator/welcomescreen/widgets/IconAndLink.qml", - "qtcreator/welcomescreen/widgets/LinkedText.qml", - "qtcreator/welcomescreen/widgets/LinksBar.qml", - "qtcreator/welcomescreen/widgets/Logo.qml", - "qtcreator/welcomescreen/widgets/PageCaption.qml", - "qtcreator/welcomescreen/widgets/PageLoader.qml", - "qtcreator/welcomescreen/widgets/ProjectItem.qml", - "qtcreator/welcomescreen/widgets/RecentProjects.qml", - "qtcreator/welcomescreen/widgets/SearchBar.qml", - "qtcreator/welcomescreen/widgets/SessionItem.qml", - "qtcreator/welcomescreen/widgets/Sessions.qml", - "qtcreator/welcomescreen/widgets/ToolTip.qml", - "qtcreator/welcomescreen/widgets/qmldir", + "CustomColors.qml", + "CustomFonts.qml", + "CustomTab.qml", + "CustomizedGridView.qml", + "Delegate.qml", + "Feedback.qml", + "GettingStartedItem.qml", + "LinkedText.qml", + "LinksBar.qml", + "Logo.qml", + "PageCaption.qml", + "PageLoader.qml", + "ProjectItem.qml", + "RecentProjects.qml", + "SearchBar.qml", + "SessionItem.qml", + "Sessions.qml", + "ToolTip.qml", ] } Group { qbs.installDir: "share/qtcreator/welcomescreen/widgets/dummydata" fileTags: ["install"] + prefix: "qtcreator/welcomescreen/widgets/dummydata/" files: [ - "qtcreator/welcomescreen/widgets/dummydata/examplesModel.qml", - "qtcreator/welcomescreen/widgets/dummydata/mockupTags.qml", - "qtcreator/welcomescreen/widgets/dummydata/pagesModel.qml", - "qtcreator/welcomescreen/widgets/dummydata/tabsModel.qml", + "examplesModel.qml", + "mockupTags.qml", + "pagesModel.qml", + "tabsModel.qml", ] } Group { qbs.installDir: "share/qtcreator/welcomescreen/widgets/dummydata/context" fileTags: ["install"] + prefix: "qtcreator/welcomescreen/widgets/dummydata/context/" files: [ - "qtcreator/welcomescreen/widgets/dummydata/context/ExampleDelegate.qml", - "qtcreator/welcomescreen/widgets/dummydata/context/ExampleGridView.qml", + "ExampleDelegate.qml", + "ExampleGridView.qml", ] } Group { qbs.installDir: "share/qtcreator/welcomescreen/widgets/images" fileTags: ["install"] + prefix: "qtcreator/welcomescreen/widgets/images/" files: [ - "qtcreator/welcomescreen/widgets/images/arrowBig.png", - "qtcreator/welcomescreen/widgets/images/arrow_down.png", - "qtcreator/welcomescreen/widgets/images/arrow_up.png", - "qtcreator/welcomescreen/widgets/images/bullet.png", - "qtcreator/welcomescreen/widgets/images/dropshadow.png", - "qtcreator/welcomescreen/widgets/images/gettingStarted01.png", - "qtcreator/welcomescreen/widgets/images/gettingStarted02.png", - "qtcreator/welcomescreen/widgets/images/gettingStarted03.png", - "qtcreator/welcomescreen/widgets/images/gettingStarted04.png", - "qtcreator/welcomescreen/widgets/images/info.png", - "qtcreator/welcomescreen/widgets/images/more.png", - "qtcreator/welcomescreen/widgets/images/qtcreator.png", - "qtcreator/welcomescreen/widgets/images/tab.png", + "arrowBig.png", + "arrow_down.png", + "arrow_up.png", + "bullet.png", + "dropshadow.png", + "gettingStarted01.png", + "gettingStarted02.png", + "gettingStarted03.png", + "gettingStarted04.png", + "info.png", + "more.png", + "qtcreator.png", + "tab.png", ] } Group { qbs.installDir: "share/qtcreator/welcomescreen/widgets/images/icons" fileTags: ["install"] + prefix: "qtcreator/welcomescreen/widgets/images/icons/" files: [ - "qtcreator/welcomescreen/widgets/images/icons/adressbook.png", - "qtcreator/welcomescreen/widgets/images/icons/buildrun.png", - "qtcreator/welcomescreen/widgets/images/icons/clone.png", - "qtcreator/welcomescreen/widgets/images/icons/communityIcon.png", - "qtcreator/welcomescreen/widgets/images/icons/components.png", - "qtcreator/welcomescreen/widgets/images/icons/createIcon.png", - "qtcreator/welcomescreen/widgets/images/icons/ddays09.png", - "qtcreator/welcomescreen/widgets/images/icons/ddays10.png", - "qtcreator/welcomescreen/widgets/images/icons/ddays11.png", - "qtcreator/welcomescreen/widgets/images/icons/delete.png", - "qtcreator/welcomescreen/widgets/images/icons/developing_with_qt_creator.png", - "qtcreator/welcomescreen/widgets/images/icons/feedbackIcon.png", - "qtcreator/welcomescreen/widgets/images/icons/ico_community.png", - "qtcreator/welcomescreen/widgets/images/icons/labsIcon.png", - "qtcreator/welcomescreen/widgets/images/icons/openIcon.png", - "qtcreator/welcomescreen/widgets/images/icons/qt_quick_1.png", - "qtcreator/welcomescreen/widgets/images/icons/qt_quick_2.png", - "qtcreator/welcomescreen/widgets/images/icons/qt_quick_3.png", - "qtcreator/welcomescreen/widgets/images/icons/qt_sdk.png", - "qtcreator/welcomescreen/widgets/images/icons/qtquick.png", - "qtcreator/welcomescreen/widgets/images/icons/qwidget.png", - "qtcreator/welcomescreen/widgets/images/icons/rename.png", - "qtcreator/welcomescreen/widgets/images/icons/userguideIcon.png", - "qtcreator/welcomescreen/widgets/images/icons/videoIcon.png", + "adressbook.png", + "buildrun.png", + "clone.png", + "communityIcon.png", + "components.png", + "createIcon.png", + "ddays09.png", + "ddays10.png", + "ddays11.png", + "delete.png", + "developing_with_qt_creator.png", + "feedbackIcon.png", + "ico_community.png", + "labsIcon.png", + "openIcon.png", + "qt_quick_1.png", + "qt_quick_2.png", + "qt_quick_3.png", + "qt_sdk.png", + "qtquick.png", + "qwidget.png", + "rename.png", + "userguideIcon.png", + "videoIcon.png", ] } Group { qbs.installDir: "share/qtcreator/welcomescreen/widgets/images/mockup" fileTags: ["install"] + prefix: "qtcreator/welcomescreen/widgets/images/mockup/" files: [ - "qtcreator/welcomescreen/widgets/images/mockup/designer-examples.png", - "qtcreator/welcomescreen/widgets/images/mockup/desktop-examples.png", - "qtcreator/welcomescreen/widgets/images/mockup/draganddrop-examples.png", - "qtcreator/welcomescreen/widgets/images/mockup/itemview-examples.png", - "qtcreator/welcomescreen/widgets/images/mockup/layout-examples.png", - "qtcreator/welcomescreen/widgets/images/mockup/mainwindow-examples.png", - "qtcreator/welcomescreen/widgets/images/mockup/network-examples.png", - "qtcreator/welcomescreen/widgets/images/mockup/opengl-examples.png", - "qtcreator/welcomescreen/widgets/images/mockup/penguin.png", - "qtcreator/welcomescreen/widgets/images/mockup/qtscript-examples.png", - "qtcreator/welcomescreen/widgets/images/mockup/thread-examples.png", + "designer-examples.png", + "desktop-examples.png", + "draganddrop-examples.png", + "itemview-examples.png", + "layout-examples.png", + "mainwindow-examples.png", + "network-examples.png", + "opengl-examples.png", + "penguin.png", + "qtscript-examples.png", + "thread-examples.png", ] } } diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index a4c8a088f47..fc80dde8b7e 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -121,7 +121,7 @@ namespace { To do this, you register your action via the registerAction methods, get the action container for a specific ID (like specified in the Core::Constants namespace) with a call of - actionContainer(const QString&) and add your command to this container. + actionContainer(const Id&) and add your command to this container. Following the example adding "My Action" to the "Tools" menu would be done by \code @@ -171,7 +171,7 @@ namespace { \brief Makes an \a action known to the system under the specified string \a id. Returns a command object that represents the action in the application and is - owned by the ActionManager. You can registered several actions with the + owned by the ActionManager. You can register several actions with the same \a id as long as the \a context is different. In this case a trigger of the actual action is forwarded to the registered QAction for the currently active context. @@ -180,7 +180,7 @@ namespace { */ /*! - \fn Command *ActionManager::registerShortcut(QShortcut *shortcut, const QString &id, const Context &context, bool scriptable) + \fn Command *ActionManager::registerShortcut(QShortcut *shortcut, const Id &id, const Context &context, bool scriptable) \brief Makes a \a shortcut known to the system under the specified string \a id. Returns a command object that represents the shortcut in the application and is diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 47862f3e060..2eeadf8b751 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -399,6 +399,7 @@ void TaskWindow::showTask(unsigned int id) QModelIndex sourceIdx = d->m_model->index(sourceRow, 0); QModelIndex filterIdx = d->m_filter->mapFromSource(sourceIdx); d->m_listview->setCurrentIndex(filterIdx); + popup(false); } void TaskWindow::openTask(unsigned int id) diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesigner.qbs similarity index 100% rename from src/plugins/qmldesigner/qmldesignerplugin.qbs rename to src/plugins/qmldesigner/qmldesigner.qbs diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index 96f4b7564fd..ace4f73af22 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -5890,12 +5890,16 @@ namespace bug6933 { class Base { public: + Base() : a(21) {} virtual ~Base() {} int a; }; class Derived : public Base { + public: + Derived() : b(42) {} + int b; }; void test6933() @@ -5905,6 +5909,7 @@ namespace bug6933 { BREAK_HERE; // Expand b b.bug6933::Base // Check b.[bug6933::Base].[vptr] + // Check b.b 42 int. // Continue. dummyStatement(&d, b); } diff --git a/tests/system/shared/editor_utils.py b/tests/system/shared/editor_utils.py index a7656014e67..2ebf8205f99 100644 --- a/tests/system/shared/editor_utils.py +++ b/tests/system/shared/editor_utils.py @@ -225,3 +225,37 @@ def verifyProperties(properties, expectedProps): else: result[key] = None return result + +def getEditorForFileSuffix(curFile): + cppEditorSuffixes = ["cpp", "cc", "CC", "h", "H", "cp", "cxx", "C", "c++", "inl", "moc", "qdoc", + "tcc", "tpp", "t++", "c", "cu", "m", "mm", "hh", "hxx", "h++", "hpp", "hp"] + qmlEditorSuffixes = ["qml", "qmlproject", "js", "qs", "qtt"] + proEditorSuffixes = ["pro", "pri", "prf"] + suffix = __getFileSuffix__(curFile) + if suffix in cppEditorSuffixes: + editor = waitForObject("{type='CppEditor::Internal::CPPEditorWidget' unnamed='1' " + "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}") + elif suffix in qmlEditorSuffixes: + editor = waitForObject("{type='QmlJSEditor::QmlJSTextEditorWidget' unnamed='1' " + "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}") + elif suffix in proEditorSuffixes: + editor = waitForObject("{type='Qt4ProjectManager::Internal::ProFileEditorWidget' unnamed='1' " + "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}") + else: + test.log("Trying PlainTextEditor (file suffix: %s)" % suffix) + try: + editor = waitForObject("{type='TextEditor::PlainTextEditorWidget' unnamed='1' " + "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}", 3000) + except: + test.fatal("Unsupported file suffix for file '%s'" % curFile) + editor = None + return editor + +# helper that determines the file suffix of the given fileName +# (doesn't matter if fileName contains the path as well) +def __getFileSuffix__(fileName): + suffix = os.path.basename(fileName).rsplit(".", 1) + if len(suffix) == 1: + return None + else: + return suffix[1] diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index fc039880b6f..ac886a3ed5e 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -299,6 +299,7 @@ def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP, availableTargets def runAndCloseApp(withHookInto=False, executable=None, port=None, function=None, sType=None, userDefinedType=None): global processStarted, processExited processStarted = processExited = False + overrideInstallLazySignalHandler() installLazySignalHandler("{type='ProjectExplorer::ApplicationLaucher'}", "processStarted()", "__handleProcessStarted__") installLazySignalHandler("{type='ProjectExplorer::ApplicationLaucher'}", "processExited(int)", "__handleProcessExited__") runButton = waitForObject("{type='Core::Internal::FancyToolButton' text='Run' visible='1'}", 20000) @@ -315,7 +316,7 @@ def runAndCloseApp(withHookInto=False, executable=None, port=None, function=None test.fatal("Couldn't start application - leaving test") invokeMenuItem("File", "Exit") return False - if os.getenv("SYSTEST_QMLVIEWER_NO_HOOK_INTO", "0") == "1": + if sType == SubprocessType.QT_QUICK_UI and os.getenv("SYSTEST_QMLVIEWER_NO_HOOK_INTO", "0") == "1": withHookInto = False if withHookInto and not validType(sType, userDefinedType): if function != None: @@ -341,6 +342,7 @@ def validType(sType, userDef): def __closeSubprocessByPushingStop__(sType): ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton") + waitForObject(":Qt Creator.Stop_QToolButton", 5000) playButton = verifyEnabled(":Qt Creator.ReRun_QToolButton", False) stopButton = verifyEnabled(":Qt Creator.Stop_QToolButton") if stopButton.enabled: diff --git a/tests/system/shared/suites_qtta.py b/tests/system/shared/suites_qtta.py new file mode 100755 index 00000000000..1c52ca3ebe4 --- /dev/null +++ b/tests/system/shared/suites_qtta.py @@ -0,0 +1,36 @@ + +# appends to line, by typing after text into widget +def appendToLine(codeArea, insertAfterLine, typeWhat): + if not placeCursorToLine(codeArea, insertAfterLine): + return False + type(codeArea, typeWhat) + return True + +# checks if error is properly reported, returns True if succeeded and False if not. +# Current implementation is focused on allowing different compilers, and it is enough if one of the expected messages +# is found in issues view. warnIfMoreIssues should warn if there are more than one issue, no matter how many +# expected texts are in array (because they are alternatives). +def checkSyntaxError(issuesView, expectedTextsArray, warnIfMoreIssues = True): + issuesModel = issuesView.model() + # wait for issues + waitFor("issuesModel.rowCount() > 0", 5000) + # warn if more issues reported + if(warnIfMoreIssues and issuesModel.rowCount() > 1): + test.warning("More than one expected issues reported") + # iterate issues and check if there exists "Unexpected token" message + for row in range(issuesModel.rowCount()): + # enum Roles { File = Qt::UserRole, Line, MovedLine, Description, FileNotFound, Type, Category, Icon, Task_t }; + index = issuesModel.index(row, 0) + description = str(index.data(Qt.UserRole + 3).toString()) + type = str(index.data(Qt.UserRole + 5).toString()) + # check if at least one of expected texts found in issue text + for expectedText in expectedTextsArray: + if expectedText in description: + # check if it is error and warn if not - returns False which leads to fail + if type is not "1": + test.warning("Expected error text found, but is not of type: 'error'") + return False + else: + return True + return False + diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index 1c120e1f1ec..578721959fb 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -181,9 +181,10 @@ def cleanUpUserFiles(pathsToProFiles=None): def invokeMenuItem(menu, item, subItem = None): menuObject = waitForObjectItem(":Qt Creator.QtCreator.MenuBar_QMenuBar", menu) + waitFor("menuObject.visible", 1000) activateItem(menuObject) itemObject = waitForObjectItem(objectMap.realName(menuObject), item) - waitFor("menuObject.visible", 1000) + waitFor("itemObject.enabled", 2000) activateItem(itemObject) if subItem != None: sub = itemObject.menu() @@ -194,8 +195,11 @@ def logApplicationOutput(): # make sure application output is shown ensureChecked("{type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' " "window=':Qt Creator_Core::Internal::MainWindow' occurrence='3'}") - output = waitForObject("{type='Core::OutputWindow' visible='1' windowTitle='Application Output Window'}", 20000) - test.log("Application Output:\n%s" % output.plainText) + try: + output = waitForObject("{type='Core::OutputWindow' visible='1' windowTitle='Application Output Window'}", 20000) + test.log("Application Output:\n%s" % output.plainText) + except: + test.fail("Could not find any Application Output - did the project run?") # get the output from a given cmdline call def getOutputFromCmdline(cmdline): diff --git a/tests/system/suite_SCOM/envvars b/tests/system/suite_SCOM/envvars new file mode 100644 index 00000000000..00aad3eab7d --- /dev/null +++ b/tests/system/suite_SCOM/envvars @@ -0,0 +1 @@ +QT_PLATFORM_PLUGIN=nonesuch diff --git a/tests/system/suite_SCOM/objects.map b/tests/system/suite_SCOM/objects.map new file mode 100644 index 00000000000..2b93d8dc9fd --- /dev/null +++ b/tests/system/suite_SCOM/objects.map @@ -0,0 +1,17 @@ +:New Qt Quick Application.Add to version control:_QLabel {name='addToVersionControlLabel' text='Add to version control:' type='QLabel' visible='1'} +:Next_QPushButton {name='__qt__passive_wizardbutton1' text~='(Next.*|Continue)' type='QPushButton' visible='1'} +:Qt Creator.Build Project_Core::Internal::FancyToolButton {text='Build Project' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator.Compile Output_Core::OutputWindow {type='Core::OutputWindow' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Compile Output'} +:Qt Creator.Issues_QListView {type='QListView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Issues'} +:Qt Creator.Project.Menu.Project_QMenu {name='Project.Menu.Project' type='QMenu' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator.QtCreator.MenuBar_QMenuBar {name='QtCreator.MenuBar' type='QMenuBar' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator.scrollArea_QScrollArea {name='scrollArea' type='QScrollArea' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator_Core::Internal::IssuesPaneToggleButton {type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator_Core::Internal::MainWindow {type='Core::Internal::MainWindow' unnamed='1' visible='1'} +:Qt Creator_Core::Internal::OutputPaneToggleButton {occurrence='4' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator_CppEditor::Internal::CPPEditorWidget {type='CppEditor::Internal::CPPEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator_QmlJSEditor::QmlJSTextEditorWidget {type='QmlJSEditor::QmlJSTextEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator_Utils::NavigationTreeView {type='Utils::NavigationTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:addToVersionControlComboBox_QComboBox {buddy=':New Qt Quick Application.Add to version control:_QLabel' name='addToVersionControlComboBox' type='QComboBox' visible='1'} +:scrollArea.Edit build configuration:_QComboBox {container=':Qt Creator.scrollArea_QScrollArea' leftWidget=':scrollArea.Edit build configuration:_QLabel' type='QComboBox' unnamed='1' visible='1'} +:scrollArea.Edit build configuration:_QLabel {container=':Qt Creator.scrollArea_QScrollArea' text='Edit build configuration:' type='QLabel' unnamed='1' visible='1'} diff --git a/tests/system/suite_SCOM/suite.conf b/tests/system/suite_SCOM/suite.conf new file mode 100644 index 00000000000..a1a1dc9996b --- /dev/null +++ b/tests/system/suite_SCOM/suite.conf @@ -0,0 +1,10 @@ +AUT=qtcreator +CLASS= +CLASSPATH= +ENVVARS=envvars +HOOK_SUB_PROCESSES=false +IMPLICITAUTSTART=0 +LANGUAGE=Python +TEST_CASES=tst_SCOM01 tst_SCOM02 tst_SCOM04 tst_SCOM05 +VERSION=2 +WRAPPERS=Qt diff --git a/tests/system/suite_SCOM/tst_SCOM01/test.py b/tests/system/suite_SCOM/tst_SCOM01/test.py new file mode 100644 index 00000000000..4b4fb5f21e9 --- /dev/null +++ b/tests/system/suite_SCOM/tst_SCOM01/test.py @@ -0,0 +1,25 @@ +source("../../shared/qtcreator.py") +source("../../shared/suites_qtta.py") + +# entry of test +def main(): + startApplication("qtcreator" + SettingsPath) + # create qt quick application + createNewQtQuickApplication(tempDir(), "SampleApp") + # build it - on all (except Qt 4.7.0 (would fail)) build configurations + for config in iterateBuildConfigs(1, 0, "(?!.*4\.7\.0.*)"): + selectBuildConfig(1, 0, config) + # try to compile + test.log("Testing build configuration: " + config) + clickButton(waitForObject(":Qt Creator.Build Project_Core::Internal::FancyToolButton")) + waitForSignal("{type='ProjectExplorer::BuildManager' unnamed='1'}", "buildQueueFinished(bool)") + # check output if build successful + ensureChecked(waitForObject(":Qt Creator_Core::Internal::OutputPaneToggleButton")) + compileOutput = waitForObject(":Qt Creator.Compile Output_Core::OutputWindow") + if not test.verify(str(compileOutput.plainText).endswith("exited normally."), + "Verifying building of simple qt quick application."): + test.log(compileOutput.plainText) + # exit qt creator + invokeMenuItem("File", "Exit") +# no cleanup needed, as whole testing directory gets properly removed after test finished + diff --git a/tests/system/suite_SCOM/tst_SCOM02/test.py b/tests/system/suite_SCOM/tst_SCOM02/test.py new file mode 100644 index 00000000000..82b94a20514 --- /dev/null +++ b/tests/system/suite_SCOM/tst_SCOM02/test.py @@ -0,0 +1,25 @@ +source("../../shared/qtcreator.py") +source("../../shared/suites_qtta.py") + +# entry of test +def main(): + startApplication("qtcreator" + SettingsPath) + # create qt quick application + createNewQtQuickApplication(tempDir(), "SampleApp") + # create syntax error in qml file + doubleClickItem(":Qt Creator_Utils::NavigationTreeView", "SampleApp.QML.qml/SampleApp.main\\.qml", 5, 5, 0, Qt.LeftButton) + if not appendToLine(waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget"), "Text {", "SyntaxError"): + invokeMenuItem("File", "Exit") + return + # save all to invoke qml parsing + invokeMenuItem("File", "Save All") + # open issues list view + ensureChecked(waitForObject(":Qt Creator_Core::Internal::IssuesPaneToggleButton")) + issuesView = waitForObject(":Qt Creator.Issues_QListView") + # verify that error is properly reported + test.verify(checkSyntaxError(issuesView, ["Unexpected token"], True), + "Verifying QML syntax error while parsing simple qt quick application.") + # exit qt creator + invokeMenuItem("File", "Exit") +# no cleanup needed, as whole testing directory gets properly removed after test finished + diff --git a/tests/system/suite_SCOM/tst_SCOM04/test.py b/tests/system/suite_SCOM/tst_SCOM04/test.py new file mode 100644 index 00000000000..fecef36c571 --- /dev/null +++ b/tests/system/suite_SCOM/tst_SCOM04/test.py @@ -0,0 +1,36 @@ +source("../../shared/qtcreator.py") +source("../../shared/suites_qtta.py") + +# entry of test +def main(): + # expected error texts - for different compilers + expectedErrorAlternatives = ["'SyntaxError' was not declared in this scope", + "'SyntaxError' : undeclared identifier"] + startApplication("qtcreator" + SettingsPath) + # create qt quick application + createNewQtQuickApplication(tempDir(), "SampleApp") + # create syntax error in cpp file + doubleClickItem(":Qt Creator_Utils::NavigationTreeView", "SampleApp.Sources.main\\.cpp", 5, 5, 0, Qt.LeftButton) + if not appendToLine(waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget"), "viewer.showExpanded();", "SyntaxError"): + invokeMenuItem("File", "Exit") + return + # save all + invokeMenuItem("File", "Save All") + # build it - on all (except Qt 4.7.0 (would fail)) build configurations + for config in iterateBuildConfigs(1, 0, "(?!.*4\.7\.0.*)"): + selectBuildConfig(1, 0, config) + # try to compile + test.log("Testing build configuration: " + config) + clickButton(waitForObject(":Qt Creator.Build Project_Core::Internal::FancyToolButton")) + # wait until build finished + waitForSignal("{type='ProjectExplorer::BuildManager' unnamed='1'}", "buildQueueFinished(bool)") + # open issues list view + ensureChecked(waitForObject(":Qt Creator_Core::Internal::IssuesPaneToggleButton")) + issuesView = waitForObject(":Qt Creator.Issues_QListView") + # verify that error is properly reported + test.verify(checkSyntaxError(issuesView, expectedErrorAlternatives, False), + "Verifying cpp syntax error while building simple qt quick application.") + # exit qt creator + invokeMenuItem("File", "Exit") +# no cleanup needed, as whole testing directory gets properly removed after test finished + diff --git a/tests/system/suite_SCOM/tst_SCOM05/test.py b/tests/system/suite_SCOM/tst_SCOM05/test.py new file mode 100644 index 00000000000..eb4ebbdf7e3 --- /dev/null +++ b/tests/system/suite_SCOM/tst_SCOM05/test.py @@ -0,0 +1,44 @@ +source("../../shared/qtcreator.py") +source("../../shared/suites_qtta.py") + +def verifyChangeProject(projectName): + # select project + projItem = waitForObjectItem(":Qt Creator_Utils::NavigationTreeView", projectName) + openItemContextMenu(waitForObject(":Qt Creator_Utils::NavigationTreeView"), projectName, 5, 5, 0) + activateItem(waitForObjectItem(":Qt Creator.Project.Menu.Project_QMenu", "Set as Active Project")) + waitFor("projItem.font.bold==True",3000) + # check if bold is right project + test.verify(projItem.font.bold == True, + "Simple Qt Quick App - multiple projects - verifying if properly set to project: " + projectName) + +def main(): + projectName1 = "SampleApp1" + projectName2 = "SampleApp2" + startApplication("qtcreator" + SettingsPath) + # create qt quick application 1 + createNewQtQuickApplication(tempDir(), projectName1) + waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 5000) + # create qt quick application 2 + createNewQtQuickApplication(tempDir(), projectName2) + waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 5000) + # change to project 1 + verifyChangeProject(projectName1) + # change to project 2 + verifyChangeProject(projectName2) + # build project 2 + clickButton(waitForObject(":Qt Creator.Build Project_Core::Internal::FancyToolButton")) + # wait for build to complete + waitForSignal("{type='ProjectExplorer::BuildManager' unnamed='1'}", "buildQueueFinished(bool)") + # check output if build successful + ensureChecked(waitForObject(":Qt Creator_Core::Internal::OutputPaneToggleButton")) + outputLog = str(waitForObject(":Qt Creator.Compile Output_Core::OutputWindow").plainText) + # verify that project was built successfully + test.verify(outputLog.endswith("exited normally."), + "Verifying building of simple qt quick application while multiple projects are open.") + # verify that proper project (project 2) was build + test.verify(projectName2 in outputLog and projectName1 not in outputLog, + "Verifying that proper project " + projectName2 + " was built.") + # exit qt creator + invokeMenuItem("File", "Exit") +# no cleanup needed, as whole testing directory gets properly removed after test finished + diff --git a/tests/system/suite_general/tst_select_all/test.py b/tests/system/suite_general/tst_select_all/test.py index 690bebdfe21..f3e68513125 100644 --- a/tests/system/suite_general/tst_select_all/test.py +++ b/tests/system/suite_general/tst_select_all/test.py @@ -10,21 +10,23 @@ def charactersInFile(filename): return len(content) def main(): - filesAndEditors = {srcPath + "/creator/README" : "TextEditor::PlainTextEditorWidget", - srcPath + "/creator/qtcreator.pri" : "Qt4ProjectManager::Internal::ProFileEditorWidget", - srcPath + "/creator/doc/snippets/qml/list-of-transitions.qml" : "QmlJSEditor::QmlJSTextEditorWidget"} - for currentFile in filesAndEditors: + files = [srcPath + "/creator/README", srcPath + "/creator/qtcreator.pri", + srcPath + "/creator/doc/snippets/qml/list-of-transitions.qml"] + for currentFile in files: if not neededFilePresent(currentFile): return startApplication("qtcreator" + SettingsPath) - for currentFile in filesAndEditors: + for currentFile in files: test.log("Opening file %s" % currentFile) size = charactersInFile(currentFile) invokeMenuItem("File", "Open File or Project...") selectFromFileDialog(currentFile) - editor = waitForObject("{type='%s' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}" - % filesAndEditors[currentFile], 20000) + editor = getEditorForFileSuffix(currentFile) + if editor == None: + test.fatal("Could not get the editor for '%s'" % currentFile, + "Skipping this file for now.") + continue JIRA.performWorkaroundIfStillOpen(6918, JIRA.Bug.CREATOR, editor) for key in ["", "", "", ""]: test.log("Selecting everything")