1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove a "### Qt 6" that I forgot to remove

Browse Source 
amends commit 5e83a2eed2dc42a732bd9154bebe8dcb34cd6bb5

Change-Id: I792d5d71d8c5a8b034d334de31dcd9bacfc53fa9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Jan Arve Sæther 2020-02-25 15:29:24 +01:00
parent e1b6c67bcd
commit 8de66e1f24
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/widgets/dialogs/qinputdialog.h
View File

@ -189,7 +189,6 @@ public:
int decimals = 1, bool *ok = nullptr, Qt::WindowFlags flags = Qt::WindowFlags(), int decimals = 1, bool *ok = nullptr, Qt::WindowFlags flags = Qt::WindowFlags(),
double step = 1); double step = 1);
#else #else
// ### Qt 6: merge overloads
static double getDouble(QWidget *parent, const QString &title, const QString &label, double value, 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 minValue, double maxValue, int decimals, bool *ok, Qt::WindowFlags flags,
double step); double step);