diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-05-14 18:34:32 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-05-14 21:17:03 +0000 |
| commit | 4f421c274bb8f7d9bc6fb968f4d8275d1cd3cf06 (patch) | |
| tree | 733b8d0bd9b5d4369588da03390afd207843eeff /src/widgets | |
| parent | 71a1df5456ebe7070533b469434a964e7de5a5c7 (diff) | |
| parent | 7e1b504f31dcdad0b055c1532209e44f81033bc9 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index e70d096e04..04a44e1f37 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -73,7 +73,9 @@ #include <private/qabstractitemmodel_p.h> #include <private/qabstractscrollarea_p.h> #include <private/qlineedit_p.h> +#if QT_CONFIG(completer) #include <private/qcompleter_p.h> +#endif #include <qdebug.h> #if QT_CONFIG(effects) # include <private/qeffects_p.h> |