diff options
author | Jan Arve Sæther <jan-arve.saether@qt.io> | 2020-02-12 11:14:50 +0100 |
---|---|---|
committer | Jan Arve Sæther <jan-arve.saether@qt.io> | 2020-02-12 16:10:24 +0100 |
commit | 5e83a2eed2dc42a732bd9154bebe8dcb34cd6bb5 (patch) | |
tree | df0b2dd12c511107631eec4a0c008e95350285d9 /src/widgets/dialogs/qinputdialog.cpp | |
parent | 2b0af50c8ba534a6032a31297f1915b50a100241 (diff) |
Deprecate one overload of QInputDialog::getDouble() for 5.15
...and merge the two overloads of getDouble() in Qt6
Change-Id: I55faa2ff222b41e48889a0ef14dd00a6da691c36
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/widgets/dialogs/qinputdialog.cpp')
-rw-r--r-- | src/widgets/dialogs/qinputdialog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp index 1cb4be0682..eeb0613d79 100644 --- a/src/widgets/dialogs/qinputdialog.cpp +++ b/src/widgets/dialogs/qinputdialog.cpp @@ -1349,6 +1349,7 @@ int QInputDialog::getInt(QWidget *parent, const QString &title, const QString &l \sa getText(), getDouble(), getItem(), getMultiLineText() */ +#if QT_DEPRECATED_SINCE(5, 15) /*! Static convenience function to get a floating point number from the user. @@ -1380,7 +1381,7 @@ double QInputDialog::getDouble(QWidget *parent, const QString &title, const QStr { return QInputDialog::getDouble(parent, title, label, value, min, max, decimals, ok, flags, 1.0); } - +#endif /*! \overload Static convenience function to get a floating point number from the user. |