fix: can not build if the "Qt5Xdg" package version is not 2.0.0

Change-Id: I9ba09cbafa6e8590a4555c5d99af2f551ba8046f
linuxdeepin · Jun 4, 2018 · 444f3a4 · 444f3a4
1 parent d5a1ba9
commit 444f3a4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,5 @@ Makefile*
 
 # QtCtreator CMake
 CMakeLists.txt.user
+
+platformthemeplugin/NUL
diff --git a/platformthemeplugin/main.cpp b/platformthemeplugin/main.cpp
@@ -18,7 +18,7 @@
 #include <qpa/qplatformthemeplugin.h>
 #include "qdeepintheme.h"
 
-#include <qt5xdgiconloader/2.0.0/private/xdgiconloader/xdgiconloader_p.h>
+#include <private/xdgiconloader/xdgiconloader_p.h>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/platformthemeplugin/qt5deepintheme-plugin.pro b/platformthemeplugin/qt5deepintheme-plugin.pro
@@ -25,6 +25,9 @@ CONFIG += plugin link_pkgconfig c++11
 
 PKGCONFIG += mtdev Qt5Xdg gtk+-2.0 x11 Qt5XdgIconLoader dtkcore
 
+PKG_CONFIG = $$pkgConfigExecutable()
+INCLUDEPATH += $$system($$PKG_CONFIG --variable includedir Qt5XdgIconLoader)/qt5xdgiconloader/$$system($$PKG_CONFIG --modversion Qt5XdgIconLoader)
+
 PLUGIN_TYPE = platformthemes
 PLUGIN_EXTENDS = -
 PLUGIN_CLASS_NAME = QDeepinTheme
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,3 +39,5 @@ Makefile*

		# QtCtreator CMake
		CMakeLists.txt.user

		platformthemeplugin/NUL