diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-27 09:16:56 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-27 09:17:14 +0200 |
| commit | 761b71bd20524bc1e495508a52c38a0bc6679a06 (patch) | |
| tree | df2748fb11234c9b0dfb82828ce8d76459d185db /src/widgets/dialogs | |
| parent | 800941df899a4418d4ac6cebbcc31a40120167bc (diff) | |
| parent | 14aa1f7d6ffea29647557f98e654355782f55e66 (diff) | |
| download | qtbase-761b71bd20524bc1e495508a52c38a0bc6679a06.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Iaf6bd52972b562b9c91d9e93a988d26b0eb9d3b4
Diffstat (limited to 'src/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qcolordialog.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index c0bacd553d..8a1bd1431e 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -1859,6 +1859,9 @@ void QColorDialogPrivate::_q_addCustom() void QColorDialogPrivate::retranslateStrings() { + if (nativeDialogInUse) + return; + if (!smallDisplay) { lblBasicColors->setText(QColorDialog::tr("&Basic colors")); lblCustomColors->setText(QColorDialog::tr("&Custom colors")); |