From f18f186b4647e643f34f3e80213855701e8efa2a Mon Sep 17 00:00:00 2001
From: Boyuan Yang
Date: Sun, 13 Sep 2020 09:12:48 -0400
Subject: [PATCH] Fix windows build badge and typos
* Drop qmake build-dependency from CI, they should not be installed
since we have switched to CMake.
* Update README.md badges to reflect recent Windows CI updates.
* Set doc badge to point to flameshot.org website.
* Fix a typo in src/CMakeLists.txt.
---
.github/workflows/Linux-pack.yml | 3 +--
.github/workflows/build_cmake.yml | 3 +--
README.md | 8 ++++----
src/CMakeLists.txt | 2 +-
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml
index cc8f1894..65cd4a1b 100644
--- a/.github/workflows/Linux-pack.yml
+++ b/.github/workflows/Linux-pack.yml
@@ -138,7 +138,6 @@ jobs:
extra-cmake-modules \
build-essential \
qt5-default \
- qt5-qmake \
qttools5-dev-tools \
qttools5-dev \
libqt5dbus5 \
@@ -239,4 +238,4 @@ jobs:
run: |
echo "=======================snap downlod link======================"
echo $(sh $GITHUB_WORKSPACE/scripts/upload_services/${UPLOAD_SERVICE}.sh ${{ steps.snapcraft.outputs.snap }})
- echo "=====no operation for you can see link in the log console====="
\ No newline at end of file
+ echo "=====no operation for you can see link in the log console====="
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index 197d472b..99a7e5fc 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -35,7 +35,6 @@ jobs:
extra-cmake-modules \
build-essential \
qt5-default \
- qt5-qmake \
qttools5-dev-tools \
qttools5-dev \
libqt5dbus5 \
@@ -122,4 +121,4 @@ jobs:
working-directory: build
shell: powershell
run: |
- cmake --build . --config $env:BUILD_TYPE
\ No newline at end of file
+ cmake --build . --config $env:BUILD_TYPE
diff --git a/README.md b/README.md
index 91864d1e..7776aac4 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,10 @@
-
+
-
-
+
+
@@ -25,7 +25,7 @@
-
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 05a949dd..cc616d8e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -67,7 +67,7 @@ target_sources(
${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/src/color_wheel.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/include/color_wheel.hpp
${CMAKE_CURRENT_SOURCE_DIR}/../data/graphics.qrc
- ${CMAKE_CURRENT_SOURCE_DIR}/../data/icon.rc # flamshot binary icon resource file
+ ${CMAKE_CURRENT_SOURCE_DIR}/../data/icon.rc # windows binary icon resource file
${QM_FILES}
main.cpp)