Mercurial > octave-nkf
diff libgui/src/m-editor/file-editor-tab.cc @ 15257:7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
* configure.ac (OCTGUI_DLL_DEFS): New substituted variabled. Define it to
-DOCTGUI_DLL under MinGW and MSVC platforms.
(QT_INCDIR, QT_LIBDIR): Replace backslash with forward slash characters.
(OCTGUI_API): New config.h macro.
* src/Makefile.am (MOC_CPPFLAGS): New variable. Define it to -DWIN32 when
compiling Win32 terminal implementation.
(moc-%.cc rule): Use it.
(libqterminal_la_CPPFLAGS): New variable defined to -DWIN32 when compiling
the win32 terminal implementation.
(liboctgui_la_CPPFLAGS): Add @OCTGUI_DLL_DEFS@.
* libgui/src/m-editor/file-editor-tab.cc (QApplication, QFileDialog,
QTextStream): New includes.
* libgui/src/m-editor/find-dialog.cc (find_dialog::search_next): Temporary
fix for compilation with QScintilla < 2.6.
* libgui/src/main-window.cc (QApplication, QLabel): New includes.
* libgui/src/octave-gui.h (octave_start_gui): Decorate with OCTGUI_API.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Thu, 30 Aug 2012 15:52:44 +0100 |
| parents | 359098ad343e |
| children | ae9079bbc627 |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.cc Thu Aug 30 08:47:33 2012 +0100 +++ b/libgui/src/m-editor/file-editor-tab.cc Thu Aug 30 15:52:44 2012 +0100 @@ -36,7 +36,10 @@ #include <Qsci/qscilexerbatch.h> #include <Qsci/qscilexerdiff.h> #include "resource-manager.h" +#include <QApplication> +#include <QFileDialog> #include <QMessageBox> +#include <QTextStream> #include <QVBoxLayout> file_editor_tab::file_editor_tab(file_editor *fileEditor)