From 08617e8d80e71269151e38a2eb04addc076d29a7 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sat, 22 Sep 2018 11:10:15 +0800 Subject: [PATCH] Support using dynamic library of qqmlsortfilterproxymodel. --- include/SortFilterProxyModel | 2 +- spectral.pro | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/SortFilterProxyModel b/include/SortFilterProxyModel index 3c2c125..1efea2b 160000 --- a/include/SortFilterProxyModel +++ b/include/SortFilterProxyModel @@ -1 +1 @@ -Subproject commit 3c2c125c7c3b21650e57c61c4bb5fe064a36eb7c +Subproject commit 1efea2b6003dcc23e0b0d9787cbdef2cf557636d diff --git a/spectral.pro b/spectral.pro index 10f53d4..0ad080d 100644 --- a/spectral.pro +++ b/spectral.pro @@ -12,9 +12,16 @@ packagesExist(QMatrixClient) { message("Found libQMatrixClient via pkg-config.") PKGCONFIG += QMatrixClient } else { + messge("Build libQMatrixClient from source.") include(include/libqmatrixclient/libqmatrixclient.pri) } -include(include/SortFilterProxyModel/SortFilterProxyModel.pri) +packagesExist(SortFilterProxyModel) { + message("Found qqmlsortfilterproxymodel via pkg-config.") + PKGCONFIG += SortFilterProxyModel +} else { + messge("Build qqmlsortfilterproxymodel from source.") + include(include/SortFilterProxyModel/SortFilterProxyModel.pri) +} # The following define makes your compiler emit warnings if you use # any feature of Qt which as been marked deprecated (the exact warnings