Fix build with newer qtermwidget

qgis · Apr 10, 2023 · 18812fb · 18812fb
1 parent d3770d3
commit 18812fb
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 1 deletion.
diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
@@ -149,6 +149,7 @@ set (GRASS_BROWSER_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/qgis.g.browser.cpp)
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/plugins
+  ${CMAKE_SOURCE_DIR}/src/plugins/grass
   ${CMAKE_SOURCE_DIR}/src/app
   ${CMAKE_SOURCE_DIR}/src/providers/grass
 

diff --git a/src/plugins/grass/qgsgrassshell.cpp b/src/plugins/grass/qgsgrassshell.cpp
@@ -63,7 +63,7 @@ QgsGrassShell::QgsGrassShell( QgsGrassTools *tools, QTabWidget *parent, const ch
   }
 #endif
 
-  mTerminal->setSize( 80, 25 );
+  mTerminal->setSize( QSize( 80, 25 ) );
   //mTerminal->setColorScheme( COLOR_SCHEME_BLACK_ON_WHITE );
   mTerminal->setColorScheme( QgsApplication::pkgDataPath() + "/grass/qtermwidget/color-schemes/BlackOnWhite.schema" );
   mTerminal->startShellProgram();

diff --git a/src/plugins/grass/qtermwidget_export.h b/src/plugins/grass/qtermwidget_export.h
@@ -0,0 +1,8 @@
+#ifndef QTERMWIDGET_EXPORT_H
+#define QTERMWIDGET_EXPORT_H
+
+#define QTERMWIDGET_EXPORT
+#define QTERMWIDGET_NO_EXPORT
+#define TRANSLATIONS_DIR ""
+
+#endif // QTERMWIDGET_EXPORT_H
diff --git a/src/plugins/grass/qtermwidget_version.h b/src/plugins/grass/qtermwidget_version.h
@@ -0,0 +1,32 @@
+/*  Copyright (C) 2020 Axel Kittenberger (axel.kittenberger@univie.ac.at)
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+
+#ifndef _Q_TERM_WIDGET_VERSION
+#define _Q_TERM_WIDGET_VERSION
+
+#include <QtGlobal>
+#define QTERMWIDGET_VERSION_MAJOR 1
+#define QTERMWIDGET_VERSION_MINOR 2
+#define QTERMWIDGET_VERSION_PATCH 0
+#define QTERMWIDGET_VERSION QT_VERSION_CHECK(\
+  QTERMWIDGET_VERSION_MAJOR,\
+  QTERMWIDGET_VERSION_MINOR,\
+  QTERMWIDGET_VERSION_PATCH)
+
+#endif