Skip to content

Commit ef0dd11

Browse files
author
pcav
committed
New GRASS shell - first commit - dev Lorenzo Masini
git-svn-id: http://svn.osgeo.org/qgis/trunk@10664 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 3df4775 commit ef0dd11

File tree

5 files changed

+123
-1203
lines changed

5 files changed

+123
-1203
lines changed

src/plugins/grass/CMakeLists.txt

+31-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ IF (NOT MSVC)
1616
ENDIF (NOT MSVC)
1717

1818
IF (WIN32)
19-
ADD_DEFINITIONS("\"-DGRASS_EXPORT=__declspec(dllimport)\"")
19+
ADD_DEFINITIONS("\"-DHAVE_GETPT -DGRASS_EXPORT=__declspec(dllimport)\"")
2020
ELSE (WIN32)
21-
ADD_DEFINITIONS("-DGRASS_EXPORT=")
21+
ADD_DEFINITIONS("-DHAVE_POSIX_OPENPT -DGRASS_EXPORT=")
2222
ENDIF (WIN32)
2323

2424
########################################################
@@ -39,6 +39,24 @@ SET (GRASS_PLUGIN_SRCS
3939
qgsgrassattributes.cpp
4040
qgsgrassregion.cpp
4141
qgsgrassutils.cpp
42+
qtermwidget/BlockArray.cpp
43+
qtermwidget/Emulation.cpp
44+
qtermwidget/Filter.cpp
45+
qtermwidget/History.cpp
46+
qtermwidget/KeyboardTranslator.cpp
47+
qtermwidget/Pty.cpp
48+
qtermwidget/Screen.cpp
49+
qtermwidget/ScreenWindow.cpp
50+
qtermwidget/Session.cpp
51+
qtermwidget/ShellCommand.cpp
52+
qtermwidget/TerminalCharacterDecoder.cpp
53+
qtermwidget/TerminalDisplay.cpp
54+
qtermwidget/Vt102Emulation.cpp
55+
qtermwidget/k3process.cpp
56+
qtermwidget/k3processcontroller.cpp
57+
qtermwidget/konsole_wcwidth.cpp
58+
qtermwidget/kpty.cpp
59+
qtermwidget/qtermwidget.cpp
4260
)
4361

4462
SET (GRASS_PLUGIN_UIS
@@ -48,7 +66,6 @@ SET (GRASS_PLUGIN_UIS
4866
qgsgrassmapcalcbase.ui
4967
qgsgrassmodulebase.ui
5068
qgsgrassnewmapsetbase.ui
51-
qgsgrassshellbase.ui
5269
qgsgrassattributesbase.ui
5370
qgsgrassregionbase.ui
5471
../../ui/qgsprojectionselectorbase.ui
@@ -69,6 +86,16 @@ SET (GRASS_PLUGIN_MOC_HDRS
6986
qgsgrassregion.h
7087
qgsgrassutils.h
7188
qgsgrassedittools.h
89+
qtermwidget/Emulation.h
90+
qtermwidget/Filter.h
91+
qtermwidget/Pty.h
92+
qtermwidget/ScreenWindow.h
93+
qtermwidget/Session.h
94+
qtermwidget/TerminalDisplay.h
95+
qtermwidget/Vt102Emulation.h
96+
qtermwidget/k3process.h
97+
qtermwidget/k3processcontroller.h
98+
qtermwidget/qtermwidget.h
7299
)
73100

74101
SET (GRASS_PLUGIN_RCCS qgsgrass_plugin.qrc)
@@ -106,9 +133,9 @@ INCLUDE_DIRECTORIES(
106133
${GRASS_INCLUDE_DIR}
107134
${GDAL_INCLUDE_DIR}
108135
${PROJ_INCLUDE_DIR}
136+
qtermwidget
109137
)
110138

111-
SET( QT_USE_QT3SUPPORT TRUE )
112139
INCLUDE( ${QT_USE_FILE} )
113140

114141
TARGET_LINK_LIBRARIES(grassplugin

0 commit comments

Comments
 (0)