From 2e0b7d0eace21920b37438ab9476999292f2bdd0 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 26 Jan 2022 17:20:35 +0800
Subject: [PATCH] qt pro file

---
 DSView/config.h                   |  4 ++--
 DSView/main.cpp                   |  5 +++++
 DSView/pv/widgets/decodermenu.cpp |  7 +++++--
 qtpro/DSView.pro                  | 20 +++++---------------
 qtpro/DSView.pro.user             |  6 +++---
 5 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/DSView/config.h b/DSView/config.h
index 25d9638f..067e528a 100755
--- a/DSView/config.h
+++ b/DSView/config.h
@@ -27,9 +27,9 @@
 
 /* DSView version information */
 #define DS_VERSION_MAJOR 1
-#define DS_VERSION_MINOR 5
+#define DS_VERSION_MINOR 2
 #define DS_VERSION_MICRO 0
-#define DS_VERSION_STRING "1.5.0"
+#define DS_VERSION_STRING "1.2.0"
 
 #define DS_DEBUG_TRACE
 
diff --git a/DSView/main.cpp b/DSView/main.cpp
index 7a4845d2..e038ae68 100755
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -111,6 +111,11 @@ int main(int argc, char *argv[])
     QApplication::setOrganizationName("DreamSourceLab");
     QApplication::setOrganizationDomain("www.DreamSourceLab.com");
 
+#ifdef Q_OS_LINUX
+	QCoreApplication::addLibraryPath("/usr/lib/x86_64-linux-gnu/qt5/plugins");
+	printf("qt plugins root:/usr/lib/x86_64-linux-gnu/qt5/plugins\n");
+#endif
+
 	AppControl *control = AppControl::Instance();
 
 	// Parse arguments
diff --git a/DSView/pv/widgets/decodermenu.cpp b/DSView/pv/widgets/decodermenu.cpp
index 39b1c156..f0a7a201 100755
--- a/DSView/pv/widgets/decodermenu.cpp
+++ b/DSView/pv/widgets/decodermenu.cpp
@@ -50,8 +50,11 @@ DecoderMenu::DecoderMenu(QWidget *parent, bool first_level_decoder) :
 	}
 	g_slist_free(l);
 
-	connect(&_mapper, SIGNAL(mapped(QObject*)),
-		this, SLOT(on_action(QObject*)));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	connect(&_mapper, SIGNAL(mappedObject(QObject*)), this, SLOT(on_action(QObject*)));
+#else
+	connect(&_mapper, SIGNAL(mapped(QObject*)), this, SLOT(on_action(QObject*)));
+#endif
 }
 
 int DecoderMenu::decoder_name_cmp(const void *a, const void *b)
diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro
index 53e0acad..3ee34059 100644
--- a/qtpro/DSView.pro
+++ b/qtpro/DSView.pro
@@ -32,6 +32,7 @@ CONFIG += c++11
 QT += widgets
 QMAKE_CFLAGS_ISYSTEM = -I
 
+CONFIG += release
 
 TARGET = DSView
 TEMPLATE = app
@@ -69,9 +70,6 @@ INCLUDEPATH += ..
 
 LIBS += /usr/lib/x86_64-linux-gnu/libglib-2.0.so
 LIBS += /usr/lib/x86_64-linux-gnu/libusb-1.0.so
-LIBS += /usr/lib/x86_64-linux-gnu/libboost_thread.so
-LIBS += /usr/lib/x86_64-linux-gnu/libboost_system.so
-LIBS += /usr/lib/x86_64-linux-gnu/libboost_filesystem.so
 LIBS += /usr/lib/x86_64-linux-gnu/libpython3.8.so
 LIBS += /usr/lib/x86_64-linux-gnu/libfftw3.so
 LIBS += /usr/local/lib/libz.so.1.2.11
@@ -87,20 +85,12 @@ INCLUDEPATH += /usr/local/include/boost
 INCLUDEPATH += /Library/Frameworks/Python.framework/Versions/3.4/include/python3.4m
 INCLUDEPATH += ..
 
-#LIBS += -framework CoreFoundation
-#LIBS += -framework CoreServices
-#LIBS += /usr/lib/libiconv.2.dylib
-#LIBS += /usr/local/lib/libpcre.a
-#LIBS += /usr/local/opt/gettext/lib/libintl.a
-#LIBS += /usr/lib/libz.1.dylib
-#LIBS += /usr/lib/libobjc.dylib
-
 LIBS += /usr/local/lib/libglib-2.0.dylib
 LIBS += /usr/local/lib/libusb-1.0.dylib
-LIBS += /usr/local/lib/libboost_atomic-mt.a
-LIBS += /usr/local/lib/libboost_thread-mt.a
-LIBS += /usr/local/lib/libboost_system-mt.a
-LIBS += /usr/local/lib/libboost_filesystem-mt.a
+#LIBS += /usr/local/lib/libboost_atomic-mt.a
+#LIBS += /usr/local/lib/libboost_thread-mt.a
+#LIBS += /usr/local/lib/libboost_system-mt.a
+#LIBS += /usr/local/lib/libboost_filesystem-mt.a
 LIBS += /Library/Frameworks/Python.framework/Versions/3.4/lib/libpython3.4.dylib
 LIBS += /usr/local/lib/libfftw3.a
 }
diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user
index 37a2b3e0..99eacae7 100644
--- a/qtpro/DSView.pro.user
+++ b/qtpro/DSView.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2022-01-12T18:07:11. -->
+<!-- Written by QtCreator 4.11.0, 2022-01-26T13:47:05. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -82,7 +82,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">桌面</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">桌面</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ce867f0c-ef0e-4256-b807-c2554ad78bbf}</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -141,7 +141,7 @@
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
       <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">true</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
       <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
      </valuemap>