Mercurial > hg > octave-lyh
comparison libgui/src/m-editor/file-editor.h @ 16291:c22a6cecaedd
build: Use AMCOND to build GUI editor if Qscintilla available.
* configure.ac: Add new AMCOND_HAVE_QSCINTILLA Automake Conditional.
* libgui/src/m-editor/file-editor-interface.h,
libgui/src/m-editor/file-editor-tab.h, libgui/src/m-editor/file-editor.h,
libgui/src/m-editor/find-dialog.h, libgui/src/m-editor/lexer-octave-gui.h:
Remove '#ifdef HAVE_QSCINTILLA' declarations
* libgui/src/module.mk: Check AMCOND_HAVE_QSCINTILLA before adding
GUI editor files to octave_gui_MOC variable.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 12 Mar 2013 19:03:07 -0700 |
| parents | d07aeecb2d22 |
| children | f482302d81c9 |
comparison
equal
deleted
inserted
replaced
| 16290:d07aeecb2d22 | 16291:c22a6cecaedd |
|---|---|
| 20 | 20 |
| 21 */ | 21 */ |
| 22 | 22 |
| 23 #ifndef FILEEDITORMDISUBWINDOW_H | 23 #ifndef FILEEDITORMDISUBWINDOW_H |
| 24 #define FILEEDITORMDISUBWINDOW_H | 24 #define FILEEDITORMDISUBWINDOW_H |
| 25 | |
| 26 #ifdef HAVE_QSCINTILLA | |
| 27 | 25 |
| 28 #include <QToolBar> | 26 #include <QToolBar> |
| 29 #include <QAction> | 27 #include <QAction> |
| 30 #include <QMenuBar> | 28 #include <QMenuBar> |
| 31 #include <QStatusBar> | 29 #include <QStatusBar> |
| 154 QAction *_mru_file_actions[MaxMRUFiles]; | 152 QAction *_mru_file_actions[MaxMRUFiles]; |
| 155 QStringList _mru_files; | 153 QStringList _mru_files; |
| 156 | 154 |
| 157 }; | 155 }; |
| 158 | 156 |
| 159 #endif // HAVE_QSCINTILLA | 157 #endif // FILEEDITORMDISUBWINDOW_H |
| 160 | |
| 161 #endif // FILEEDITORMDISUBWINDOW_H |