diff --git a/src/assistant/assistant/assistant.icns b/src/assistant/assistant/assistant.icns index 6291dd3975a034ef2f052fb6a68dd377fab00238..1dbfc6a1521447391e2bf17ae70a31085a2bb55b 100644 Binary files a/src/assistant/assistant/assistant.icns and b/src/assistant/assistant/assistant.icns differ diff --git a/src/assistant/assistant/assistant.ico b/src/assistant/assistant/assistant.ico index 9e1b83f1b66e2f30707c7dfa9e98c6cb723a9f79..f345055325f1b8d7334ae7749a2473402448e552 100644 Binary files a/src/assistant/assistant/assistant.ico and b/src/assistant/assistant/assistant.ico differ diff --git a/src/assistant/assistant/assistant_images.qrc b/src/assistant/assistant/assistant_images.qrc index 4596b568d258d3b152fe43ad53aa4baecf3ac764..948de970f7407436a0be0f76dda9b7c3e9da36b0 100644 --- a/src/assistant/assistant/assistant_images.qrc +++ b/src/assistant/assistant/assistant_images.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/qt-project.org/assistant"> - <file>images/qt-logo.png</file> <file>images/assistant-128.png</file> <file>images/assistant.png</file> <file>images/wrap.png</file> diff --git a/src/assistant/assistant/images/assistant-128.png b/src/assistant/assistant/images/assistant-128.png index f05949f6d8a4b176f49ab1440c39d22f8a5dbe8b..7b9f47477420927680d611106d4c7ddc0ce5f2b7 100644 Binary files a/src/assistant/assistant/images/assistant-128.png and b/src/assistant/assistant/images/assistant-128.png differ diff --git a/src/assistant/assistant/images/assistant.png b/src/assistant/assistant/images/assistant.png index ea4d1e70c13d8cab3679ccc709a2ed3d427f3993..2d7c477444e47e247ed37b4025fde013bcba1626 100644 Binary files a/src/assistant/assistant/images/assistant.png and b/src/assistant/assistant/images/assistant.png differ diff --git a/src/assistant/assistant/images/qt-logo.png b/src/assistant/assistant/images/qt-logo.png deleted file mode 100644 index c53e744cab21d998fb4ce67536da8ecd46512da9..0000000000000000000000000000000000000000 Binary files a/src/assistant/assistant/images/qt-logo.png and /dev/null differ diff --git a/src/assistant/help/qhelpcontentwidget.cpp b/src/assistant/help/qhelpcontentwidget.cpp index 8f38bcfd3de322f82852543a2f3289056a459400..1deaaf95a2d9f04b113986a3200fadec1a10e9e3 100644 --- a/src/assistant/help/qhelpcontentwidget.cpp +++ b/src/assistant/help/qhelpcontentwidget.cpp @@ -219,6 +219,11 @@ void QHelpContentProvider::stopCollecting() m_abort = true; m_mutex.unlock(); wait(); + // we need to force-set m_abort to false, because the thread might either have + // finished between the isRunning() check and the "m_abort = true" above, or the + // isRunning() check might already happen after the "m_abort = false" in the run() method, + // either way never resetting m_abort to false from within the run() method + m_abort = false; } qDeleteAll(m_rootItems); m_rootItems.clear(); diff --git a/src/assistant/qhelpconverter/assistant-128.png b/src/assistant/qhelpconverter/assistant-128.png index f05949f6d8a4b176f49ab1440c39d22f8a5dbe8b..7b9f47477420927680d611106d4c7ddc0ce5f2b7 100644 Binary files a/src/assistant/qhelpconverter/assistant-128.png and b/src/assistant/qhelpconverter/assistant-128.png differ diff --git a/src/assistant/qhelpconverter/assistant.png b/src/assistant/qhelpconverter/assistant.png index ea4d1e70c13d8cab3679ccc709a2ed3d427f3993..2d7c477444e47e247ed37b4025fde013bcba1626 100644 Binary files a/src/assistant/qhelpconverter/assistant.png and b/src/assistant/qhelpconverter/assistant.png differ diff --git a/src/designer/src/components/formeditor/images/qtlogo.png b/src/designer/src/components/formeditor/images/qtlogo.png index 038fa2cc3bcae8f62b47172436d625c170d9b359..7d472572b6bbfb357cadc7e9a1c6a7fb8c3e484d 100644 Binary files a/src/designer/src/components/formeditor/images/qtlogo.png and b/src/designer/src/components/formeditor/images/qtlogo.png differ diff --git a/src/designer/src/designer/designer.icns b/src/designer/src/designer/designer.icns index 9940214fc29c3e9143672547c122ab76199fa1a4..c50830598f271849573546525a58cb6bd9eebdaf 100644 Binary files a/src/designer/src/designer/designer.icns and b/src/designer/src/designer/designer.icns differ diff --git a/src/designer/src/designer/designer.ico b/src/designer/src/designer/designer.ico index ef667333d659dc0bb877790461171051e28a1d64..495e8d1623d933d9d2657506876e17a6857e8fcf 100644 Binary files a/src/designer/src/designer/designer.ico and b/src/designer/src/designer/designer.ico differ diff --git a/src/designer/src/designer/images/designer.png b/src/designer/src/designer/images/designer.png index 0988fcee3f28eacfbd0cb0722b34093e8eace9a8..15086cb70e9cbd0fabf39b8bb820dd6f361f93fc 100644 Binary files a/src/designer/src/designer/images/designer.png and b/src/designer/src/designer/images/designer.png differ diff --git a/src/designer/src/designer/uifile.icns b/src/designer/src/designer/uifile.icns index 2473ea4dc9f0531cdc64203e4a269763b170ee72..030998785b7f4d5c996332f886844773fc2ca7b3 100644 Binary files a/src/designer/src/designer/uifile.icns and b/src/designer/src/designer/uifile.icns differ diff --git a/src/linguist/linguist/images/appicon.png b/src/linguist/linguist/images/appicon.png index d388cbd0ba059122915350c9e0eec699d1327c80..6aa09fb7a0c2ac2c176147397e76a7947786a99e 100644 Binary files a/src/linguist/linguist/images/appicon.png and b/src/linguist/linguist/images/appicon.png differ diff --git a/src/linguist/linguist/images/icons/linguist-128-32.png b/src/linguist/linguist/images/icons/linguist-128-32.png index d108208fa8ac88e330f9967fd47e288179941d00..e9a44cbef0e95cbf423293216ec21e487293a738 100644 Binary files a/src/linguist/linguist/images/icons/linguist-128-32.png and b/src/linguist/linguist/images/icons/linguist-128-32.png differ diff --git a/src/linguist/linguist/images/icons/linguist-16-32.png b/src/linguist/linguist/images/icons/linguist-16-32.png index 8dfc97406c1a53c5ec20d75962b0c55565887481..111b910b03fbcfe0e3d568673128f78e7832f7a8 100644 Binary files a/src/linguist/linguist/images/icons/linguist-16-32.png and b/src/linguist/linguist/images/icons/linguist-16-32.png differ diff --git a/src/linguist/linguist/images/icons/linguist-32-32.png b/src/linguist/linguist/images/icons/linguist-32-32.png index d388cbd0ba059122915350c9e0eec699d1327c80..6aa09fb7a0c2ac2c176147397e76a7947786a99e 100644 Binary files a/src/linguist/linguist/images/icons/linguist-32-32.png and b/src/linguist/linguist/images/icons/linguist-32-32.png differ diff --git a/src/linguist/linguist/images/icons/linguist-48-32.png b/src/linguist/linguist/images/icons/linguist-48-32.png index ceb7387593108e324e9b43e5022e227108e44e51..b7e344485826b2afa3466965d185083980bc620e 100644 Binary files a/src/linguist/linguist/images/icons/linguist-48-32.png and b/src/linguist/linguist/images/icons/linguist-48-32.png differ diff --git a/src/linguist/linguist/images/icons/linguist-64-32.png b/src/linguist/linguist/images/icons/linguist-64-32.png index 0cce805e3673a6b5f31b63c23f388d5eaee4a383..6ea58ff4274d12af728f2e56a85afd01c49fa1ec 100644 Binary files a/src/linguist/linguist/images/icons/linguist-64-32.png and b/src/linguist/linguist/images/icons/linguist-64-32.png differ diff --git a/src/linguist/linguist/images/splash.png b/src/linguist/linguist/images/splash.png index 0e99a1cf0cf0a012c38bf468b566c38cc22191c0..baaed6181569162c275456ff8cfd0cba05842d5d 100644 Binary files a/src/linguist/linguist/images/splash.png and b/src/linguist/linguist/images/splash.png differ diff --git a/src/linguist/linguist/linguist.icns b/src/linguist/linguist/linguist.icns index 5918e001c5d9698df56468082e72e23981950218..d37861567ef89d23c9592936276b3027d61f6c40 100644 Binary files a/src/linguist/linguist/linguist.icns and b/src/linguist/linguist/linguist.icns differ diff --git a/src/linguist/linguist/linguist.ico b/src/linguist/linguist/linguist.ico index 5bbdc485baae2f69181b9392a1438de3a9ec7a08..48cd31a17f4326d1527ad99899a9e8adc70181dc 100644 Binary files a/src/linguist/linguist/linguist.ico and b/src/linguist/linguist/linguist.ico differ diff --git a/src/qdbus/qdbusviewer/images/qdbusviewer-128.png b/src/qdbus/qdbusviewer/images/qdbusviewer-128.png index 0754912213aedd8c9b0a968c77284a664a0138af..af940dcb5830e8a2af89fdca405e66eb12521620 100644 Binary files a/src/qdbus/qdbusviewer/images/qdbusviewer-128.png and b/src/qdbus/qdbusviewer/images/qdbusviewer-128.png differ diff --git a/src/qdbus/qdbusviewer/images/qdbusviewer.icns b/src/qdbus/qdbusviewer/images/qdbusviewer.icns index b6f39b9c23eb3b505ac79e69a546b7f37921c745..179a8238a9f81ca284c75676460b033d5970ef4b 100644 Binary files a/src/qdbus/qdbusviewer/images/qdbusviewer.icns and b/src/qdbus/qdbusviewer/images/qdbusviewer.icns differ diff --git a/src/qdbus/qdbusviewer/images/qdbusviewer.ico b/src/qdbus/qdbusviewer/images/qdbusviewer.ico index 49edb09f0b38b6b1823869f299f551b22909bd88..c5742ccf000cbfca8dd2ad7f3521136e38be1f54 100644 Binary files a/src/qdbus/qdbusviewer/images/qdbusviewer.ico and b/src/qdbus/qdbusviewer/images/qdbusviewer.ico differ diff --git a/src/qdbus/qdbusviewer/images/qdbusviewer.png b/src/qdbus/qdbusviewer/images/qdbusviewer.png index 5a8c5a341c69abd17d7bfae8c106861963362a9d..b410aaf5047771cefb70964c82245eaf3b02302c 100644 Binary files a/src/qdbus/qdbusviewer/images/qdbusviewer.png and b/src/qdbus/qdbusviewer/images/qdbusviewer.png differ diff --git a/src/qtconfig/images/appicon.png b/src/qtconfig/images/appicon.png index 00931777875ac206566aa26a1b02989ece8a7acb..02c803bffaf2599c65be73a22806e7d114f1ffa9 100644 Binary files a/src/qtconfig/images/appicon.png and b/src/qtconfig/images/appicon.png differ diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index c156519be0a5cf06a11f7f456d8a4987bc3b1fed..a1568fa5bb23590e5cc581118d729925e58f9b99 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -1302,7 +1302,16 @@ static bool deployWebEngine(const QMap<QString, QString> &qmakeVariables, return false; } } - return true; + const QFileInfo translations(qmakeVariables.value(QStringLiteral("QT_INSTALL_TRANSLATIONS")) + + QStringLiteral("/qtwebengine_locales")); + if (!translations.isDir()) { + std::wcerr << "Warning: Cannot find the translation files of the QtWebEngine module at " + << QDir::toNativeSeparators(translations.absoluteFilePath()) << '.'; + return true; + } + // Missing translations may cause crashes, ignore --no-translations. + return updateFile(translations.absoluteFilePath(), options.directory, + options.updateFileFlags, options.json, errorMessage); } int main(int argc, char **argv)