diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-31 08:13:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-31 08:13:38 +0200 |
| commit | 8cec9f474af2cf654828b5d47b166da7d3c36574 (patch) | |
| tree | 5dfd4fce466c5853b24c993c5256a8423a850cdf /examples | |
| parent | faa94e56eacf33bb49073e9fff60a821347e6628 (diff) | |
| parent | 20811e3b004af817e3f02982c755e8b1560b8c3d (diff) | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: I9c93f053c5a6a7af04c79d6e2cc8ded76c906319
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/serialbus/can/bitratebox.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/examples/serialbus/can/bitratebox.h b/examples/serialbus/can/bitratebox.h index e9df635..42bbb2d 100644 --- a/examples/serialbus/can/bitratebox.h +++ b/examples/serialbus/can/bitratebox.h @@ -43,7 +43,9 @@ #include <QComboBox> +QT_BEGIN_NAMESPACE class QIntValidator; +QT_END_NAMESPACE class BitRateBox : public QComboBox { |