feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qbs build: Do not build QmlDesigner & friends

Browse Source 
Too much maintenance effort for not enough gain.

Change-Id: Ica385bcc93da0dbc7af8e15c07fdd33580de29a7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2022-10-10 11:08:46 +02:00
parent ab9fd18af8
commit a0f356aed6
9 changed files with 8 additions and 1603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.qbs
View File

@@ -1,66 +0,0 @@
import qbs
QtcProduct {
name: "assetexporterplugin"
condition: QmlDesigner.present
type: ["dynamiclibrary"]
installDir: qtc.ide_plugin_path + '/' + installDirName
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QmlDesigner"; required: false }
Depends { name: "Utils" }
Depends {
name: "Qt"
submodules: [
"quick-private"
]
}
cpp.includePaths: base.concat([
"./",
"../designercore/include",
"../../../../share/qtcreator/qml/qmlpuppet/interfaces",
"../../../../share/qtcreator/qml/qmlpuppet/types"
])
Properties {
condition: qbs.targetOS.contains("unix")
cpp.internalVersion: ""
}
Group {
name: "plugin metadata"
files: ["assetexporterplugin.json"]
fileTags: ["qt_plugin_metadata"]
}
files: [
"assetexportdialog.cpp",
"assetexportdialog.h",
"assetexportdialog.ui",
"assetexporter.cpp",
"assetexporter.h",
"assetexporterplugin.cpp",
"assetexporterplugin.h",
"assetexporterplugin.qrc",
"assetexporterview.cpp",
"assetexporterview.h",
"assetexportpluginconstants.h",
"componentexporter.cpp",
"componentexporter.h",
"exportnotification.cpp",
"exportnotification.h",
"filepathmodel.cpp",
"filepathmodel.h",
"dumpers/assetnodedumper.cpp",
"dumpers/assetnodedumper.h",
"dumpers/itemnodedumper.cpp",
"dumpers/itemnodedumper.h",
"dumpers/nodedumper.cpp",
"dumpers/nodedumper.h",
"dumpers/textnodedumper.cpp",
"dumpers/textnodedumper.h"
]
}

70
src/plugins/qmldesigner/componentsplugin/componentsplugin.qbs
View File

@@ -1,70 +0,0 @@
import qbs
QtcProduct {
name: "componentsplugin"
condition: QmlDesigner.present
type: ["dynamiclibrary"]
installDir: qtc.ide_plugin_path + '/' + installDirName
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
Depends { name: "Core" }
Depends { name: "QmlDesigner"; required: false }
Depends { name: "Utils" }
Depends { name: "Qt.qml" }
cpp.defines: base.concat("COMPONENTS_LIBRARY")
cpp.includePaths: base.concat([
"..",
"../components/componentcore",
"../components/debugview",
"../components/edit3d",
"../components/formeditor",
"../components/integration",
"../components/itemlibrary",
"../components/navigator",
"../components/propertyeditor",
"../components/stateseditor",
"../components/stateseditornew",
"../designercore",
"../designercore/include",
"../../../../share/qtcreator/qml/qmlpuppet/interfaces",
"../../../../share/qtcreator/qml/qmlpuppet/types",
])
Properties {
condition: qbs.targetOS.contains("unix")
cpp.internalVersion: ""
}
Group {
name: "controls"
files: ["Controls/*.qml"]
}
Group {
name: "images"
files: ["images/*.png"]
}
Group {
name: "plugin metadata"
files: ["componentsplugin.json"]
fileTags: ["qt_plugin_metadata"]
}
files: [
"addtabdesigneraction.cpp",
"addtabdesigneraction.h",
"addtabtotabviewdialog.ui",
"addtabtotabviewdialog.cpp",
"addtabtotabviewdialog.h",
"components.metainfo",
"componentsplugin.cpp",
"componentsplugin.h",
"componentsplugin.qrc",
"entertabdesigneraction.cpp",
"entertabdesigneraction.h",
"tabviewindexmodel.cpp",
"tabviewindexmodel.h",
"../designercore/include/iwidgetplugin.h",
]
}

12
src/plugins/qmldesigner/qmldesigner.qbs
View File

