Mercurial > octave-nkf

comparison libgui/src/settings-dialog.cc @ 16636:d788ee8b8a99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix GUI includes when built without Qscintilla * settings-dialog.cc: Unconditionally include color-picker.h. Do not include QSettings here. * settings-dialog.h: Include QSettings here.
author Mike Miller <mtmiller@ieee.org>
date Fri, 10 May 2013 18:31:04 -0400
parents 4adf3c4bd80b
children 025bc6b5080e
comparison
equal deleted inserted replaced
16635:25e418d23a4b 16636:d788ee8b8a99
22 22
23 #ifdef HAVE_CONFIG_H 23 #ifdef HAVE_CONFIG_H
24 #include <config.h> 24 #include <config.h>
25 #endif 25 #endif
26 26
27 #include "color-picker.h"
27 #include "resource-manager.h" 28 #include "resource-manager.h"
28 #include "workspace-model.h" 29 #include "workspace-model.h"
29 #include "settings-dialog.h" 30 #include "settings-dialog.h"
30 #include "ui-settings-dialog.h" 31 #include "ui-settings-dialog.h"
31 #include <QSettings>
32 #include <QDir> 32 #include <QDir>
33 #include <QFileInfo> 33 #include <QFileInfo>
34 #include <QVector> 34 #include <QVector>
35 35
36 #ifdef HAVE_QSCINTILLA 36 #ifdef HAVE_QSCINTILLA
37 #include <QScrollArea> 37 #include <QScrollArea>
38 #include "color-picker.h"
39 #include <Qsci/qscilexercpp.h> 38 #include <Qsci/qscilexercpp.h>
40 #include <Qsci/qscilexerbash.h> 39 #include <Qsci/qscilexerbash.h>
41 #include <Qsci/qscilexerperl.h> 40 #include <Qsci/qscilexerperl.h>
42 #include <Qsci/qscilexerbatch.h> 41 #include <Qsci/qscilexerbatch.h>
43 #include <Qsci/qscilexerdiff.h> 42 #include <Qsci/qscilexerdiff.h>