Merge pull request #113 from barracuda156/qt4

Fix building with Qt4
Mezomish · Aug 16, 2024 · 04728a5 · 04728a5
2 parents 73ad560 + b612563
commit 04728a5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/plugins/terminal/CMakeLists.txt b/plugins/terminal/CMakeLists.txt
@@ -5,12 +5,13 @@ set (terminal_UI preferences.ui)
 if (USE_QT5)
     find_package ( QTermWidget5 REQUIRED )
     qt5_wrap_ui(terminal_UI_SRC ${terminal_UI})
+    set(qtermwidget_lib "qtermwidget5")
 else (USE_QT5)
     find_package ( QTermWidget4 REQUIRED )
     qt4_wrap_ui(terminal_UI_SRC ${terminal_UI})
+    set(qtermwidget_lib "qtermwidget4")
 endif (USE_QT5)
 
 add_library(terminal SHARED ${terminal_SRC} ${terminal_MOC} ${terminal_UI_SRC})
-target_link_libraries(terminal ${JUFFED_LIBRARY} qtermwidget5)
+target_link_libraries(terminal ${JUFFED_LIBRARY} ${qtermwidget_lib})
 install(TARGETS terminal DESTINATION ${JUFFED_PLUGINS_DIR})
-
diff --git a/plugins/terminal/TerminalPlugin.cpp b/plugins/terminal/TerminalPlugin.cpp
@@ -1,14 +1,18 @@
 #include "TerminalPlugin.h"
 
+#include <QtGlobal>
 #include <QtCore>
 #include <QAction>
 #include <QWidget>
 
 #include <Log.h>
 #include <PluginSettings.h>
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <qtermwidget5/qtermwidget.h>
-
+#else
+#include <qtermwidget4/qtermwidget.h>
+#endif
 
 Preferences::Preferences(const QObject *parent,
                          const QString &color,
@@ -39,7 +43,6 @@ Preferences::Preferences(const QObject *parent,
             parent, SLOT(fontSizeChanged(int)));
 }
 
-
 TerminalPlugin::TerminalPlugin() : QObject(), JuffPlugin() {
 	w_ = new QTermWidget();
 	w_->setScrollBarPosition(QTermWidget::ScrollBarRight);

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -3,6 +3,7 @@
 #include "MainSettings.h"
 #include "Settings.h"
 
+#include <QtGlobal>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
@@ -134,25 +135,27 @@ bool hasValidDoubleDashParam( const QCoreApplication& app ) {
 			return true;
 		}
 	}
-	
+
 	return false;
 }
 
 int runSingle(int argc, char* argv[]) {
 	QtSingleApplication app(argc, argv);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
         app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+#endif
 	initApp(app);
 
 	if ( hasValidDoubleDashParam( app ) ) {
 		return 0;
 	}
-	
+
 	// check if instance already exists
 	QStringList fileList;
 	foreach (QString param, app.arguments()) {
 		fileList << QFileInfo(param).absoluteFilePath();
 	}
-	
+
 	if ( app.sendMessage(fileList.join("\n")) )
 		return 0;
 
@@ -169,13 +172,15 @@ int runSingle(int argc, char* argv[]) {
 
 int runNotSingle(int argc, char* argv[]) {
 	QApplication app(argc, argv);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
         app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+#endif
 	initApp(app);
 
 	if ( hasValidDoubleDashParam( app ) ) {
 		return 0;
 	}
-	
+
 	JuffEd juffed;
 
 	juffed.mainWindow()->show();