Mercurial > octave
diff libgui/src/m-editor/find-dialog.cc @ 22250:2fd4f1a3f4a8
allow building with Qt5 (bug #40252)
* acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Define HAVE_QT4 or HAVE_QT5.
Also check for Qt5PrintSupport when using Qt5.
* Canvas.cc, Object.cc, QTerminal.cc, TerminalView.cpp,
Vt102Emulation.cpp, konsole_wcwidth.h, find-files-dialog.cc,
file-editor-tab.cc, file-editor.cc, find-dialog.cc, octave-gui.cc,
resource-manager.cc, shortcut-manager.cc, workspace-model.cc,
workspace-view.cc: Adapt to Qt5 API changes.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 10 Aug 2016 03:54:42 -0400 |
parents | b3ced5e3cebb |
children | bac0d6f07a3e |
line wrap: on
line diff
--- a/libgui/src/m-editor/find-dialog.cc Wed Aug 10 09:09:41 2016 +0200 +++ b/libgui/src/m-editor/find-dialog.cc Wed Aug 10 03:54:42 2016 -0400 @@ -65,8 +65,17 @@ #if defined (HAVE_QSCINTILLA) -#include <QtGui> +#include <QCheckBox> +#include <QCheckBox> +#include <QDialogButtonBox> +#include <QGridLayout> #include <QIcon> +#include <QLabel> +#include <QLineEdit> +#include <QMessageBox> +#include <QPushButton> +#include <QVBoxLayout> + #include "find-dialog.h" find_dialog::find_dialog (QsciScintilla* edit_area,