summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Arve Sæther <jan-arve.saether@qt.io>2020-02-25 15:29:24 +0100
committerJan Arve Sæther <jan-arve.saether@qt.io>2020-02-28 15:37:11 +0100
commit8de66e1f244ee500b7df79ecbeaa32d889dc7d27 (patch)
treea45a74863fde9a530c82f94e81d09760f4a69d5f /src
parente1b6c67bcdcb6dffdaf7b5d3d0d429b6dd60baf4 (diff)
Remove a "### Qt 6" that I forgot to remove
amends commit 5e83a2eed2dc42a732bd9154bebe8dcb34cd6bb5 Change-Id: I792d5d71d8c5a8b034d334de31dcd9bacfc53fa9 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/widgets/dialogs/qinputdialog.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h
index ca893172f9..6e2d6eebf3 100644
--- a/src/widgets/dialogs/qinputdialog.h
+++ b/src/widgets/dialogs/qinputdialog.h
@@ -189,7 +189,6 @@ public:
int decimals = 1, bool *ok = nullptr, Qt::WindowFlags flags = Qt::WindowFlags(),
double step = 1);
#else
- // ### Qt 6: merge overloads
static double getDouble(QWidget *parent, const QString &title, const QString &label, double value,
double minValue, double maxValue, int decimals, bool *ok, Qt::WindowFlags flags,
double step);