aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/external-resources.qdoc15
-rw-r--r--doc/qbs.qdoc39
-rw-r--r--src/lib/corelib/language/evaluatorscriptclass.cpp4
-rw-r--r--src/lib/corelib/tools/tools.pri15
-rw-r--r--src/lib/qtprofilesetup/qtprofilesetup.cpp3
-rw-r--r--src/packages/archive/archive.qbs5
-rw-r--r--src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp8
-rw-r--r--tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs2
8 files changed, 76 insertions, 15 deletions
diff --git a/doc/external-resources.qdoc b/doc/external-resources.qdoc
index 0ce7a5542..4a98f9d8d 100644
--- a/doc/external-resources.qdoc
+++ b/doc/external-resources.qdoc
@@ -46,6 +46,21 @@
*/
/*!
+ \externalpage https://doc.qt.io/qt-5/licensing.html
+ \title Qt Licensing
+*/
+
+/*!
+ \externalpage https://www.gnu.org/licenses/gpl-2.0.html
+ \title GNU General Public License, version 2
+*/
+
+/*!
+ \externalpage http://www.linfo.org/bsdlicense.html
+ \title BSD
+*/
+
+/*!
\externalpage https://chocolatey.org/packages/qbs
\title Chocolatey
*/
diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc
index 1dbe87110..8cbc59f6b 100644
--- a/doc/qbs.qdoc
+++ b/doc/qbs.qdoc
@@ -85,7 +85,7 @@
\li \l{Appendix A: Building Qbs}
\li \l{Appendix B: Migrating from Other Build Systems}
- \li \l{Appendix C: Code Attributions}
+ \li \l{Appendix C: Licenses and Code Attributions}
\endlist
*/
@@ -1576,7 +1576,42 @@
\previouspage porting-to-qbs.html
\page attributions.html
- \title Appendix C: Code Attributions
+ \title Appendix C: Licenses and Code Attributions
+
+ \section1 Licenses
+
+ The \QBS library and tools are available under commercial licenses from
+ \l{Qt Licensing}{The Qt Company}. In addition, they are available under
+ \l{GNU Lesser General Public License, Version 3} (LGPL version 3) and
+ \l{GNU General Public License, version 2} (GPL version 2).
+
+ Shared functionality, which might be pulled in by user build scripts, is
+ available under commercial licenses,
+ \l{GNU Lesser General Public License, Version 2.1} (LGPL version 2.1) with
+ \l{The Qt Company LGPL Exception version 1.1}, and LGPL version 3.
+
+ Autotests are available under commercial licenses and
+ \l{GNU General Public License Version 3, Annotated with The Qt Company GPL Exception 1.0}.
+
+ Examples are available under commercial licenses and \l{BSD}.
+
+ \section2 GNU Lesser General Public License, Version 3
+
+ \quotefile ../LICENSE.LGPLv3
+
+ \section2 GNU General Public License Version 3, Annotated with The Qt Company GPL Exception 1.0
+
+ \quotefile ../LICENSE.GPL3-EXCEPT
+
+ \section2 GNU Lesser General Public License, Version 2.1
+
+ \quotefile ../LICENSE.LGPLv21
+
+ \section2 The Qt Company LGPL Exception version 1.1
+
+ \quotefile ../LGPL_EXCEPTION.txt
+
+ \section1 Third-Party Attibutions
\QBS contains third-party code, which we gratefully acknowledge:
\generatelist{groupsbymodule attributions-qbs}
diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp
index 3c276956f..b7c2576df 100644
--- a/src/lib/corelib/language/evaluatorscriptclass.cpp
+++ b/src/lib/corelib/language/evaluatorscriptclass.cpp
@@ -72,7 +72,7 @@ class SVConverter : ValueHandler
ScriptEngine * const engine;
QScriptContext * const scriptContext;
const QScriptValue * const object;
- const ValuePtr &valuePtr;
+ Value * const valuePtr;
const Item * const itemOfProperty;
const QScriptString * const propertyName;
const EvaluationData * const data;
@@ -88,7 +88,7 @@ public:
, engine(static_cast<ScriptEngine *>(esc->engine()))
, scriptContext(esc->engine()->currentContext())
, object(obj)
- , valuePtr(v)
+ , valuePtr(v.get())
, itemOfProperty(_itemOfProperty)
, propertyName(propertyName)
, data(data)
diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
index e40a4f897..e128e5c92 100644
--- a/src/lib/corelib/tools/tools.pri
+++ b/src/lib/corelib/tools/tools.pri
@@ -110,21 +110,20 @@ osx {
!qbs_no_dev_install {
tools_headers.files = \
$$PWD/architectures.h \
+ $$PWD/buildoptions.h \
$$PWD/cleanoptions.h \
$$PWD/codelocation.h \
$$PWD/commandechomode.h \
$$PWD/error.h \
- $$PWD/settings.h \
- $$PWD/settingsmodel.h \
+ $$PWD/generateoptions.h \
+ $$PWD/installoptions.h \
$$PWD/preferences.h \
- $$PWD/profile.h \
$$PWD/processresult.h \
+ $$PWD/profile.h \
+ $$PWD/projectgeneratormanager.h \
$$PWD/qbs_export.h \
- $$PWD/buildoptions.h \
- $$PWD/generateoptions.h \
- $$PWD/generatorpluginmanager.h \
- $$PWD/installoptions.h \
- $$PWD/qbspluginmanager.h \
+ $$PWD/settings.h \
+ $$PWD/settingsmodel.h \
$$PWD/setupprojectparameters.h \
$$PWD/toolchains.h \
$$PWD/version.h
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index e78b8a252..4ef952985 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -811,6 +811,9 @@ void doSetupQtProfile(const QString &profileName, Settings *settings,
QString qbsTargetPlatformFromQtMkspec(const QString &mkspec)
{
+ int idx = mkspec.lastIndexOf(QLatin1Char('/'));
+ if (idx != -1)
+ return qbsTargetPlatformFromQtMkspec(mkspec.mid(idx + 1));
if (mkspec.startsWith(QLatin1String("aix-")))
return QLatin1String("aix");
if (mkspec.startsWith(QLatin1String("android-")))
diff --git a/src/packages/archive/archive.qbs b/src/packages/archive/archive.qbs
index 007b6af92..39d762884 100644
--- a/src/packages/archive/archive.qbs
+++ b/src/packages/archive/archive.qbs
@@ -164,6 +164,11 @@ QbsProduct {
}
}
+ // QTBUG-65916
+ var fileName = FileInfo.fileName(inputFilePaths[i]);
+ if (fileName.endsWith(".qm") && !fileName.startsWith("qt_"))
+ ignore = true;
+
if (!ignore)
tf.writeLine(relativePath);
}
diff --git a/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp b/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp
index 63cee32bf..fbefccc08 100644
--- a/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp
+++ b/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp
@@ -44,8 +44,9 @@ static QString qbsCommandLine(const GeneratableProject &project,
const QString &qbsSettingsDir,
const Internal::VisualStudioVersionInfo &versionInfo)
{
- auto addEnvironmentVariableArgument = [&](Internal::CommandLine &cl, const QString &var) {
- cl.appendRawArgument(QStringLiteral("\"$(%1)\"").arg(var));
+ auto addEnvironmentVariableArgument = [](Internal::CommandLine &cl, const QString &var,
+ const QString &prefix = QString()) {
+ cl.appendRawArgument(QStringLiteral("\"%1$(%2)\"").arg(prefix, var));
};
auto realSubCommand = subCommand;
@@ -92,7 +93,8 @@ static QString qbsCommandLine(const GeneratableProject &project,
commandLine.appendArgument(QStringLiteral("--force-probe-execution"));
}
- addEnvironmentVariableArgument(commandLine, QStringLiteral("Configuration"));
+ addEnvironmentVariableArgument(commandLine, QStringLiteral("Configuration"),
+ QStringLiteral("config:"));
return commandLine.toCommandLine(Internal::HostOsInfo::HostOsWindows);
}
diff --git a/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs b/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs
index a3baf07a0..db9f3b2b4 100644
--- a/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs
+++ b/tests/auto/blackbox/testdata/properties-in-export-items/properties-in-export-items.qbs
@@ -17,12 +17,14 @@ Project {
consoleApplication: true
Depends { name: "dep" }
dep.theDefine: "P1"
+ cpp.minimumMacosVersion: "10.9"
files: ["main1.cpp"]
}
Application {
name: "p2"
consoleApplication: true
Depends { name: "dep" }
+ cpp.minimumMacosVersion: "10.9"
Group {
dep.theDefine: "P2"
files: ["main2.cpp"]
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 07:35:12 +0000