From a3251e2979db06dd92dfcb9bbab673303ba97492 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 25 Sep 2012 16:05:47 +0200 Subject: Update share.qbs Also update the script to exclude translations.{pro,qbs} Change-Id: I0d91218ad83b14a6ed319aac9b8770ebb2db7be8 Reviewed-by: Joerg Bornemann --- share/share.qbs | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 127 insertions(+), 1 deletion(-) (limited to 'share/share.qbs') diff --git a/share/share.qbs b/share/share.qbs index a7f811b174..6aad917b6c 100644 --- a/share/share.qbs +++ b/share/share.qbs @@ -226,6 +226,7 @@ Product { "deviceorientation.h", "deviceorientation_harmattan.cpp", "deviceorientation_maemo5.cpp", + "deviceorientation_symbian.cpp", "loggerwidget.cpp", "loggerwidget.h", "main.cpp", @@ -888,6 +889,36 @@ Product { ] } + Group { + qbs.installDir: "share/qtcreator/templates/qtquick2app" + fileTags: ["install"] + prefix: "qtcreator/templates/qtquick2app/" + files: [ + "app.pro", + "main.cpp", + ] + } + + Group { + qbs.installDir: "share/qtcreator/templates/qtquick2app/qml/app/qtquick20" + fileTags: ["install"] + prefix: "qtcreator/templates/qtquick2app/qml/app/qtquick20/" + files: [ + "main.qml", + ] + } + + Group { + qbs.installDir: "share/qtcreator/templates/qtquick2app/qtquick2applicationviewer" + fileTags: ["install"] + prefix: "qtcreator/templates/qtquick2app/qtquick2applicationviewer/" + files: [ + "qtquick2applicationviewer.cpp", + "qtquick2applicationviewer.h", + "qtquick2applicationviewer.pri", + ] + } + Group { qbs.installDir: "share/qtcreator/templates/qtquickapp" fileTags: ["install"] @@ -950,6 +981,102 @@ Product { ] } + Group { + qbs.installDir: "share/qtcreator/templates/wizards/bb-bardescriptor" + fileTags: ["install"] + prefix: "qtcreator/templates/wizards/bb-bardescriptor/" + files: [ + "bar-descriptor.xml", + "wizard.xml", + ] + } + + Group { + qbs.installDir: "share/qtcreator/templates/wizards/bb-guiapp" + fileTags: ["install"] + prefix: "qtcreator/templates/wizards/bb-guiapp/" + files: [ + "bar-descriptor.xml", + "icon.png", + "main.cpp", + "mainwidget.cpp", + "mainwidget.h", + "mainwidget.ui", + "project.pro", + "wizard.xml", + ] + } + + Group { + qbs.installDir: "share/qtcreator/templates/wizards/bb-qt5-bardescriptor" + fileTags: ["install"] + prefix: "qtcreator/templates/wizards/bb-qt5-bardescriptor/" + files: [ + "bar-descriptor.xml", + "wizard.xml", + ] + } + + Group { + qbs.installDir: "share/qtcreator/templates/wizards/bb-qt5-guiapp" + fileTags: ["install"] + prefix: "qtcreator/templates/wizards/bb-qt5-guiapp/" + files: [ + "bar-descriptor.xml", + "icon.png", + "main.cpp", + "mainwidget.cpp", + "mainwidget.h", + "mainwidget.ui", + "project.pro", + "wizard.xml", + ] + } + + Group { + qbs.installDir: "share/qtcreator/templates/wizards/bb-qt5-quick2app" + fileTags: ["install"] + prefix: "qtcreator/templates/wizards/bb-qt5-quick2app/" + files: [ + "bar-descriptor.xml", + "icon.png", + "main.cpp", + "project.pro", + "wizard.xml", + ] + } + + Group { + qbs.installDir: "share/qtcreator/templates/wizards/bb-qt5-quick2app/qml" + fileTags: ["install"] + prefix: "qtcreator/templates/wizards/bb-qt5-quick2app/qml/" + files: [ + "main.qml", + ] + } + + Group { + qbs.installDir: "share/qtcreator/templates/wizards/bb-quickapp" + fileTags: ["install"] + prefix: "qtcreator/templates/wizards/bb-quickapp/" + files: [ + "bar-descriptor.xml", + "icon.png", + "main.cpp", + "project.pro", + "wizard.xml", + ] + } + + Group { + qbs.installDir: "share/qtcreator/templates/wizards/bb-quickapp/qml" + fileTags: ["install"] + prefix: "qtcreator/templates/wizards/bb-quickapp/qml/" + files: [ + "main.qml", + ] + } + Group { qbs.installDir: "share/qtcreator/templates/wizards/helloworld" fileTags: ["install"] @@ -1074,7 +1201,6 @@ Product { "extract-customwizards.xq", "extract-externaltools.xq", "extract-mimetypes.xq", - "translations.pro", ] } -- cgit v1.2.1 From f49573810338ece54cf7731d1a1d801ffc422085 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 26 Sep 2012 21:26:45 +0200 Subject: Update share.qbs to match qmake build The only thing that is left is excluded translation support Change-Id: Ib419fee5caf10742e94cdf3b6bc7eee937637ea3 Reviewed-by: Joerg Bornemann --- share/share.qbs | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) (limited to 'share/share.qbs') diff --git a/share/share.qbs b/share/share.qbs index 6aad917b6c..11270e452b 100644 --- a/share/share.qbs +++ b/share/share.qbs @@ -4,6 +4,13 @@ Product { type: ["installed_content"] name: "SharedContent" + Group { + condition: qbs.targetOS == "macx" + qbs.installDir: "share/qtcreator/scripts" + fileTags: ["install"] + files: "qtcreator/scripts/openTerminal.command" + } + Group { qbs.installDir: "share/qtcreator/designer" fileTags: ["install"] @@ -124,7 +131,6 @@ Product { fileTags: ["install"] prefix: "qtcreator/qml/qmldump/" files: [ - "Info.plist.in", "LGPL_EXCEPTION.TXT", "LICENSE.LGPL", "main.cpp", @@ -219,7 +225,6 @@ Product { fileTags: ["install"] prefix: "qtcreator/qml/qmlobserver/" files: [ - "Info.plist.in", "LGPL_EXCEPTION.TXT", "LICENSE.LGPL", "deviceorientation.cpp", @@ -456,7 +461,6 @@ Product { fileTags: ["install"] prefix: "qtcreator/qml/qmlpuppet/qml2puppet/" files: [ - "Info.plist.in", "main.cpp", "qml2puppet.pro", ] @@ -488,7 +492,6 @@ Product { fileTags: ["install"] prefix: "qtcreator/qml/qmlpuppet/qmlpuppet/" files: [ - "Info.plist.in", "main.cpp", "qmlpuppet.pri", "qmlpuppet.pro", @@ -758,15 +761,6 @@ Product { ] } - Group { - qbs.installDir: "share/qtcreator/scripts" - fileTags: ["install"] - prefix: "qtcreator/scripts/" - files: [ - "openTerminal.command", - ] - } - Group { qbs.installDir: "share/qtcreator/snippets" fileTags: ["install"] @@ -1190,20 +1184,6 @@ Product { ] } - Group { - qbs.installDir: "share/qtcreator/translations" - fileTags: ["install"] - prefix: "qtcreator/translations/" - files: [ - "README", - "check-ts.pl", - "check-ts.xq", - "extract-customwizards.xq", - "extract-externaltools.xq", - "extract-mimetypes.xq", - ] - } - Group { qbs.installDir: "share/qtcreator/welcomescreen" fileTags: ["install"] -- cgit v1.2.1