fix: windows build failed

Change-Id: Ie4df47e550a3c42552e1067ca7059e3369258825
linuxdeepin · Nov 24, 2017 · 66c4c81 · 66c4c81
1 parent 707b430
commit 66c4c81
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/dtkcore.pro b/dtkcore.pro
@@ -4,5 +4,8 @@ CONFIG += ordered
 
 SUBDIRS +=   \
     src \
-    tool \
     tests
+
+linux {
+SUBDIRS += tool
+}
diff --git a/src/filesystem/filesystem.pri b/src/filesystem/filesystem.pri
@@ -1,5 +1,7 @@
 include($$PWD/private/private.pri)
 
+INCLUDEPATH += $$PWD/../base
+
 HEADERS += \
     $$PWD/dbasefilewatcher.h \
     $$PWD/dfilesystemwatcher.h \

diff --git a/src/settings/settings.pri b/src/settings/settings.pri
@@ -1,19 +1,27 @@
+linux {
+    PKGCONFIG += gsettings-qt
+
+SOURCES += \
+    $$PWD/backend/gsettingsbackend.cpp
+
+HEADERS +=\
+    $$PWD/backend/gsettingsbackend.h
+}
+
 INCLUDEPATH += $$PWD
 
 SOURCES += \
     $$PWD/backend/qsettingbackend.cpp \
     $$PWD/dsettings.cpp \
     $$PWD/dsettingsoption.cpp \
-    $$PWD/dsettingsgroup.cpp \
-    $$PWD/backend/gsettingsbackend.cpp
+    $$PWD/dsettingsgroup.cpp
 
 HEADERS +=\
     $$PWD/backend/qsettingbackend.h \
     $$PWD/dsettings.h \
     $$PWD/dsettingsoption.h \
     $$PWD/dsettingsgroup.h \
-    $$PWD/dsettingsbackend.h \
-    $$PWD/backend/gsettingsbackend.h
+    $$PWD/dsettingsbackend.h
 
 includes.files += $${PWD}/*.h
 includes.files += $${PWD}/backend/*.h

diff --git a/src/src.pro b/src/src.pro
@@ -3,7 +3,6 @@ include($$PWD/lib.pri)
 QT -= gui
 QT += dbus
 CONFIG += link_pkgconfig
-PKGCONFIG += gsettings-qt
 
 TARGET = dtkcore
 

diff --git a/tests/tests.pro b/tests/tests.pro
@@ -3,7 +3,6 @@ QT += testlib
 QT -= gui
 CONFIG += testcase c++11 link_pkgconfig
 TARGET = tests
-PKGCONFIG += gsettings-qt
 
 SOURCES += \
     main.cpp \