diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-28 09:23:03 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-28 09:28:31 +0200 |
commit | b48a13fd6843e12b5725aa3ff0d010007e7c43b4 (patch) | |
tree | 316cfe36fc67906efcd92ff806c7c0da56ed4f8e /src/widgets/dialogs/qinputdialog.h | |
parent | 3398d9d40cb0dae2dc2a1a4f7dc3b4b9cceae903 (diff) | |
parent | 15fe60cfdada84ea519f08e905d59cc3fb6d20cd (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
examples/examples.pro
tests/auto/corelib/tools/qchar/tst_qchar.cpp
tests/auto/other/qaccessibility/accessiblewidgets.h
Change-Id: I426696c40ab57d14dc295b8103152cede79f244c
Diffstat (limited to 'src/widgets/dialogs/qinputdialog.h')
-rw-r--r-- | src/widgets/dialogs/qinputdialog.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index 2fbea908cb..7b43e774a7 100644 --- a/src/widgets/dialogs/qinputdialog.h +++ b/src/widgets/dialogs/qinputdialog.h @@ -41,14 +41,15 @@ #define QINPUTDIALOG_H #include <QtWidgets/qtwidgetsglobal.h> -#include <QtWidgets/qdialog.h> #include <QtCore/qstring.h> #include <QtWidgets/qlineedit.h> -QT_BEGIN_NAMESPACE +#ifndef QT_NO_INPUTDIALOG +#include <QtWidgets/qdialog.h> + +QT_BEGIN_NAMESPACE -#ifndef QT_NO_INPUTDIALOG class QInputDialogPrivate; @@ -209,8 +210,8 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QInputDialog::InputDialogOptions) -#endif // QT_NO_INPUTDIALOG - QT_END_NAMESPACE +#endif // QT_NO_INPUTDIALOG + #endif // QINPUTDIALOG_H |