diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:16:29 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:23:19 +0200 |
| commit | f4b4c4f79b629498f3cddbbc10df8c1b4d6020d9 (patch) | |
| tree | 4119707660438ff58bd51f9cbe0f9e2a33f4b806 /examples/widgets/tools | |
| parent | 9bd6cec74dbbc5aece55dc0c8808494db29b9963 (diff) | |
| parent | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
Diffstat (limited to 'examples/widgets/tools')
| -rw-r--r-- | examples/widgets/tools/codecs/encodingdialog.cpp | 2 | ||||
| -rw-r--r-- | examples/widgets/tools/i18n/languagechooser.cpp | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/examples/widgets/tools/codecs/encodingdialog.cpp b/examples/widgets/tools/codecs/encodingdialog.cpp index ca4b56db9e..aa57d47dc7 100644 --- a/examples/widgets/tools/codecs/encodingdialog.cpp +++ b/examples/widgets/tools/codecs/encodingdialog.cpp @@ -248,7 +248,7 @@ static const char *encodingToolTips[] { QT_TRANSLATE_NOOP("EncodingDialog", "Unicode points for use with any encoding (C++, Python)"), QT_TRANSLATE_NOOP("EncodingDialog", "QString::fromUtf8()"), - QT_TRANSLATE_NOOP("EncodingDialog", "QStringViewLiteral(), wchar_t on Windows"), + QT_TRANSLATE_NOOP("EncodingDialog", "wchar_t on Windows, char16_t everywhere"), QT_TRANSLATE_NOOP("EncodingDialog", "wchar_t on Unix (Ucs4)"), QT_TRANSLATE_NOOP("EncodingDialog", "QLatin1String") }; diff --git a/examples/widgets/tools/i18n/languagechooser.cpp b/examples/widgets/tools/i18n/languagechooser.cpp index 963165ff81..e61e4432e4 100644 --- a/examples/widgets/tools/i18n/languagechooser.cpp +++ b/examples/widgets/tools/i18n/languagechooser.cpp @@ -53,12 +53,6 @@ #include "languagechooser.h" #include "mainwindow.h" -#if 0 // Used to be included in Qt4 for Q_WS_MAC -QT_BEGIN_NAMESPACE -extern void qt_mac_set_menubar_merge(bool merge); -QT_END_NAMESPACE -#endif - LanguageChooser::LanguageChooser(const QString& defaultLang, QWidget *parent) : QDialog(parent, Qt::WindowStaysOnTopHint) { @@ -95,10 +89,6 @@ LanguageChooser::LanguageChooser(const QString& defaultLang, QWidget *parent) mainLayout->addWidget(buttonBox); setLayout(mainLayout); -#if 0 // Used to be included in Qt4 for Q_WS_MAC - qt_mac_set_menubar_merge(false); -#endif - setWindowTitle("I18N"); } |