From b9834c0651a46ec43c891ec097252af260429304 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 19 Jan 2018 15:22:44 +0100 Subject: Doc: Fix Qt Help license information Change-Id: Idbaae38cc24e36f1309995bf7c4f47a41c08db5c Reviewed-by: Leena Miettinen --- src/assistant/help/doc/src/qthelp-index.qdoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/assistant/help/doc/src/qthelp-index.qdoc b/src/assistant/help/doc/src/qthelp-index.qdoc index 793d48bd7..abe20b81f 100644 --- a/src/assistant/help/doc/src/qthelp-index.qdoc +++ b/src/assistant/help/doc/src/qthelp-index.qdoc @@ -58,8 +58,9 @@ \section1 License Information - Qt Core is available under commercial licenses from \l{The Qt Company}. - In addition, it is available under the + Qt Help is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under free software licenses. Since Qt 5.4, + these free software licenses are \l{GNU Lesser General Public License, version 3}, or the \l{GNU General Public License, version 2}. See \l{Qt Licensing} for further details. -- cgit v1.2.1 From b6713898a2eb277b7ed8cea0f3c3192124e0bb51 Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Thu, 18 Jan 2018 08:09:51 +0100 Subject: macdeployqt: Implement selection of file system for .dmg file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With macOS High Sierra, Apple machines using SSD see their file system changed for APFS automatically. hdiutil by default uses the current file system to build the dmg file which in this case makes them unusable on older version of macOS that don't have support for APFS. This patch adds an additional option to macdeployqt to select the file system to use when building the .dmg. It defaults to HFS+ which was the official file system used until now for all currently supported version of macOS. [ChangeLog][macdeployqt][feature] Added support for selecting the file system type to use when building a .dmg file. Defaults to HFS+ to support a wider range of macOS versions. Task-number: QTBUG-65844 Change-Id: Ic66856344f96c6536b224d13d309715b34eb0874 Reviewed-by: André Hartmann --- src/macdeployqt/macdeployqt/main.cpp | 11 ++++++++++- src/macdeployqt/shared/shared.cpp | 8 +++++++- src/macdeployqt/shared/shared.h | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/macdeployqt/macdeployqt/main.cpp b/src/macdeployqt/macdeployqt/main.cpp index 5488a5f61..90a5412b2 100644 --- a/src/macdeployqt/macdeployqt/main.cpp +++ b/src/macdeployqt/macdeployqt/main.cpp @@ -53,6 +53,7 @@ int main(int argc, char **argv) qDebug() << " -codesign= : Run codesign with the given identity on all executables"; qDebug() << " -appstore-compliant: Skip deployment of components that use private API"; qDebug() << " -libpath= : Add the given path to the library search path"; + qDebug() << " -fs= : Set the filesystem used for the .dmg disk image (defaults to HFS+)"; qDebug() << ""; qDebug() << "macdeployqt takes an application bundle as input and makes it"; qDebug() << "self-contained by copying in the Qt frameworks and plugins that"; @@ -83,6 +84,7 @@ int main(int argc, char **argv) bool plugins = true; bool dmg = false; + QByteArray filesystem("HFS+"); bool useDebugLibs = false; extern bool runStripEnabled; extern bool alwaysOwerwriteEnabled; @@ -162,6 +164,13 @@ int main(int argc, char **argv) LogDebug() << "Argument found:" << argument; deployFramework = true; + } else if (argument.startsWith(QByteArray("-fs"))) { + LogDebug() << "Argument found:" << argument; + int index = argument.indexOf('='); + if (index == -1) + LogError() << "Missing filesystem type"; + else + filesystem = argument.mid(index+1); } else if (argument.startsWith("-")) { LogError() << "Unknown argument" << argument << "\n"; return 1; @@ -207,7 +216,7 @@ int main(int argc, char **argv) if (dmg) { LogNormal(); - createDiskImage(appBundlePath); + createDiskImage(appBundlePath, filesystem); } return 0; diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index 49dbe5426..90cfaf2ee 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1493,7 +1493,7 @@ void codesign(const QString &identity, const QString &appBundlePath) { codesignBundle(identity, appBundlePath, QList()); } -void createDiskImage(const QString &appBundlePath) +void createDiskImage(const QString &appBundlePath, const QString &filesystemType) { QString appBaseName = appBundlePath; appBaseName.chop(4); // remove ".app" from end @@ -1511,16 +1511,22 @@ void createDiskImage(const QString &appBundlePath) LogNormal() << "Creating disk image (.dmg) for" << appBundlePath; } + LogNormal() << "Image will use" << filesystemType; + // More dmg options can be found in the hdiutil man page. QStringList options = QStringList() << "create" << dmgName << "-srcfolder" << appBundlePath << "-format" << "UDZO" + << "-fs" << filesystemType << "-volname" << appBaseName; QProcess hdutil; hdutil.start("hdiutil", options); hdutil.waitForFinished(-1); + if (hdutil.exitCode() != 0) { + LogError() << "Bundle creation error:" << hdutil.readAllStandardError(); + } } void fixupFramework(const QString &frameworkName) diff --git a/src/macdeployqt/shared/shared.h b/src/macdeployqt/shared/shared.h index c173846c8..c4d60ea0a 100644 --- a/src/macdeployqt/shared/shared.h +++ b/src/macdeployqt/shared/shared.h @@ -129,7 +129,7 @@ QSet codesignBundle(const QString &identity, const QString &appBundlePath, QList additionalBinariesContainingRpaths); void codesign(const QString &identity, const QString &appBundlePath); -void createDiskImage(const QString &appBundlePath); +void createDiskImage(const QString &appBundlePath, const QString &filesystemType); void fixupFramework(const QString &appBundlePath); -- cgit v1.2.1 From 9712582eba4fc01dae4275fed5888cb34bb552f1 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 23 Jan 2018 12:03:44 +0100 Subject: qtattributionsscanner: Always write UTF-8 files Both JSON and qdoc output files should be generated in UTF-8. Change-Id: I7d60d9042bcc1e8d69e164691fcc4129d4e95fb6 Reviewed-by: Friedemann Kleint --- src/qtattributionsscanner/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qtattributionsscanner/main.cpp b/src/qtattributionsscanner/main.cpp index 908b24ca4..5addb8da3 100644 --- a/src/qtattributionsscanner/main.cpp +++ b/src/qtattributionsscanner/main.cpp @@ -124,10 +124,12 @@ int main(int argc, char *argv[]) QString generator = parser.value(generatorOption); if (generator == QLatin1String("qdoc")) { + out.setCodec("UTF-8"); // include top level module name in printed paths QString baseDirectory = QDir(directory).absoluteFilePath(QStringLiteral("..")); QDocGenerator::generate(out, packages, baseDirectory, logLevel); } else if (generator == QLatin1String("json")) { + out.setCodec("UTF-8"); JsonGenerator::generate(out, packages, logLevel); } else { std::cerr << qPrintable(tr("Unknown output-format %1.").arg(generator)) << std::endl; -- cgit v1.2.1 From f1233878fef715c0746dcb6af7164acfb46fd418 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 24 Jan 2018 12:08:02 +0100 Subject: qdoc: Handle Module, QmlModule nodes in Generator::typeString Fixes output of \since, \preliminary if associated with a module. Change-Id: I760963135283d4978225e2ad72f3c0c6df852e56 Reviewed-by: Martin Smith --- src/qdoc/generator.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index 88e2a1b36..db2552f3b 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -2269,6 +2269,10 @@ QString Generator::typeString(const Node *node) return "QML signal handler"; case Node::QmlMethod: return "QML method"; + case Node::Module: + return "module"; + case Node::QmlModule: + return "QML module"; default: return "documentation"; } -- cgit v1.2.1