Mercurial > octave
diff libgui/src/find-files-dialog.cc @ 24827:1e0718c1867c
eliminate most Qt version checks
* acinclude.m4 (OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONRESIZEMODE,
OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSCLICKABLE,
OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSMOVABLE,
OCTAVE_CHECK_FUNC_QINSTALLMESSAGEHANDLER,
OCTAVE_CHECK_FUNC_QMOUSEEVENT_LOCALPOS,
OCTAVE_CHECK_FUNC_QTMESSAGEHANDLER_ACCEPTS_QMESSAGELOGCONTEXT): New macros.
(OCTAVE_CHECK_QT_VERSION): Use them. Check for QStandardPaths
header.
* Canvas.cc, find-files-dialog.cc, file-editor-tab.cc,
octave-gui.cc, resource-manager.cc, shortcut-manager.cc,
variable-editor.cc, workspace-view.cc:
Use new macros instead of checking Qt version.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 02 Mar 2018 13:25:34 -0500 |
parents | e15d53d2de1e |
children | 6652d3823428 |
line wrap: on
line diff
--- a/libgui/src/find-files-dialog.cc Fri Mar 02 10:45:06 2018 -0800 +++ b/libgui/src/find-files-dialog.cc Fri Mar 02 13:25:34 2018 -0500 @@ -126,10 +126,10 @@ m_file_list->setSortingEnabled (true); m_file_list->horizontalHeader ()->restoreState (settings->value ("findfiles/column_state").toByteArray ()); m_file_list->horizontalHeader ()->setSortIndicatorShown (true); -#if defined (HAVE_QT4) +#if defined (HAVE_QHEADERVIEW_SETSECTIONSCLICKABLE) + m_file_list->horizontalHeader ()->setSectionsClickable (true); +#else m_file_list->horizontalHeader ()->setClickable (true); -#else - m_file_list->horizontalHeader ()->setSectionsClickable (true); #endif m_file_list->horizontalHeader ()->setStretchLastSection (true); m_file_list->sortByColumn (settings->value ("findfiles/sort_files_by_column",0).toInt (),