fix: windows build failed
authorIceyer <me@iceyer.net>
Fri, 24 Nov 2017 09:19:38 +0000 (17:19 +0800)
committerIceyer <me@iceyer.net>
Fri, 24 Nov 2017 09:33:17 +0000 (17:33 +0800)
Change-Id: Ie4df47e550a3c42552e1067ca7059e3369258825

dtkcore.pro
src/filesystem/filesystem.pri
src/settings/settings.pri
src/src.pro
tests/tests.pro

index 3138b6c8eccc30e043933a34d4e620b84a9c3a2f..9fe4a1e6d8b54da4d8c09f4319e09cff4512090d 100644 (file)
@@ -4,5 +4,8 @@ CONFIG += ordered
 
 SUBDIRS +=   \
     src \
-    tool \
     tests
+
+linux {
+SUBDIRS += tool
+}
index 0b53c1447519a6e705a2f3482ba325370ff9347a..86d929bb52e99665b5a246028f20f51c759a8c66 100644 (file)
@@ -1,5 +1,7 @@
 include($$PWD/private/private.pri)
 
+INCLUDEPATH += $$PWD/../base
+
 HEADERS += \
     $$PWD/dbasefilewatcher.h \
     $$PWD/dfilesystemwatcher.h \
index b32595af5e81f0ba9a75986772ccf77e157efe60..0e6133cf4a33226c3dbb5b4b8b78f0ca3253c5b1 100644 (file)
@@ -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
index f31ec0c313182a34af46db852a81c732bab53c8f..199932dffb670947eb3423b17cfcd0852714f957 100644 (file)
@@ -3,7 +3,6 @@ include($$PWD/lib.pri)
 QT -= gui
 QT += dbus
 CONFIG += link_pkgconfig
-PKGCONFIG += gsettings-qt
 
 TARGET = dtkcore
 
index ac6396235b11173287e94707bf5bb52d88227c46..78558832966feb244068a3f3a75623f0aa01028e 100644 (file)
@@ -3,7 +3,6 @@ QT += testlib
 QT -= gui
 CONFIG += testcase c++11 link_pkgconfig
 TARGET = tests
-PKGCONFIG += gsettings-qt
 
 SOURCES += \
     main.cpp \