summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/androiddeployqt/main.cpp1
-rw-r--r--src/assistant/assistant/doc/qtassistant.qdocconf2
-rw-r--r--src/assistant/assistant/mainwindow.cpp2
-rw-r--r--src/assistant/help/doc/qthelp.qdocconf2
-rw-r--r--src/designer/src/designer/versiondialog.cpp2
-rw-r--r--src/designer/src/lib/sdk/abstractformwindow.cpp3
-rw-r--r--src/linguist/linguist/doc/qtlinguist.qdocconf2
-rw-r--r--src/linguist/linguist/mainwindow.cpp2
-rw-r--r--src/linguist/lupdate/main.cpp2
-rw-r--r--src/linguist/shared/po.cpp2
-rw-r--r--src/macdeployqt/macdeployqt/main.cpp4
-rw-r--r--src/macdeployqt/shared/shared.cpp2
-rw-r--r--src/qdbus/qdbusviewer/mainwindow.cpp2
-rw-r--r--src/qtdiag/qtdiag.cpp9
-rw-r--r--tests/auto/linguist/lconvert/data/wrapping.po9
15 files changed, 31 insertions, 15 deletions
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index ae6e8d88d..9b26c0955 100644
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -2091,7 +2091,6 @@ bool copyQtFiles(Options *options)
relativePath.remove(0, 1);
if ((relativePath.startsWith("lib/") && relativePath.endsWith(".so"))
|| relativePath.startsWith("jar/")
- || relativePath.startsWith("plugins/")
|| relativePath.startsWith("imports/")
|| relativePath.startsWith("qml/")
|| relativePath.startsWith("plugins/")) {
diff --git a/src/assistant/assistant/doc/qtassistant.qdocconf b/src/assistant/assistant/doc/qtassistant.qdocconf
index a63e20bf0..320186225 100644
--- a/src/assistant/assistant/doc/qtassistant.qdocconf
+++ b/src/assistant/assistant/doc/qtassistant.qdocconf
@@ -34,6 +34,6 @@ imagedirs = images
outputdir = $QT_INSTALL_DOCS/qtassistant
-depends += qtdoc
+depends += qtdoc qmake
navigation.landingpage = "Qt Assistant Manual"
diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index 6590df83b..7ed4aec5a 100644
--- a/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@ -901,7 +901,7 @@ void MainWindow::showAboutDialog()
"<p>Version %2</p>"
"<p>Browser: %3</p></center>"
"<p>Copyright (C) %4 Digia Plc and/or its subsidiary(-ies).</p>")
- .arg(tr("Qt Assistant"), QLatin1String(QT_VERSION_STR), browser, QStringLiteral("2014")),
+ .arg(tr("Qt Assistant"), QLatin1String(QT_VERSION_STR), browser, QStringLiteral("2015")),
resources);
QLatin1String path(":/qt-project.org/assistant/images/assistant-128.png");
aboutDia.setPixmap(QString(path));
diff --git a/src/assistant/help/doc/qthelp.qdocconf b/src/assistant/help/doc/qthelp.qdocconf
index ddba40ba9..0b4223e93 100644
--- a/src/assistant/help/doc/qthelp.qdocconf
+++ b/src/assistant/help/doc/qthelp.qdocconf
@@ -25,7 +25,7 @@ qhp.QtHelp.subprojects.classes.sortPages = true
language = Cpp
-depends += qtdoc qtcore qtassistant qtwidgets
+depends += qtdoc qtcore qtassistant qtwidgets qmake
headerdirs += ..
diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp
index fd5329b11..e52b18cef 100644
--- a/src/designer/src/designer/versiondialog.cpp
+++ b/src/designer/src/designer/versiondialog.cpp
@@ -165,7 +165,7 @@ VersionDialog::VersionDialog(QWidget *parent)
lbl->setText(tr("%1"
"<br/>Copyright (C) %2 Digia Plc and/or its subsidiary(-ies)."
- ).arg(version, QStringLiteral("2014")));
+ ).arg(version, QStringLiteral("2015")));
lbl->setWordWrap(true);
lbl->setOpenExternalLinks(true);
diff --git a/src/designer/src/lib/sdk/abstractformwindow.cpp b/src/designer/src/lib/sdk/abstractformwindow.cpp
index a6869afbf..fa9140394 100644
--- a/src/designer/src/lib/sdk/abstractformwindow.cpp
+++ b/src/designer/src/lib/sdk/abstractformwindow.cpp
@@ -558,7 +558,6 @@ void QDesignerFormWindowInterface::activateResourceFilePaths(const QStringList &
Returns the form the widget containing the main container widget.
\since 5.0
- \sa mainContainer()
*/
/*!
@@ -567,7 +566,7 @@ void QDesignerFormWindowInterface::activateResourceFilePaths(const QStringList &
Sets the main container widget on the form to the specified \a
mainContainer.
- \sa mainContainer(), mainContainerChanged()
+ \sa mainContainerChanged()
*/
/*!
diff --git a/src/linguist/linguist/doc/qtlinguist.qdocconf b/src/linguist/linguist/doc/qtlinguist.qdocconf
index d1c9f497f..121404ba7 100644
--- a/src/linguist/linguist/doc/qtlinguist.qdocconf
+++ b/src/linguist/linguist/doc/qtlinguist.qdocconf
@@ -34,6 +34,6 @@ imagedirs = images
outputdir = $QT_INSTALL_DOCS/qtlinguist
-depends += qtdoc qtqml qtquick qtcore qtgui
+depends += qtdoc qtqml qtquick qtcore qtgui qmake
navigation.landingpage = "Qt Linguist Manual"
diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp
index 4da94cf39..3c2450ab4 100644
--- a/src/linguist/linguist/mainwindow.cpp
+++ b/src/linguist/linguist/mainwindow.cpp
@@ -1338,7 +1338,7 @@ void MainWindow::about()
"<p>Qt Linguist is a tool for adding translations to Qt "
"applications.</p>"
"<p>Copyright (C) %2 Digia Plc and/or its subsidiary(-ies)."
- ).arg(version, QStringLiteral("2014")));
+ ).arg(version, QStringLiteral("2015")));
box.setWindowTitle(QApplication::translate("AboutDialog", "Qt Linguist"));
box.setIcon(QMessageBox::NoIcon);
diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp
index 0985666be..8d46ae00f 100644
--- a/src/linguist/lupdate/main.cpp
+++ b/src/linguist/lupdate/main.cpp
@@ -179,7 +179,7 @@ static void printUsage()
"Options:\n"
" -help Display this information and exit.\n"
" -no-obsolete\n"
- " Drop all obsolete strings.\n"
+ " Drop all obsolete and vanished strings.\n"
" -extensions <ext>[,<ext>]...\n"
" Process files with the given extensions only.\n"
" The extension list must be separated with commas, not with whitespace.\n"
diff --git a/src/linguist/shared/po.cpp b/src/linguist/shared/po.cpp
index cc9c35980..a24fdcc66 100644
--- a/src/linguist/shared/po.cpp
+++ b/src/linguist/shared/po.cpp
@@ -162,7 +162,7 @@ static QString poEscapedLines(const QString &prefix, bool addSpace, const QStrin
static QString poWrappedEscapedLines(const QString &prefix, bool addSpace, const QString &line)
{
- const int maxlen = MAX_LEN - prefix.length();
+ const int maxlen = MAX_LEN - prefix.length() - addSpace;
QStringList lines;
int off = 0;
while (off + maxlen < line.length()) {
diff --git a/src/macdeployqt/macdeployqt/main.cpp b/src/macdeployqt/macdeployqt/main.cpp
index 019fa835e..713724279 100644
--- a/src/macdeployqt/macdeployqt/main.cpp
+++ b/src/macdeployqt/macdeployqt/main.cpp
@@ -50,8 +50,8 @@ int main(int argc, char **argv)
qDebug() << " -use-debug-libs : Deploy with debug versions of frameworks and plugins (implies -no-strip)";
qDebug() << " -executable=<path> : Let the given executable use the deployed frameworks too";
qDebug() << " -qmldir=<path> : Deploy imports used by .qml files in the given path";
- qDebug() << " -always-overwrite : Copy files enven if the target file exists";
- qDebug() << " -codesign=<ident> : Run codesing with the given identity on all executables";
+ qDebug() << " -always-overwrite : Copy files even if the target file exists";
+ qDebug() << " -codesign=<ident> : Run codesign with the given identity on all executables";
qDebug() << "";
qDebug() << "macdeployqt takes an application bundle as input and makes it";
qDebug() << "self-contained by copying in the Qt frameworks and plugins that";
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp
index 17b158ad0..f372dfeff 100644
--- a/src/macdeployqt/shared/shared.cpp
+++ b/src/macdeployqt/shared/shared.cpp
@@ -464,7 +464,7 @@ void recursiveCopyAndDeploy(const QString &appBundlePath, const QString &sourceP
// The (relative) link; with a correct number of "../"'s.
QString linkPath = QStringLiteral("PlugIns/quick/") + file;
- int cdupCount = linkDestinationPath.count(QStringLiteral("/"));
+ int cdupCount = linkDestinationPath.count(QStringLiteral("/")) - appBundlePath.count(QStringLiteral("/"));
for (int i = 0; i < cdupCount - 2; ++i)
linkPath.prepend("../");
diff --git a/src/qdbus/qdbusviewer/mainwindow.cpp b/src/qdbus/qdbusviewer/mainwindow.cpp
index 456c1448d..e3d0aa193 100644
--- a/src/qdbus/qdbusviewer/mainwindow.cpp
+++ b/src/qdbus/qdbusviewer/mainwindow.cpp
@@ -95,7 +95,7 @@ void MainWindow::about()
"<h3>%1</h3>"
"<p>Version %2</p></center>"
"<p>Copyright (C) %3 Digia Plc and/or its subsidiary(-ies).</p>")
- .arg(tr("D-Bus Viewer"), QLatin1String(QT_VERSION_STR), QStringLiteral("2014")));
+ .arg(tr("D-Bus Viewer"), QLatin1String(QT_VERSION_STR), QStringLiteral("2015")));
box.setWindowTitle(tr("D-Bus Viewer"));
box.exec();
}
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp
index ac4e40f0d..2e0c557ba 100644
--- a/src/qtdiag/qtdiag.cpp
+++ b/src/qtdiag/qtdiag.cpp
@@ -62,6 +62,7 @@
#include <private/qguiapplication_p.h>
#include <qpa/qplatformintegration.h>
#include <qpa/qplatformtheme.h>
+#include <qpa/qplatformnativeinterface.h>
#include <algorithm>
@@ -376,6 +377,14 @@ QString qtDiag(unsigned flags)
#else
Q_UNUSED(flags)
#endif // !QT_NO_OPENGL
+
+ // On Windows, this will provide addition GPU info similar to the output of dxdiag.
+ const QVariant gpuInfoV = QGuiApplication::platformNativeInterface()->property("gpu");
+ if (gpuInfoV.type() == QVariant::Map) {
+ const QString description = gpuInfoV.toMap().value(QStringLiteral("printable")).toString();
+ if (!description.isEmpty())
+ str << "\nGPU:\n" << description;
+ }
return result;
}
diff --git a/tests/auto/linguist/lconvert/data/wrapping.po b/tests/auto/linguist/lconvert/data/wrapping.po
index 9feb4a0ac..4ec8c7fe4 100644
--- a/tests/auto/linguist/lconvert/data/wrapping.po
+++ b/tests/auto/linguist/lconvert/data/wrapping.po
@@ -55,3 +55,12 @@ msgstr ""
#: gettxt.c:8
msgid "one two three four five six\n"
msgstr ""
+
+#: gettxt.c:10 gettxt.c:100 gettxt.c:101 gettxt.c:102 gettxt.c:103 gettxt.c:104
+msgid "foo"
+msgstr ""
+
+#: gettxt.c:100 gettxt.c:101 gettxt.c:102 gettxt.c:103 gettxt.c:104
+#: gettxt.c:105
+msgid "bar"
+msgstr ""
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 15:19:46 +0000