Commit 0dab64b6 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Qbs project files: Use groups wherever applicable.



Provides better structuring of source files.

Change-Id: Ic2d0094312bb7c8da01a1f38270564407fdbefce
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 417b80c5
......@@ -85,88 +85,68 @@ QtcLibrary {
]
}
files: [
"AlreadyConsideredClassContainer.h",
"ASTParent.cpp",
"ASTParent.h",
"ASTPath.cpp",
"ASTPath.h",
"BackwardsScanner.cpp",
"BackwardsScanner.h",
"CppDocument.cpp",
"CppDocument.h",
"CppRewriter.cpp",
"CppRewriter.h",
"DependencyTable.cpp",
"DependencyTable.h",
"DeprecatedGenTemplateInstance.cpp",
"DeprecatedGenTemplateInstance.h",
"ExpressionUnderCursor.cpp",
"ExpressionUnderCursor.h",
"FastPreprocessor.cpp",
"FastPreprocessor.h",
"FindUsages.cpp",
"FindUsages.h",
"Icons.cpp",
"Icons.h",
"LookupContext.cpp",
"LookupContext.h",
"LookupItem.cpp",
"LookupItem.h",
"Macro.cpp",
"Macro.h",
"MatchingText.cpp",
"MatchingText.h",
"NamePrettyPrinter.cpp",
"NamePrettyPrinter.h",
"Overview.cpp",
"Overview.h",
"OverviewModel.cpp",
"OverviewModel.h",
"PPToken.cpp",
"PPToken.h",
"PreprocessorClient.cpp",
"PreprocessorClient.h",
"PreprocessorEnvironment.cpp",
"PreprocessorEnvironment.h",
"ResolveExpression.cpp",
"ResolveExpression.h",
"SimpleLexer.cpp",
"SimpleLexer.h",
"SnapshotSymbolVisitor.cpp",
"SnapshotSymbolVisitor.h",
"SymbolNameVisitor.cpp",
"SymbolNameVisitor.h",
"TypeOfExpression.cpp",
"TypeOfExpression.h",
"TypePrettyPrinter.cpp",
"TypePrettyPrinter.h",
"cplusplus.qrc",
"findcdbbreakpoint.cpp",
"findcdbbreakpoint.h",
"pp-cctype.h",
"pp-engine.cpp",
"pp-engine.h",
"pp-scanner.cpp",
"pp-scanner.h",
"pp.h",
"images/class.png",
"images/enum.png",
"images/enumerator.png",
"images/func.png",
"images/func_priv.png",
"images/func_prot.png",
"images/keyword.png",
"images/macro.png",
"images/namespace.png",
"images/signal.png",
"images/slot.png",
"images/slot_priv.png",
"images/slot_prot.png",
"images/var.png",
"images/var_priv.png",
"images/var_prot.png",
]
Group {
name: "General"
files: [
"AlreadyConsideredClassContainer.h",
"ASTParent.cpp", "ASTParent.h",
"ASTPath.cpp", "ASTPath.h",
"BackwardsScanner.cpp", "BackwardsScanner.h",
"CppDocument.cpp", "CppDocument.h",
"CppRewriter.cpp", "CppRewriter.h",
"DependencyTable.cpp", "DependencyTable.h",
"DeprecatedGenTemplateInstance.cpp", "DeprecatedGenTemplateInstance.h",
"ExpressionUnderCursor.cpp", "ExpressionUnderCursor.h",
"FastPreprocessor.cpp", "FastPreprocessor.h",
"FindUsages.cpp", "FindUsages.h",
"Icons.cpp", "Icons.h",
"LookupContext.cpp", "LookupContext.h",
"LookupItem.cpp", "LookupItem.h",
"Macro.cpp", "Macro.h",
"MatchingText.cpp", "MatchingText.h",
"NamePrettyPrinter.cpp", "NamePrettyPrinter.h",
"Overview.cpp", "Overview.h",
"OverviewModel.cpp", "OverviewModel.h",
"PPToken.cpp", "PPToken.h",
"PreprocessorClient.cpp", "PreprocessorClient.h",
"PreprocessorEnvironment.cpp", "PreprocessorEnvironment.h",
"ResolveExpression.cpp", "ResolveExpression.h",
"SimpleLexer.cpp", "SimpleLexer.h",
"SnapshotSymbolVisitor.cpp", "SnapshotSymbolVisitor.h",
"SymbolNameVisitor.cpp", "SymbolNameVisitor.h",
"TypeOfExpression.cpp", "TypeOfExpression.h",
"TypePrettyPrinter.cpp", "TypePrettyPrinter.h",
"cplusplus.qrc",
"findcdbbreakpoint.cpp", "findcdbbreakpoint.h",
"pp-cctype.h",
"pp-engine.cpp", "pp-engine.h",
"pp-scanner.cpp", "pp-scanner.h",
"pp.h",
]
}
Group {
name: "Images"
prefix: "images/"
files: [
"class.png",
"enum.png",
"enumerator.png",
"func.png",
"func_priv.png",
"func_prot.png",
"keyword.png",
"macro.png",
"namespace.png",
"signal.png",
"slot.png",
"slot_priv.png",
"slot_prot.png",
"var.png",
"var_priv.png",
"var_prot.png",
]
}
Export {
cpp.includePaths: [
......
......@@ -4,7 +4,7 @@ import "../QtcLibrary.qbs" as QtcLibrary
QtcLibrary {
name: "QmlEditorWidgets"
cpp.includePaths: base.concat("easingpane")
cpp.includePaths: base.concat(easingPane.prefix)
cpp.defines: base.concat([
"QWEAKPOINTER_ENABLE_ARROW",
"BUILD_QMLEDITORWIDGETS_LIB"
......@@ -15,43 +15,36 @@ QtcLibrary {
Depends { name: "QmlJS" }
Depends { name: "Utils" }
files: [
"colorbox.cpp",
"colorbox.h",
"colorbutton.cpp",
"colorbutton.h",
"colorwidgets.cpp",
"colorwidgets.h",
"contextpanetext.ui",
"contextpanetextwidget.cpp",
"contextpanetextwidget.h",
"contextpanewidget.cpp",
"contextpanewidget.h",
"contextpanewidgetborderimage.ui",
"contextpanewidgetimage.cpp",
"contextpanewidgetimage.h",
"contextpanewidgetimage.ui",
"contextpanewidgetrectangle.cpp",
"contextpanewidgetrectangle.h",
"contextpanewidgetrectangle.ui",
"customcolordialog.cpp",
"customcolordialog.h",
"filewidget.cpp",
"filewidget.h",
"fontsizespinbox.cpp",
"fontsizespinbox.h",
"gradientline.cpp",
"gradientline.h",
"huecontrol.cpp",
"huecontrol.h",
"qmleditorwidgets_global.h",
"resources.qrc",
"easingpane/easingcontextpane.cpp",
"easingpane/easingcontextpane.h",
"easingpane/easingcontextpane.ui",
"easingpane/easinggraph.cpp",
"easingpane/easinggraph.h",
"easingpane/easingpane.qrc",
]
}
Group {
name: "General"
files: [
"colorbox.cpp", "colorbox.h",
"colorbutton.cpp", "colorbutton.h",
"colorwidgets.cpp", "colorwidgets.h",
"contextpanetext.ui",
"contextpanetextwidget.cpp", "contextpanetextwidget.h",
"contextpanewidget.cpp", "contextpanewidget.h",
"contextpanewidgetborderimage.ui",
"contextpanewidgetimage.cpp", "contextpanewidgetimage.h", "contextpanewidgetimage.ui",
"contextpanewidgetrectangle.cpp", "contextpanewidgetrectangle.h", "contextpanewidgetrectangle.ui",
"customcolordialog.cpp", "customcolordialog.h",
"filewidget.cpp", "filewidget.h",
"fontsizespinbox.cpp", "fontsizespinbox.h",
"gradientline.cpp", "gradientline.h",
"huecontrol.cpp", "huecontrol.h",
"qmleditorwidgets_global.h",
"resources.qrc"
]
}
Group {
name: "Easing Pane"
id: easingPane
prefix: "easingpane/"
files: [
"easingcontextpane.cpp", "easingcontextpane.h", "easingcontextpane.ui",
"easinggraph.cpp", "easinggraph.h",
"easingpane.qrc",
]
}
}
......@@ -14,103 +14,79 @@ QtcLibrary {
Depends { name: "LanguageUtils" }
Depends { name: "Qt"; submodules: ["widgets", "script", "xml"] }
files: [
"jsoncheck.cpp",
"jsoncheck.h",
"qmljs.qrc",
"qmljs_global.h",
"qmljsbind.cpp",
"qmljsbind.h",
"qmljsbundle.cpp",
"qmljsbundle.h",
"qmljscheck.cpp",
"qmljscheck.h",
"qmljscodeformatter.cpp",
"qmljscodeformatter.h",
"qmljscompletioncontextfinder.cpp",
"qmljscompletioncontextfinder.h",
"qmljscontext.cpp",
"qmljscontext.h",
"qmljsdelta.cpp",
"qmljsdelta.h",
"qmljsdocument.cpp",
"qmljsdocument.h",
"qmljsevaluate.cpp",
"qmljsevaluate.h",
"qmljsicons.cpp",
"qmljsicons.h",
"qmljsicontextpane.h",
"qmljsindenter.cpp",
"qmljsindenter.h",
"qmljsinterpreter.cpp",
"qmljsinterpreter.h",
"qmljslineinfo.cpp",
"qmljslineinfo.h",
"qmljslink.cpp",
"qmljslink.h",
"qmljsmodelmanagerinterface.cpp",
"qmljsmodelmanagerinterface.h",
"qmljspropertyreader.cpp",
"qmljspropertyreader.h",
"qmljsqrcparser.cpp",
"qmljsqrcparser.h",
"qmljsreformatter.cpp",
"qmljsreformatter.h",
"qmljsrewriter.cpp",
"qmljsrewriter.h",
"qmljsscanner.cpp",
"qmljsscanner.h",
"qmljsscopeastpath.cpp",
"qmljsscopeastpath.h",
"qmljsscopebuilder.cpp",
"qmljsscopebuilder.h",
"qmljsscopechain.cpp",
"qmljsscopechain.h",
"qmljssimplereader.cpp",
"qmljssimplereader.h",
"qmljsstaticanalysismessage.cpp",
"qmljsstaticanalysismessage.h",
"qmljstypedescriptionreader.cpp",
"qmljstypedescriptionreader.h",
"qmljsutils.cpp",
"qmljsutils.h",
"qmljsvalueowner.cpp",
"qmljsvalueowner.h",
"images/element.png",
"images/func.png",
"images/property.png",
"images/publicmember.png",
"parser/qmldirparser.cpp",
"parser/qmldirparser_p.h",
"parser/qmlerror.cpp",
"parser/qmlerror.h",
"parser/qmljsast.cpp",
"parser/qmljsast_p.h",
"parser/qmljsastfwd_p.h",
"parser/qmljsastvisitor.cpp",
"parser/qmljsastvisitor_p.h",
"parser/qmljsengine_p.cpp",
"parser/qmljsengine_p.h",
"parser/qmljsglobal_p.h",
"parser/qmljsgrammar.cpp",
"parser/qmljsgrammar_p.h",
"parser/qmljskeywords_p.h",
"parser/qmljslexer.cpp",
"parser/qmljslexer_p.h",
"parser/qmljsmemorypool_p.h",
"parser/qmljsparser.cpp",
"parser/qmljsparser_p.h",
"persistenttrie.cpp",
"persistenttrie.h",
"consolemanagerinterface.cpp",
"consolemanagerinterface.h",
"consoleitem.cpp",
"consoleitem.h",
"iscriptevaluator.h"
]
Group {
name: "General"
files: [
"consoleitem.cpp", "consoleitem.h",
"consolemanagerinterface.cpp", "consolemanagerinterface.h",
"iscriptevaluator.h",
"jsoncheck.cpp", "jsoncheck.h",
"persistenttrie.cpp", "persistenttrie.h",
"qmljs.qrc",
"qmljs_global.h",
"qmljsbind.cpp", "qmljsbind.h",
"qmljsbundle.cpp", "qmljsbundle.h",
"qmljscheck.cpp", "qmljscheck.h",
"qmljscodeformatter.cpp", "qmljscodeformatter.h",
"qmljscompletioncontextfinder.cpp", "qmljscompletioncontextfinder.h",
"qmljscontext.cpp", "qmljscontext.h",
"qmljsdelta.cpp", "qmljsdelta.h",
"qmljsdocument.cpp", "qmljsdocument.h",
"qmljsevaluate.cpp", "qmljsevaluate.h",
"qmljsicons.cpp", "qmljsicons.h",
"qmljsicontextpane.h",
"qmljsindenter.cpp", "qmljsindenter.h",
"qmljsinterpreter.cpp", "qmljsinterpreter.h",
"qmljslineinfo.cpp", "qmljslineinfo.h",
"qmljslink.cpp", "qmljslink.h",
"qmljsmodelmanagerinterface.cpp", "qmljsmodelmanagerinterface.h",
"qmljspropertyreader.cpp", "qmljspropertyreader.h",
"qmljsqrcparser.cpp", "qmljsqrcparser.h",
"qmljsreformatter.cpp", "qmljsreformatter.h",
"qmljsrewriter.cpp", "qmljsrewriter.h",
"qmljsscanner.cpp", "qmljsscanner.h",
"qmljsscopeastpath.cpp", "qmljsscopeastpath.h",
"qmljsscopebuilder.cpp", "qmljsscopebuilder.h",
"qmljsscopechain.cpp", "qmljsscopechain.h",
"qmljssimplereader.cpp", "qmljssimplereader.h",
"qmljsstaticanalysismessage.cpp", "qmljsstaticanalysismessage.h",
"qmljstypedescriptionreader.cpp", "qmljstypedescriptionreader.h",
"qmljsutils.cpp", "qmljsutils.h",
"qmljsvalueowner.cpp", "qmljsvalueowner.h"
]
}
Group {
name: "Images"
prefix: "images/"
files: [
"element.png",
"func.png",
"property.png",
"publicmember.png",
]
}
Group {
name: "Parser"
prefix: "parser/"
files: [
"qmldirparser.cpp", "qmldirparser_p.h",
"qmlerror.cpp", "qmlerror.h",
"qmljsast.cpp", "qmljsast_p.h",
"qmljsastfwd_p.h",
"qmljsastvisitor.cpp", "qmljsastvisitor_p.h",
"qmljsengine_p.cpp", "qmljsengine_p.h",
"qmljsglobal_p.h",
"qmljsgrammar.cpp", "qmljsgrammar_p.h",
"qmljskeywords_p.h",
"qmljslexer.cpp", "qmljslexer_p.h",
"qmljsmemorypool_p.h",
"qmljsparser.cpp", "qmljsparser_p.h",
]
}
Export {
Depends { name: "LanguageUtils" }
}
}
......@@ -33,202 +33,133 @@ QtcPlugin {
cpp.frameworks: qbs.targetOS.contains("osx") ? ["AppKit"] : undefined
files: [
"basefilewizard.cpp",
"basefilewizard.h",
"core.qrc",
"core_global.h",
"coreconstants.h",
"coreplugin.cpp",
"coreplugin.h",
"designmode.cpp",
"designmode.h",
"documentmanager.cpp",
"documentmanager.h",
"editmode.cpp",
"editmode.h",
"editortoolbar.cpp",
"editortoolbar.h",
"externaltool.cpp",
"externaltool.h",
"externaltoolmanager.h",
"fancyactionbar.cpp",
"fancyactionbar.h",
"fancyactionbar.qrc",
"fancytabwidget.cpp",
"fancytabwidget.h",
"featureprovider.cpp",
"featureprovider.h",
"fileiconprovider.cpp",
"fileiconprovider.h",
"fileutils.cpp",
"fileutils.h",
"findplaceholder.cpp",
"findplaceholder.h",
"generalsettings.cpp",
"generalsettings.h",
"generalsettings.ui",
"generatedfile.cpp",
"generatedfile.h",
"helpmanager.cpp",
"helpmanager.h",
"icontext.cpp",
"icontext.h",
"icore.cpp",
"icore.h",
"icorelistener.h",
"id.cpp",
"id.h",
"idocument.cpp",
"idocument.h",
"idocumentfactory.h",
"ifilewizardextension.h",
"imode.cpp",
"imode.h",
"inavigationwidgetfactory.cpp",
"inavigationwidgetfactory.h",
"infobar.cpp",
"infobar.h",
"ioutputpane.h",
"iversioncontrol.cpp",
"iversioncontrol.h",
"mainwindow.cpp",
"mainwindow.h",
"manhattanstyle.cpp",
"manhattanstyle.h",
"messagemanager.cpp",
"messagemanager.h",
"messageoutputwindow.cpp",
"messageoutputwindow.h",
"mimedatabase.cpp",
"mimedatabase.h",
"mimetypemagicdialog.cpp",
"mimetypemagicdialog.h",
"mimetypemagicdialog.ui",
"mimetypesettings.cpp",
"mimetypesettings.h",
"mimetypesettingspage.ui",
"minisplitter.cpp",
"minisplitter.h",
"modemanager.cpp",
"modemanager.h",
"navigationsubwidget.cpp",
"navigationsubwidget.h",
"navigationwidget.cpp",
"navigationwidget.h",
"outputpane.cpp",
"outputpane.h",
"outputpanemanager.cpp",
"outputpanemanager.h",
"outputwindow.cpp",
"outputwindow.h",
"plugindialog.cpp",
"plugindialog.h",
"removefiledialog.cpp",
"removefiledialog.h",
"removefiledialog.ui",
"rightpane.cpp",
"rightpane.h",
"settingsdatabase.cpp",
"settingsdatabase.h",
"sidebar.cpp",
"sidebar.h",
"sidebarwidget.cpp",
"sidebarwidget.h",
"statusbarmanager.cpp",
"statusbarmanager.h",
"statusbarwidget.cpp",
"statusbarwidget.h",
"styleanimator.cpp",
"styleanimator.h",
"tabpositionindicator.cpp",
"tabpositionindicator.h",
"textdocument.cpp",
"textdocument.h",
"toolsettings.cpp",
"toolsettings.h",
"variablechooser.cpp",
"variablechooser.h",
"variablechooser.ui",
"variablemanager.cpp",
"variablemanager.h",
"vcsmanager.cpp",
"vcsmanager.h",
"versiondialog.cpp",
"versiondialog.h",
"actionmanager/actioncontainer.cpp",
"actionmanager/actioncontainer.h",
"actionmanager/actioncontainer_p.h",
"actionmanager/actionmanager.cpp",
"actionmanager/actionmanager.h",
"actionmanager/actionmanager_p.h",
"actionmanager/command.cpp",
"actionmanager/command.h",
"actionmanager/command_p.h",
"actionmanager/commandbutton.cpp",
"actionmanager/commandbutton.h",
"actionmanager/commandmappings.cpp",
"actionmanager/commandmappings.h",
"actionmanager/commandmappings.ui",
"actionmanager/commandsfile.cpp",
"actionmanager/commandsfile.h",
"dialogs/addtovcsdialog.cpp",
"dialogs/addtovcsdialog.h",
"dialogs/addtovcsdialog.ui",
"dialogs/externaltoolconfig.cpp",
"dialogs/externaltoolconfig.h",
"dialogs/externaltoolconfig.ui",
"dialogs/ioptionspage.cpp",
"dialogs/ioptionspage.h",
"dialogs/iwizard.cpp",
"dialogs/iwizard.h",
"dialogs/newdialog.cpp",
"dialogs/newdialog.h",
"dialogs/newdialog.ui",
"dialogs/openwithdialog.cpp",
"dialogs/openwithdialog.h",
"dialogs/openwithdialog.ui",
"dialogs/promptoverwritedialog.cpp",
"dialogs/promptoverwritedialog.h",
"dialogs/readonlyfilesdialog.cpp",
"dialogs/readonlyfilesdialog.h",
"dialogs/readonlyfilesdialog.ui",
"dialogs/saveitemsdialog.cpp",
"dialogs/saveitemsdialog.h",
"dialogs/saveitemsdialog.ui",
"dialogs/settingsdialog.cpp",
"dialogs/settingsdialog.h",
"dialogs/shortcutsettings.cpp",
"dialogs/shortcutsettings.h",
"editormanager/BinFiles.mimetypes.xml",
"editormanager/editormanager.cpp",
"editormanager/editormanager.h",
"editormanager/editorview.cpp",
"editormanager/editorview.h",
"editormanager/ieditor.cpp",
"editormanager/ieditor.h",
"editormanager/ieditorfactory.cpp",
"editormanager/ieditorfactory.h",
"editormanager/iexternaleditor.cpp",
"editormanager/iexternaleditor.h",
"editormanager/documentmodel.cpp",
"editormanager/documentmodel.h",
"editormanager/openeditorsview.cpp",
"editormanager/openeditorsview.h",
"editormanager/openeditorswindow.cpp",
"editormanager/openeditorswindow.h",
"editormanager/systemeditor.cpp",
"editormanager/systemeditor.h",
"progressmanager/futureprogress.cpp",
"progressmanager/futureprogress.h",
"progressmanager/progressbar.cpp",
"progressmanager/progressbar.h",
"progressmanager/progressmanager.cpp",
"progressmanager/progressmanager.h",
"progressmanager/progressmanager_p.h",
"progressmanager/progressview.cpp",
"progressmanager/progressview.h",
]
Group {
name: "General"
files: [
"basefilewizard.cpp", "basefilewizard.h",
"core.qrc",
"core_global.h",
"coreconstants.h",
"coreplugin.cpp", "coreplugin.h",
"designmode.cpp", "designmode.h",
"documentmanager.cpp", "documentmanager.h",
"editmode.cpp", "editmode.h",
"editortoolbar.cpp", "editortoolbar.h",
"externaltool.cpp", "externaltool.h",
"externaltoolmanager.h",
"fancyactionbar.cpp", "fancyactionbar.h", "fancyactionbar.qrc",
"fancytabwidget.cpp", "fancytabwidget.h",
"featureprovider.cpp", "featureprovider.h",
"fileiconprovider.cpp", "fileiconprovider.h",
"fileutils.cpp", "fileutils.h",
"findplaceholder.cpp", "findplaceholder.h",
"generalsettings.cpp", "generalsettings.h", "generalsettings.ui",
"generatedfile.cpp", "generatedfile.h",
"helpmanager.cpp", "helpmanager.h",
"icontext.cpp", "icontext.h",
"icore.cpp", "icore.h",
"icorelistener.h",
"id.cpp", "id.h",