diff --git a/click/fix-compilation-with-clickable.patch b/click/fix-compilation-with-clickable.patch new file mode 100644 index 00000000..86bd207d --- /dev/null +++ b/click/fix-compilation-with-clickable.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 01f62a1a8..71db29e2f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -86,7 +86,7 @@ target_link_libraries( + + cmake_policy(SET CMP0063 NEW) + set(CMAKE_CXX_EXTENSIONS OFF) +-set(CMAKE_CXX_STANDARD 17) ++set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_VISIBILITY_PRESET hidden) + set(CMAKE_C_EXTENSIONS OFF) +diff --git a/platform/qt/src/mbgl/http_file_source.cpp b/platform/qt/src/mbgl/http_file_source.cpp +index a2a13c5e1..a4ac0c58e 100644 +--- a/platform/qt/src/mbgl/http_file_source.cpp ++++ b/platform/qt/src/mbgl/http_file_source.cpp +@@ -45,7 +45,8 @@ void HTTPFileSource::Impl::request(HTTPRequest* req) + #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) + connect(data.first, &QNetworkReply::errorOccurred, this, &HTTPFileSource::Impl::onReplyFinished); + #else +- connect(data.first, &QNetworkReply::error, this, &HTTPFileSource::Impl::onReplyFinished); ++ connect(data.first, SIGNAL(error()), this, SLOT(onReplyFinished())); ++ //connect(data.first, &QNetworkReply::error, this, &HTTPFileSource::Impl::onReplyFinished); + #endif + } + diff --git a/clickable.yaml b/clickable.yaml index 4308e62c..8282060f 100644 --- a/clickable.yaml +++ b/clickable.yaml @@ -39,9 +39,33 @@ libraries: - git -C ${SRC_DIR} pull || git clone https://github.com/sailfishos/nemo-qml-plugin-dbus ${SRC_DIR} builder: qmake + maplibre-gl-native: + src_dir: 3rdparty/maplibre-gl-native + prebuild: + - mkdir -p ${ROOT}/3rdparty + - git -C ${SRC_DIR} pull || git clone -b qt-v2.0.1 --recursive --shallow-submodules --depth 1 https://github.com/maplibre/maplibre-gl-native.git ${SRC_DIR} + - git apply --directory ${SRC_DIR} ${ROOT}/click/fix-compilation-with-clickable.patch || /bin/true + builder: cmake + build_args: + - -DMBGL_WITH_QT=ON + - -DMBGL_WITH_WERROR=OFF + - -DMBGL_WITH_QT_HEADLESS=OFF + - -DMBGL_QT_LIBRARY_ONLY=ON + - -DMBGL_QT_STATIC=OFF + + mapbox-gl-qml: + src_dir: 3rdparty/mapbox-gl-qml + prebuild: + - mkdir -p ${ROOT}/3rdparty + - git -C ${SRC_DIR} pull || git clone -b 2.1.1 --recursive --shallow-submodules --depth 1 https://github.com/rinigus/mapbox-gl-qml.git ${SRC_DIR} + builder: cmake + build_args: + - -DCMAKE_CXX_STANDARD=14 + install_lib: - ${NEMO_QML_PLUGIN_DBUS_LIB_INSTALL_DIR}/usr/lib/${ARCH_TRIPLET}/libnemodbus.so* - ${QTMPRIS_LIB_INSTALL_DIR}/usr/lib/${ARCH_TRIPLET}/libmpris-qt5.so* +- ${MAPLIBRE_GL_NATIVE_LIB_INSTALL_DIR}/lib/libQMapLibreGL.so* - /usr/lib/${ARCH_TRIPLET}/libKDb3.so* - /usr/lib/${ARCH_TRIPLET}/libKF5BluezQt.so* install_data: @@ -49,4 +73,5 @@ install_data: install_qml: - ${NEMO_QML_PLUGIN_DBUS_LIB_INSTALL_DIR}/usr/lib/${ARCH_TRIPLET}/qt5/qml/Nemo/DBus - ${QTMPRIS_LIB_INSTALL_DIR}/usr/lib/${ARCH_TRIPLET}/qt5/qml/org/nemomobile/mpris +- ${MAPBOX_GL_QML_LIB_INSTALL_DIR}/usr/lib/${ARCH_TRIPLET}/qt5/qml/MapboxMap - /usr/lib/${ARCH_TRIPLET}/qt5/qml/org/kde/bluezqt diff --git a/ui/qml/components/platform.uuitk/IconPL.qml b/ui/qml/components/platform.uuitk/IconPL.qml index 7166d95b..4b8fd7e3 100644 --- a/ui/qml/components/platform.uuitk/IconPL.qml +++ b/ui/qml/components/platform.uuitk/IconPL.qml @@ -31,6 +31,7 @@ Icon { property string iconName property string iconSource property int iconWidth: 0 + keyColor: "#ffffff" Component.onCompleted: { if (iconColorize) color = styler.themeHighlightColor; diff --git a/ui/qml/components/platform.uuitk/StylerPL.qml b/ui/qml/components/platform.uuitk/StylerPL.qml index f4730fa8..82647b61 100644 --- a/ui/qml/components/platform.uuitk/StylerPL.qml +++ b/ui/qml/components/platform.uuitk/StylerPL.qml @@ -116,6 +116,10 @@ QtObject { property string iconFavoriteSelected: "image://theme/bookmark" // "Donate" property string customIconPrefix: "../../pics/custom-icons/" + property string customIconSuffix: ".png" + + property string iconLocation: "image://theme/location" + property string iconClock: "image://theme/clock" // item sizes property real themeItemSizeLarge: themeFontSizeLarge * 3 diff --git a/ui/qml/custom-icons/icon-m-heartrate2.png b/ui/qml/custom-icons/icon-m-heartrate2.png index 1d433c04..28d06830 100644 Binary files a/ui/qml/custom-icons/icon-m-heartrate2.png and b/ui/qml/custom-icons/icon-m-heartrate2.png differ diff --git a/ui/qml/custom-icons/icon-m-steps2.png b/ui/qml/custom-icons/icon-m-steps2.png index e62cd563..dee1bf33 100644 Binary files a/ui/qml/custom-icons/icon-m-steps2.png and b/ui/qml/custom-icons/icon-m-steps2.png differ