diff options
Diffstat (limited to 'src')
77 files changed, 76 insertions, 192 deletions
diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs deleted file mode 100644 index 03ab3374d3..0000000000 --- a/src/libs/QtcLibrary.qbs +++ /dev/null @@ -1,37 +0,0 @@ -import qbs.base 1.0 -import "../../qbs/functions.js" as QtcFunctions - -DynamicLibrary { - Depends { name: "cpp" } - Depends { - condition: project.testsEnabled - name: "Qt.test" - } - - targetName: QtcFunctions.qtLibraryName(qbs, name) - destinationDirectory: project.ide_library_path - - cpp.defines: project.generalDefines - cpp.linkerFlags: { - if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw"))) - return ["-Wl,-s"] - else if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc")) - return ["/INCREMENTAL:NO"] // Speed up startup time when debugging with cdb - } - cpp.installNamePrefix: "@rpath/PlugIns/" - cpp.rpaths: qbs.targetOS.contains("osx") - ? ["@loader_path/..", "@executable_path/.."] - : ["$ORIGIN", "$ORIGIN/.."] - cpp.includePaths: [path] - - Export { - Depends { name: "cpp" } - cpp.includePaths: [path] - } - - Group { - fileTagsFilter: product.type - qbs.install: true - qbs.installDir: project.ide_library_path - } -} diff --git a/src/libs/aggregation/aggregation.qbs b/src/libs/aggregation/aggregation.qbs index 2c299fc432..6c0e6e8d6b 100644 --- a/src/libs/aggregation/aggregation.qbs +++ b/src/libs/aggregation/aggregation.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcLibrary.qbs" as QtcLibrary +import QtcLibrary QtcLibrary { name: "Aggregation" diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs index 9df7f89707..2331804a55 100644 --- a/src/libs/cplusplus/cplusplus.qbs +++ b/src/libs/cplusplus/cplusplus.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcLibrary.qbs" as QtcLibrary +import QtcLibrary QtcLibrary { name: "CPlusPlus" diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs index 1762f978f2..9b654b0b03 100644 --- a/src/libs/extensionsystem/extensionsystem.qbs +++ b/src/libs/extensionsystem/extensionsystem.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcLibrary.qbs" as QtcLibrary +import QtcLibrary QtcLibrary { name: "ExtensionSystem" diff --git a/src/libs/glsl/glsl.qbs b/src/libs/glsl/glsl.qbs index 7c8c0304e1..4a9d6e4165 100644 --- a/src/libs/glsl/glsl.qbs +++ b/src/libs/glsl/glsl.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcLibrary.qbs" as QtcLibrary +import QtcLibrary QtcLibrary { name: "GLSL" diff --git a/src/libs/languageutils/languageutils.qbs b/src/libs/languageutils/languageutils.qbs index 3f4a53e93c..12326d2df8 100644 --- a/src/libs/languageutils/languageutils.qbs +++ b/src/libs/languageutils/languageutils.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcLibrary.qbs" as QtcLibrary +import QtcLibrary QtcLibrary { name: "LanguageUtils" diff --git a/src/libs/qmldebug/qmldebug.qbs b/src/libs/qmldebug/qmldebug.qbs index 601c0e4c5d..7181013a80 100644 --- a/src/libs/qmldebug/qmldebug.qbs +++ b/src/libs/qmldebug/qmldebug.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcLibrary.qbs" as QtcLibrary +import QtcLibrary QtcLibrary { name: "QmlDebug" diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs index 7bcb914945..9c60cfb182 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs +++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcLibrary.qbs" as QtcLibrary +import QtcLibrary QtcLibrary { name: "QmlEditorWidgets" diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs index 8df00b7ed4..ae5334c4bb 100644 --- a/src/libs/qmljs/qmljs.qbs +++ b/src/libs/qmljs/qmljs.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcLibrary.qbs" as QtcLibrary +import QtcLibrary QtcLibrary { name: "QmlJS" diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs index 2b1949927e..c8a0c5ef91 100644 --- a/src/libs/ssh/ssh.qbs +++ b/src/libs/ssh/ssh.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcLibrary.qbs" as QtcLibrary +import QtcLibrary QtcLibrary { name: "QtcSsh" diff --git a/src/libs/utils/process_ctrlc_stub.qbs b/src/libs/utils/process_ctrlc_stub.qbs index 141b04e9f3..8f0a3f763c 100644 --- a/src/libs/utils/process_ctrlc_stub.qbs +++ b/src/libs/utils/process_ctrlc_stub.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../../tools/QtcTool.qbs" as QtcTool +import QtcTool QtcTool { name: "qtcreator_ctrlc_stub" diff --git a/src/libs/utils/process_stub.qbs b/src/libs/utils/process_stub.qbs index f0da7336b2..6f1a06310c 100644 --- a/src/libs/utils/process_stub.qbs +++ b/src/libs/utils/process_stub.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../../tools/QtcTool.qbs" as QtcTool +import QtcTool QtcTool { name: "qtcreator_process_stub" diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index f3b058936f..c40db11a3e 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcLibrary.qbs" as QtcLibrary +import QtcLibrary QtcLibrary { name: "Utils" diff --git a/src/libs/zeroconf/zeroconf.qbs b/src/libs/zeroconf/zeroconf.qbs index 02cc7f8562..d16f576b1b 100644 --- a/src/libs/zeroconf/zeroconf.qbs +++ b/src/libs/zeroconf/zeroconf.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcLibrary.qbs" as QtcLibrary +import QtcLibrary QtcLibrary { name: "zeroconf" diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs deleted file mode 100644 index fd78073cde..0000000000 --- a/src/plugins/QtcPlugin.qbs +++ /dev/null @@ -1,60 +0,0 @@ -import qbs.base 1.0 -import qbs.FileInfo -import "../../qbs/functions.js" as QtcFunctions - -Product { - type: ["dynamiclibrary", "pluginSpec"] - property string provider: 'QtProject' - property var pluginspecreplacements - property var pluginRecommends: [] - - Depends { name: "Qt.core" } - property string minimumQtVersion: "4.8" - condition: QtcFunctions.versionIsAtLeast(Qt.core.version, minimumQtVersion) - - targetName: QtcFunctions.qtLibraryName(qbs, name) - destinationDirectory: project.ide_plugin_path + '/' + provider - - Depends { name: "ExtensionSystem" } - Depends { name: "pluginspec" } - Depends { name: "cpp" } - Depends { - condition: project.testsEnabled - name: "Qt.test" - } - - cpp.defines: project.generalDefines.concat([name.toUpperCase() + "_LIBRARY"]) - cpp.installNamePrefix: "@rpath/PlugIns/" + provider + "/" - cpp.rpaths: qbs.targetOS.contains("osx") ? ["@loader_path/../..", "@executable_path/.."] - : ["$ORIGIN", "$ORIGIN/..", "$ORIGIN/../.."] - cpp.linkerFlags: { - if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw"))) - return ["-Wl,-s"] - else if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc")) - return ["/INCREMENTAL:NO"] // Speed up startup time when debugging with cdb - } - cpp.includePaths: [path] - - Group { - name: "PluginSpec" - files: [ product.name + ".pluginspec.in" ] - fileTags: ["pluginSpecIn"] - } - - Group { - name: "MimeTypes" - files: [ "*.mimetypes.xml" ] - } - - Group { - fileTagsFilter: product.type - qbs.install: true - qbs.installDir: project.ide_plugin_path + "/" + provider - } - - Export { - Depends { name: "ExtensionSystem" } - Depends { name: "cpp" } - cpp.includePaths: [path] - } -} diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs index 47216b5aa4..53f872c148 100644 --- a/src/plugins/analyzerbase/analyzerbase.qbs +++ b/src/plugins/analyzerbase/analyzerbase.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "AnalyzerBase" diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs index 4f53910718..5a6a3e5980 100644 --- a/src/plugins/android/android.qbs +++ b/src/plugins/android/android.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Android" diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs index 4bfba21bbf..5b699a03e7 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "AutotoolsProjectManager" diff --git a/src/plugins/baremetal/baremetal.qbs b/src/plugins/baremetal/baremetal.qbs index d72987025c..7f8287e2e5 100644 --- a/src/plugins/baremetal/baremetal.qbs +++ b/src/plugins/baremetal/baremetal.qbs @@ -1,6 +1,6 @@ import qbs -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "BareMetal" diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs index c885f49be1..8a5791e6be 100644 --- a/src/plugins/bazaar/bazaar.qbs +++ b/src/plugins/bazaar/bazaar.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Bazaar" diff --git a/src/plugins/bineditor/bineditor.qbs b/src/plugins/bineditor/bineditor.qbs index f9384838e3..f18676ea80 100644 --- a/src/plugins/bineditor/bineditor.qbs +++ b/src/plugins/bineditor/bineditor.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "BinEditor" diff --git a/src/plugins/bookmarks/bookmarks.qbs b/src/plugins/bookmarks/bookmarks.qbs index 4601f5a50d..4264356767 100644 --- a/src/plugins/bookmarks/bookmarks.qbs +++ b/src/plugins/bookmarks/bookmarks.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Bookmarks" diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs index be6ab5b42f..a3699245d0 100644 --- a/src/plugins/classview/classview.qbs +++ b/src/plugins/classview/classview.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "ClassView" diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs index dcd94ac24c..72edcc26b8 100644 --- a/src/plugins/clearcase/clearcase.qbs +++ b/src/plugins/clearcase/clearcase.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "ClearCase" diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs index 1734c6cc94..42eafccae7 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "CMakeProjectManager" diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index 89efd1e248..b7b6c93b38 100644 --- a/src/plugins/coreplugin/coreplugin.qbs +++ b/src/plugins/coreplugin/coreplugin.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Core" diff --git a/src/plugins/cpaster/cpaster.qbs b/src/plugins/cpaster/cpaster.qbs index 01815bb7c5..623d48fce3 100644 --- a/src/plugins/cpaster/cpaster.qbs +++ b/src/plugins/cpaster/cpaster.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "CodePaster" diff --git a/src/plugins/cpaster/frontend/frontend.qbs b/src/plugins/cpaster/frontend/frontend.qbs index 70be0e9f00..ba7d8a378b 100644 --- a/src/plugins/cpaster/frontend/frontend.qbs +++ b/src/plugins/cpaster/frontend/frontend.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../../../tools/QtcTool.qbs" as QtcTool +import QtcTool QtcTool { name: "cpaster" diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index 91d52d4d70..7ca766b74c 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/src/plugins/cppeditor/cppeditor.qbs @@ -1,7 +1,7 @@ import qbs.base 1.0 import qbs.FileInfo -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "CppEditor" diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs index 16584b457f..cd8e6f228a 100644 --- a/src/plugins/cpptools/cpptools.qbs +++ b/src/plugins/cpptools/cpptools.qbs @@ -1,7 +1,7 @@ import qbs.base 1.0 import qbs.FileInfo -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "CppTools" diff --git a/src/plugins/cvs/cvs.qbs b/src/plugins/cvs/cvs.qbs index d89725f59d..8d858a7b24 100644 --- a/src/plugins/cvs/cvs.qbs +++ b/src/plugins/cvs/cvs.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "CVS" diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 5666ea467f..9032e84660 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Debugger" diff --git a/src/plugins/debugger/ptracepreload.qbs b/src/plugins/debugger/ptracepreload.qbs index d92fd2a8bb..0f31a6c55d 100644 --- a/src/plugins/debugger/ptracepreload.qbs +++ b/src/plugins/debugger/ptracepreload.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../../libs/QtcLibrary.qbs" as QtcLibrary +import QtcLibrary QtcLibrary { name: "ptracepreload" diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs index 68b211c745..1c19d80a3a 100644 --- a/src/plugins/designer/designer.qbs +++ b/src/plugins/designer/designer.qbs @@ -1,7 +1,7 @@ import qbs.base 1.0 import qbs.FileInfo -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Designer" diff --git a/src/plugins/diffeditor/diffeditor.qbs b/src/plugins/diffeditor/diffeditor.qbs index f9e4733963..69ef2c01dc 100644 --- a/src/plugins/diffeditor/diffeditor.qbs +++ b/src/plugins/diffeditor/diffeditor.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "DiffEditor" diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs index fc9dfcbe7d..4864bc0b50 100644 --- a/src/plugins/fakevim/fakevim.qbs +++ b/src/plugins/fakevim/fakevim.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "FakeVim" diff --git a/src/plugins/find/find.qbs b/src/plugins/find/find.qbs index d9f653ae43..0b4a08986b 100644 --- a/src/plugins/find/find.qbs +++ b/src/plugins/find/find.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Find" diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qbs b/src/plugins/genericprojectmanager/genericprojectmanager.qbs index 8a47a547cb..70386b06ca 100644 --- a/src/plugins/genericprojectmanager/genericprojectmanager.qbs +++ b/src/plugins/genericprojectmanager/genericprojectmanager.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "GenericProjectManager" diff --git a/src/plugins/git/git.qbs b/src/plugins/git/git.qbs index 154a08b555..dd4e2e0205 100644 --- a/src/plugins/git/git.qbs +++ b/src/plugins/git/git.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Git" diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs index d99571f1b5..e9c9794464 100644 --- a/src/plugins/glsleditor/glsleditor.qbs +++ b/src/plugins/glsleditor/glsleditor.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "GLSLEditor" diff --git a/src/plugins/helloworld/helloworld.qbs b/src/plugins/helloworld/helloworld.qbs index e5546e282a..a2c677c8be 100644 --- a/src/plugins/helloworld/helloworld.qbs +++ b/src/plugins/helloworld/helloworld.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "HelloWorld" diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs index e408ac4765..b4c8b62f37 100644 --- a/src/plugins/help/help.qbs +++ b/src/plugins/help/help.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Help" diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs index 2f189e1563..2004340e93 100644 --- a/src/plugins/imageviewer/imageviewer.qbs +++ b/src/plugins/imageviewer/imageviewer.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "ImageViewer" diff --git a/src/plugins/ios/ios.qbs b/src/plugins/ios/ios.qbs index 5c1ad996c2..4a2019a386 100644 --- a/src/plugins/ios/ios.qbs +++ b/src/plugins/ios/ios.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Ios" diff --git a/src/plugins/locator/locator.qbs b/src/plugins/locator/locator.qbs index b4ff3f5923..0e06a3b434 100644 --- a/src/plugins/locator/locator.qbs +++ b/src/plugins/locator/locator.qbs @@ -1,7 +1,7 @@ import qbs.base 1.0 import qbs.FileInfo -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Locator" diff --git a/src/plugins/macros/macros.qbs b/src/plugins/macros/macros.qbs index 6dcc377abe..b9e90960a0 100644 --- a/src/plugins/macros/macros.qbs +++ b/src/plugins/macros/macros.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Macros" diff --git a/src/plugins/madde/madde.qbs b/src/plugins/madde/madde.qbs index 8cbfefaa8d..1761381b42 100644 --- a/src/plugins/madde/madde.qbs +++ b/src/plugins/madde/madde.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Madde" diff --git a/src/plugins/mercurial/mercurial.qbs b/src/plugins/mercurial/mercurial.qbs index 734ba4b0b8..80611787e7 100644 --- a/src/plugins/mercurial/mercurial.qbs +++ b/src/plugins/mercurial/mercurial.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Mercurial" diff --git a/src/plugins/perforce/perforce.qbs b/src/plugins/perforce/perforce.qbs index ee31c90959..9bc46fcee5 100644 --- a/src/plugins/perforce/perforce.qbs +++ b/src/plugins/perforce/perforce.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Perforce" diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index a8311c4a16..c27b0980e8 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -1,7 +1,7 @@ import qbs.base 1.0 -import "../../../qbs/functions.js" as QtcFunctions -import "../QtcPlugin.qbs" as QtcPlugin +import QtcFunctions +import QtcPlugin QtcPlugin { name: "ProjectExplorer" diff --git a/src/plugins/pythoneditor/pythoneditor.qbs b/src/plugins/pythoneditor/pythoneditor.qbs index 3b0a4899a6..0881ff31fc 100644 --- a/src/plugins/pythoneditor/pythoneditor.qbs +++ b/src/plugins/pythoneditor/pythoneditor.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "PythonEditor" diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs index ad64844f78..adb8969087 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs @@ -1,7 +1,7 @@ import qbs.base 1.0 import qbs.FileInfo -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "QbsProjectManager" diff --git a/src/plugins/qmldesigner/qmldesigner.qbs b/src/plugins/qmldesigner/qmldesigner.qbs index f24e75bd3d..a8f794fc00 100644 --- a/src/plugins/qmldesigner/qmldesigner.qbs +++ b/src/plugins/qmldesigner/qmldesigner.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "QmlDesigner" diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs index 5f460b0ce1..7284d2a342 100644 --- a/src/plugins/qmljseditor/qmljseditor.qbs +++ b/src/plugins/qmljseditor/qmljseditor.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "QmlJSEditor" diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs index 3a2b06a33e..629cef4a15 100644 --- a/src/plugins/qmljstools/qmljstools.qbs +++ b/src/plugins/qmljstools/qmljstools.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "QmlJSTools" diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs index 2670654cf6..a9d7554019 100644 --- a/src/plugins/qmlprofiler/qmlprofiler.qbs +++ b/src/plugins/qmlprofiler/qmlprofiler.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "QmlProfiler" diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs index dbb26a55f5..94652ae91f 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "QmlProjectManager" diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs index 5fdba88884..1a9af37cef 100644 --- a/src/plugins/qnx/qnx.qbs +++ b/src/plugins/qnx/qnx.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Qnx" diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs index 4206b20bf6..16964a0362 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs +++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Qt4ProjectManager" diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs index d6142bdcfc..7c03c0052b 100644 --- a/src/plugins/qtsupport/qtsupport.qbs +++ b/src/plugins/qtsupport/qtsupport.qbs @@ -1,7 +1,7 @@ import qbs.base 1.0 -import "../../../qbs/functions.js" as QtcFunctions -import "../QtcPlugin.qbs" as QtcPlugin +import QtcFunctions +import QtcPlugin QtcPlugin { name: "QtSupport" diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs index 536e9bfcc8..87d3984733 100644 --- a/src/plugins/remotelinux/remotelinux.qbs +++ b/src/plugins/remotelinux/remotelinux.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "RemoteLinux" diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs index 479b4b6552..bac0883400 100644 --- a/src/plugins/resourceeditor/resourceeditor.qbs +++ b/src/plugins/resourceeditor/resourceeditor.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "ResourceEditor" diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs index ed5571e47c..d213ce0f77 100644 --- a/src/plugins/subversion/subversion.qbs +++ b/src/plugins/subversion/subversion.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Subversion" diff --git a/src/plugins/tasklist/tasklist.qbs b/src/plugins/tasklist/tasklist.qbs index f6b68ed869..8374262e75 100644 --- a/src/plugins/tasklist/tasklist.qbs +++ b/src/plugins/tasklist/tasklist.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "TaskList" diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs index cf5e4b68e6..5f0505c6eb 100644 --- a/src/plugins/texteditor/texteditor.qbs +++ b/src/plugins/texteditor/texteditor.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "TextEditor" diff --git a/src/plugins/todo/todo.qbs b/src/plugins/todo/todo.qbs index ee29a49462..d316c081c6 100644 --- a/src/plugins/todo/todo.qbs +++ b/src/plugins/todo/todo.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Todo" diff --git a/src/plugins/updateinfo/updateinfo.qbs b/src/plugins/updateinfo/updateinfo.qbs index a2e15ec828..ad9f0ede4b 100644 --- a/src/plugins/updateinfo/updateinfo.qbs +++ b/src/plugins/updateinfo/updateinfo.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "UpdateInfo" diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs index a0e758ab49..7011248e45 100644 --- a/src/plugins/valgrind/valgrind.qbs +++ b/src/plugins/valgrind/valgrind.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Valgrind" diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs index c901d3d9a1..ff0b5ce8e8 100644 --- a/src/plugins/vcsbase/vcsbase.qbs +++ b/src/plugins/vcsbase/vcsbase.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "VcsBase" diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs index 8cde310ec9..70fd6cc691 100644 --- a/src/plugins/welcome/welcome.qbs +++ b/src/plugins/welcome/welcome.qbs @@ -1,6 +1,6 @@ import qbs.base 1.0 -import "../QtcPlugin.qbs" as QtcPlugin +import QtcPlugin QtcPlugin { name: "Welcome" diff --git a/src/tools/3rdparty/iossim/iossim.qbs b/src/tools/3rdparty/iossim/iossim.qbs index 5d77d9f189..eab1a9969d 100644 --- a/src/tools/3rdparty/iossim/iossim.qbs +++ b/src/tools/3rdparty/iossim/iossim.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../../QtcTool.qbs" as QtcTool +import QtcTool QtcTool { diff --git a/src/tools/QtcTool.qbs b/src/tools/QtcTool.qbs deleted file mode 100644 index 5494d0dc5d..0000000000 --- a/src/tools/QtcTool.qbs +++ /dev/null @@ -1,19 +0,0 @@ -import qbs.base 1.0 - -Application { - type: "application" // no Mac app bundle - Depends { name: "cpp" } - cpp.defines: project.generalDefines - cpp.linkerFlags: { - if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw"))) - return ["-Wl,-s"] - } - - property string toolInstallDir: project.ide_libexec_path - - Group { - fileTagsFilter: product.type - qbs.install: true - qbs.installDir: toolInstallDir - } -} diff --git a/src/tools/iostool/iostool.qbs b/src/tools/iostool/iostool.qbs index d0ed9ff9d5..b893b61711 100644 --- a/src/tools/iostool/iostool.qbs +++ b/src/tools/iostool/iostool.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcTool.qbs" as QtcTool +import QtcTool QtcTool { name: "iostool" diff --git a/src/tools/qtcdebugger/qtcdebugger.qbs b/src/tools/qtcdebugger/qtcdebugger.qbs index 284ad71118..1895eb917f 100644 --- a/src/tools/qtcdebugger/qtcdebugger.qbs +++ b/src/tools/qtcdebugger/qtcdebugger.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcTool.qbs" as QtcTool +import QtcTool QtcTool { name: "qtcdebugger" diff --git a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs index 4b5a4910cc..2bd9b70d38 100644 --- a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs +++ b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcTool.qbs" as QtcTool +import QtcTool QtcTool { name: "qtcreator_crash_handler" diff --git a/src/tools/qtpromaker/qtpromaker.qbs b/src/tools/qtpromaker/qtpromaker.qbs index 7c441d8fec..b23fb9f0ae 100644 --- a/src/tools/qtpromaker/qtpromaker.qbs +++ b/src/tools/qtpromaker/qtpromaker.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcTool.qbs" as QtcTool +import QtcTool QtcTool { name: "qtpromaker" diff --git a/src/tools/sdktool/sdktool.qbs b/src/tools/sdktool/sdktool.qbs index a8ea1aae1f..019df95b87 100644 --- a/src/tools/sdktool/sdktool.qbs +++ b/src/tools/sdktool/sdktool.qbs @@ -1,5 +1,5 @@ import qbs.base 1.0 -import "../QtcTool.qbs" as QtcTool +import QtcTool QtcTool { name: "sdktool" |