@@ -1,12 +1,6 @@
import qbs
Project {
name: "QML designer projects"
references: [
"qmldesignerplugin.qbs",
"qtquickplugin/qtquickplugin.qbs",
"componentsplugin/componentsplugin.qbs",
"qmlpreviewplugin/qmlpreviewplugin.qbs",
"assetexporterplugin/assetexporterplugin.qbs"
]
Product {
name: "QmlDesigner"
files: ["*", "**/*"]
}

1167
src/plugins/qmldesigner/qmldesignerplugin.qbs
View File

File diff suppressed because it is too large Load Diff

41
src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.qbs
View File

@@ -1,41 +0,0 @@
import qbs
QtcProduct {
name: "qmlpreviewplugin"
condition: QmlDesigner.present
type: ["dynamiclibrary"]
installDir: qtc.ide_plugin_path + '/' + installDirName
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
cpp.defines: base.concat("QMLPREVIEW_LIBRARY")
cpp.includePaths: base.concat("../designercore/include")
Properties {
condition: qbs.targetOS.contains("unix")
cpp.internalVersion: ""
}
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QmlDesigner"; required: false }
Depends { name: "Qt.qml" }
Depends { name: "Utils" }
Group {
name: "images"
files: ["images/*.png"]
}
Group {
name: "plugin metadata"
files: ["qmlpreviewplugin.json"]
fileTags: ["qt_plugin_metadata"]
}
files: [
"qmlpreviewactions.cpp",
"qmlpreviewactions.h",
"qmlpreviewplugin.cpp",
"qmlpreviewplugin.h",
"qmlpreviewplugin.qrc",
]
}

41
src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qbs
View File

@@ -1,41 +0,0 @@
import qbs
QtcProduct {
name: "qtquickplugin"
type: ["dynamiclibrary"]
installDir: qtc.ide_plugin_path + '/' + installDirName
property string installDirName: qbs.targetOS.contains("macos") ? "QmlDesigner" : "qmldesigner"
Depends { name: "Qt.qml" }
cpp.defines: base.concat("QTQUICK_LIBRARY")
cpp.includePaths: base.concat("../designercore/include")
Properties {
condition: qbs.targetOS.contains("unix")
cpp.internalVersion: ""
}
Group {
name: "sources"
files: ["sources/*.qml"]
}
Group {
name: "images"
files: ["images/*.png"]
}
Group {
name: "plugin metadata"
files: ["qtquickplugin.json"]
fileTags: ["qt_plugin_metadata"]
}
files: [
"quick.metainfo",
"qtquickplugin.cpp",
"qtquickplugin.h",
"qtquickplugin.qrc",
"../designercore/include/iwidgetplugin.h",
]
}

56
src/plugins/studiowelcome/studiowelcome.qbs
View File

@@ -1,58 +1,6 @@
import qbs.FileInfo
QtcPlugin {
Product {
name: "StudioWelcome"
condition: QmlDesigner.present
Depends { name: "Qt"; submodules: ["qml", "qml-private", "quick", "quickwidgets"] }
Depends { name: "Utils" }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QtSupport" }
Depends { name: "QmlDesigner"; required: false }
Depends { name: "QmlProjectManager" }
Depends { name: "app_version_header" }
cpp.defines: 'STUDIO_QML_PATH="' + FileInfo.joinPaths(sourceDirectory, "qml") + '"'
files: [
"createproject.cpp",
"createproject.h",
"examplecheckout.h",
"examplecheckout.cpp",
"newprojectdialogimageprovider.h",
"newprojectdialogimageprovider.cpp",
"presetmodel.cpp",
"presetmodel.h",
"qdsnewdialog.cpp",
"qdsnewdialog.h",
"screensizemodel.h",
"studiowelcome_global.h", "studiowelcometr.h",
"studiowelcomeplugin.h",
"studiowelcomeplugin.cpp",
"studiowelcome.qrc",
"stylemodel.cpp",
"stylemodel.h",
"wizardfactories.cpp",
"wizardfactories.h",
"wizardhandler.cpp",
"wizardhandler.h",
"userpresets.cpp",
"userpresets.h"
]
Group {
name: "studiofonts"
prefix: "../../share/3rdparty/studiofonts/"
files: "studiofonts.qrc"
}
Qt.core.resourceFileBaseName: "StudioWelcome_qml"
Qt.core.resourceSourceBase: "."
Group {
name: "Qml Files"
fileTags: "qt.core.resource_data"
files: "qml/**"
}
files: ["*", "**/*"]
}

9
tests/unit/unit.qbs
View File

@@ -1,7 +1,4 @@
Project {
name: "C++ unit tests"
condition: project.withAutotests
references: [
"unittest/unittest.qbs",
]
Product {
name: "QmlDesigner unit tests"
files: ["*", "**/*"]
}

149
tests/unit/unittest/unittest.qbs
View File

@@ -1,149 +0,0 @@
import qbs.File
import qbs.FileInfo
Project {
name: "Unit test & helper products"
QtcProduct {
name: "Unit test"
condition: (qtc_gtest_gmock.hasRepo || qtc_gtest_gmock.externalLibsPresent)
&& QmlDesigner.present
type: ["application", "autotest"]
consoleApplication: true
destinationDirectory: FileInfo.joinPaths(project.buildDirectory,
FileInfo.relativePath(project.ide_source_tree, sourceDirectory))
install: false
Depends { name: "QmlDesigner"; required: false }
Depends { name: "sqlite_sources" }
Depends { name: "Core" }
Depends { name: "CPlusPlus" }
Depends { name: "Qt"; submodules: ["network", "widgets", "testlib"] }
Depends { name: "pkgconfig"; required: false }
Depends { name: "benchmark"; required: false }
Depends { name: "qtc_gtest_gmock"; required: false }
sqlite_sources.buildSharedLib: true
cpp.defines: {
var defines = [
"QT_NO_CAST_TO_ASCII",
"QT_RESTRICTED_CAST_FROM_ASCII",
"QT_USE_FAST_OPERATOR_PLUS",
"QT_USE_FAST_CONCATENATION",
"UNIT_TESTS",
"DONT_CHECK_MESSAGE_COUNTER",
'QTC_RESOURCE_DIR="' + path + "/../../../share/qtcreator" + '"',
'TESTDATA_DIR="' + FileInfo.joinPaths(sourceDirectory, "data") + '"',
'RELATIVE_DATA_PATH="' + FileInfo.relativePath(destinationDirectory,
FileInfo.joinPaths(project.sourceDirectory, "share", "qtcreator")) + '"',
];
var absLibExecPath = FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix,
qtc.ide_libexec_path);
var relLibExecPath = FileInfo.relativePath(destinationDirectory, absLibExecPath);
defines.push('TEST_RELATIVE_LIBEXEC_PATH="' + relLibExecPath + '"');
return defines;
}
cpp.cxxFlags: {
var flags = [];
if (qbs.toolchain.contains("msvc"))
flags.push("-w34100", "/bigobj", "/wd4267", "/wd4141", "/wd4146");
if (qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang"))
flags.push("-Wno-noexcept-type");
if (qbs.toolchain.contains("clang")) {
flags.push("-Wno-inconsistent-missing-override", "-Wno-self-move",
"-Wno-self-assign-overloaded");
flags.push("-Wno-unused-command-line-argument"); // gtest puts -lpthread on compiler command line
if (!qbs.hostOS.contains("darwin")
&& Utilities.versionCompare(cpp.compilerVersion, "10") >= 0) {
flags.push("-Wno-deprecated-copy", "-Wno-constant-logical-operand");
}
}
if (qbs.toolchain.contains("gcc"))
flags.push("-Wno-unused-parameter");
return flags;
}
cpp.cxxLanguageVersion: "c++17"
cpp.includePaths: [
".",
"../mockup",
"../../../src/libs",
"../../../src/libs/3rdparty",
"../../../src/plugins",
"../../../share/qtcreator/qml/qmlpuppet/types",
]
cpp.rpaths: [
FileInfo.joinPaths(project.buildDirectory, qtc.ide_library_path),
FileInfo.joinPaths(project.buildDirectory, qtc.ide_plugin_path)
]
files: [
"compare-operators.h",
"conditionally-disabled-tests.h",
"createtablesqlstatementbuilder-test.cpp",
"dynamicastmatcherdiagnosticcontainer-matcher.h",
"eventspy.cpp",
"eventspy.h",
"fakeprocess.cpp",
"fakeprocess.h",
"google-using-declarations.h",
"googletest.h",
"gtest-creator-printing.cpp",
"gtest-creator-printing.h",
"gtest-llvm-printing.h",
"gtest-qt-printing.cpp",
"gtest-qt-printing.h",
"matchingtext-test.cpp",
"mockfutureinterface.h",
"mockmutex.h",
"mockqfilesystemwatcher.h",
"mocksqlitestatement.h",
"mocksqlitetransactionbackend.h",
"mocksyntaxhighligher.h",
"mocktimer.cpp",
"mocktimer.h",
"processevents-utilities.cpp",
"processevents-utilities.h",
"sizedarray-test.cpp",
"smallstring-test.cpp",
"spydummy.cpp",
"spydummy.h",
"sqlitecolumn-test.cpp",
"sqlitedatabase-test.cpp",
"sqlitedatabasebackend-test.cpp",
"sqlitedatabasemock.h",
"sqliteindex-test.cpp",
"sqlitereadstatementmock.cpp",
"sqlitereadstatementmock.h",
"sqlitestatement-test.cpp",
"sqlitetable-test.cpp",
"sqliteteststatement.h",
"sqlitetransaction-test.cpp",
"sqlitevalue-test.cpp",
"sqlitewritestatementmock.cpp",
"sqlitewritestatementmock.h",
"sqlstatementbuilder-test.cpp",
"unittest-utility-functions.h",
"unittests-main.cpp",
]
Group {
name: "benchmark test"
condition: benchmark.present
files: "smallstring-benchmark.cpp"
}
Group {
name: "data"
files: [
"data/*",
]
fileTags: []
}
}
}