Mercurial > octave
annotate libgui/qterminal-module.mk @ 19936:29fe196d2ce0
GUI: use reource manager for command window icons (Bug #44528)
* libgui/qterminal/libqterminal/QTerminal.h
(toplevel): include resource-manager.h
(QTerminal::QTerminal): Use resource manager icons for copy and paste menus
* libgui/qterminal-module.mk:
(qterminal_libqterminal_la_CPPFLAGS): add -I libgui/src
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Thu, 12 Mar 2015 21:32:17 -0400 |
parents | 4c3c3cf9ef58 |
children | 8ef616eec739 |
rev | line source |
---|---|
15362 | 1 EXTRA_DIST += \ |
2 qterminal-module.mk | |
3 | |
4 noinst_HEADERS += \ | |
5 qterminal/libqterminal/QTerminal.h \ | |
6 qterminal/libqterminal/win32/QTerminalColors.h \ | |
7 qterminal/libqterminal/win32/QWinTerminalImpl.h \ | |
8 qterminal/libqterminal/unix/BlockArray.h \ | |
9 qterminal/libqterminal/unix/Character.h \ | |
10 qterminal/libqterminal/unix/CharacterColor.h \ | |
11 qterminal/libqterminal/unix/Emulation.h \ | |
12 qterminal/libqterminal/unix/ExtendedDefaultTranslator.h \ | |
18818
4c3c3cf9ef58
Add missing file to tarball distribution.
Carlo de Falco <cdf@users.sourceforge.net>
parents:
16639
diff
changeset
|
13 qterminal/libqterminal/unix/ExtendedDefaultTranslatorMac.h \ |
15362 | 14 qterminal/libqterminal/unix/Filter.h \ |
15 qterminal/libqterminal/unix/History.h \ | |
16 qterminal/libqterminal/unix/KeyboardTranslator.h \ | |
17 qterminal/libqterminal/unix/konsole_wcwidth.h \ | |
18 qterminal/libqterminal/unix/kpty.h \ | |
19 qterminal/libqterminal/unix/kpty_p.h \ | |
20 qterminal/libqterminal/unix/LineFont.h \ | |
21 qterminal/libqterminal/unix/QUnixTerminalImpl.h \ | |
22 qterminal/libqterminal/unix/Screen.h \ | |
23 qterminal/libqterminal/unix/ScreenWindow.h \ | |
24 qterminal/libqterminal/unix/TerminalCharacterDecoder.h \ | |
25 qterminal/libqterminal/unix/Vt102Emulation.h \ | |
26 qterminal/libqterminal/unix/SelfListener.h \ | |
27 qterminal/libqterminal/unix/TerminalModel.h \ | |
28 qterminal/libqterminal/unix/TerminalView.h | |
29 | |
30 qterminal_libqterminal_la_MOC = \ | |
16639
ba808cd9d86c
simplify QTerminal inheritance scheme
John W. Eaton <jwe@octave.org>
parents:
16413
diff
changeset
|
31 qterminal/libqterminal/moc-QTerminal.cc |
15362 | 32 |
33 nodist_qterminal_libqterminal_la_SOURCES = $(qterminal_libqterminal_la_MOC) | |
34 | |
35 qterminal_libqterminal_la_CPPFLAGS = \ | |
15363
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
36 $(AM_CPPFLAGS) \ |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15392
diff
changeset
|
37 @QT_CPPFLAGS@ \ |
19936
29fe196d2ce0
GUI: use reource manager for command window icons (Bug #44528)
John Donoghue <john.donoghue@ieee.org>
parents:
18818
diff
changeset
|
38 -I$(srcdir)/qterminal/libqterminal \ |
29fe196d2ce0
GUI: use reource manager for command window icons (Bug #44528)
John Donoghue <john.donoghue@ieee.org>
parents:
18818
diff
changeset
|
39 -I$(srcdir)/src |
15362 | 40 |
15363
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
41 qterminal_libqterminal_la_CFLAGS = $(AM_CFLAGS) |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
42 |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
43 qterminal_libqterminal_la_CXXFLAGS = $(AM_CXXFLAGS) |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
44 |
15362 | 45 if WIN32_TERMINAL |
46 | |
47 qterminal_libqterminal_la_SOURCES = \ | |
48 qterminal/libqterminal/win32/QTerminalColors.cpp \ | |
16413
28136851099a
remove _terminal pointer from main_window, it is contained by other Qt object
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15596
diff
changeset
|
49 qterminal/libqterminal/win32/QWinTerminalImpl.cpp \ |
28136851099a
remove _terminal pointer from main_window, it is contained by other Qt object
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15596
diff
changeset
|
50 qterminal/libqterminal/QTerminal.cc |
15362 | 51 |
15392
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15363
diff
changeset
|
52 qterminal_libqterminal_la_MOC += \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15363
diff
changeset
|
53 qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15363
diff
changeset
|
54 |
15362 | 55 qterminal_libqterminal_la_CPPFLAGS += -DUNICODE |
56 | |
57 # This flag is required to let MOC know about Q_OS_WIN32. | |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15392
diff
changeset
|
58 MOC_CPPFLAGS += -DQ_OS_WIN32 |
15362 | 59 |
60 else | |
61 | |
62 qterminal_libqterminal_la_SOURCES = \ | |
63 qterminal/libqterminal/unix/BlockArray.cpp \ | |
64 qterminal/libqterminal/unix/Emulation.cpp \ | |
65 qterminal/libqterminal/unix/Filter.cpp \ | |
66 qterminal/libqterminal/unix/History.cpp \ | |
67 qterminal/libqterminal/unix/KeyboardTranslator.cpp \ | |
68 qterminal/libqterminal/unix/konsole_wcwidth.cpp \ | |
69 qterminal/libqterminal/unix/kpty.cpp \ | |
70 qterminal/libqterminal/unix/QUnixTerminalImpl.cpp \ | |
71 qterminal/libqterminal/unix/Screen.cpp \ | |
72 qterminal/libqterminal/unix/ScreenWindow.cpp \ | |
73 qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp \ | |
74 qterminal/libqterminal/unix/Vt102Emulation.cpp \ | |
75 qterminal/libqterminal/unix/SelfListener.cpp \ | |
76 qterminal/libqterminal/unix/TerminalModel.cpp \ | |
16413
28136851099a
remove _terminal pointer from main_window, it is contained by other Qt object
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15596
diff
changeset
|
77 qterminal/libqterminal/unix/TerminalView.cpp \ |
28136851099a
remove _terminal pointer from main_window, it is contained by other Qt object
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15596
diff
changeset
|
78 qterminal/libqterminal/QTerminal.cc |
15362 | 79 |
80 qterminal_libqterminal_la_MOC += \ | |
81 qterminal/libqterminal/unix/moc-Emulation.cc \ | |
82 qterminal/libqterminal/unix/moc-Filter.cc \ | |
83 qterminal/libqterminal/unix/moc-QUnixTerminalImpl.cc \ | |
84 qterminal/libqterminal/unix/moc-ScreenWindow.cc \ | |
85 qterminal/libqterminal/unix/moc-SelfListener.cc \ | |
86 qterminal/libqterminal/unix/moc-TerminalModel.cc \ | |
87 qterminal/libqterminal/unix/moc-TerminalView.cc \ | |
88 qterminal/libqterminal/unix/moc-Vt102Emulation.cc | |
89 | |
90 endif | |
91 | |
92 noinst_LTLIBRARIES += qterminal/libqterminal.la | |
93 | |
94 CLEANFILES += $(qterminal_libqterminal_la_MOC) |