Add zxing-cpp

Author: KangLin

.github/workflows/msvc.yml

@@ -163,6 +163,32 @@ jobs:
             cmake --install . --config ${{matrix.BUILD_TYPE}} --strip
           )
 
+      - name: build zxing-cpp
+        working-directory: ${{env.SOURCE_DIR}}
+        run: |
+          IF NOT EXIST ${{env.INSTALL_DIR}}/lib/cmake/ZXing (
+            git clone -b v3.0.2 https://github.com/zxing-cpp/zxing-cpp.git
+            cd zxing-cpp
+            cmake -E make_directory build
+            cd build
+            cmake .. ^
+                -A ${{matrix.CMAKE_GENERATOR_PLATFORM}} ^
+                -T ${{matrix.VCPKG_PLATFORM_TOOLSET}} ^
+                -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} ^
+                -DCMAKE_INSTALL_PREFIX="${{env.INSTALL_DIR}}" ^
+                -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ^
+                -DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake" ^
+                -DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/tigervnc/vcpkg_installed ^
+                -DVCPKG_VERBOSE=ON ^
+                -DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} ^
+                -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON ^
+                -DVCPKG_APPLOCAL_DEPS=ON ^
+                -DVCPKG_TRACE_FIND_PACKAGE=ON ^
+                -DZXING_EXAMPLES=OFF
+            cmake --build . --config ${{matrix.BUILD_TYPE}}
+            cmake --install . --config ${{matrix.BUILD_TYPE}} --strip
+          )
+
       - name: git clone RabbitCommon
         working-directory: ${{env.SOURCE_DIR}}
         run: git clone https://github.com/KangLin/RabbitCommon.git

Package/rpm/rabbitim.spec

@@ -33,7 +33,7 @@ Requires: zlib gnutls nettle gmp pam
 Requires: qt6-qtbase qt6-qtbase-mysql qt6-qtbase-odbc qt6-qtbase-postgresql
 Requires: qt6-qtmultimedia qt6-qt5compat qt6-qtscxml qt6-qtsvg
 Requires: qt6-qtpositioning qt6-qtspeech
-Requires: qxmpp-qt6
+Requires: qxmpp-qt6 zxing-cpp
 Requires: mysql-libs
 
 %description
@@ -72,7 +72,7 @@ cmake . -B $RPM_BUILD_DIR  \
     -DWITH_CMARK_GFM=ON \
     -DENABLE_UPDATE_TRANSLATIONS=ON \
     -DRABBIT_ENABLE_INSTALL_TARGETS=ON \
-    -DINSTALL_QZXING=ON
+    -DINSTALL_ZXING_CPP=ON
 cmake --build $RPM_BUILD_DIR --config Release --parallel $(nproc)
 
 %install

Plugin/App/QRCode/CMakeLists.txt

@@ -1,6 +1,6 @@
 #QZXing库
-OPTION(OPTION_RABBITIM_USE_QZXING "Use QZXing library" ON)
-if(OPTION_RABBITIM_USE_QZXING)
+OPTION(RABBITIM_USE_QZXING "Use QZXing library" ON)
+if(RABBITIM_USE_QZXING)
     FIND_PACKAGE(qzxing)
     if(NOT qzxing_FOUND)
         message("Download from https://github.com/ftylitak/qzxing.git")

Plugin/Protocol/ProtocolQXmpp/CMakeLists.txt

@@ -1,5 +1,5 @@
 #qxmpp库
-#OPTION(OPTION_RABBITIM_USE_QXMPP "Use qxmpp library" ON)
+#OPTION(RABBITIM_USE_QXMPP "Use qxmpp library" ON)
 PROJECT(ProtocolQXmpp)
 if(${QT_VERSION_MAJOR} EQUAL 6)
     SET(QXMPP_NAME QXmppQt6)

Script/build_depend.sh

@@ -38,6 +38,7 @@ fi
 RabbitCommon=0
 QXMPP=0
 QZXING=0
+ZXING_CPP=0
 
 # Display detailed usage information
 usage_long() {
@@ -107,7 +108,7 @@ parse_with_getopt() {
     # 后面没有冒号表示没有参数。后跟有一个冒号表示有参数。跟两个冒号表示有可选参数。
     # -l 或 --long 选项后面是可接受的长选项，用逗号分开，冒号的意义同短选项。
     # -n 选项后接选项解析错误时提示的脚本名字
-    OPTS=help,install:,source:,tools:,build:,verbose::,package:,package-tool:,system_update::,system-update::,base::,default::,default-qt5::,default-qt6::,macos::,qt::,rabbitcommon::,qxmpp::,qzxing::
+    OPTS=help,install:,source:,tools:,build:,verbose::,package:,package-tool:,system_update::,system-update::,base::,default::,default-qt5::,default-qt6::,macos::,qt::,rabbitcommon::,qxmpp::,qzxing::,zxing-cpp::
 
     # Parse arguments using getopt
     # -o: short options
@@ -280,6 +281,17 @@ parse_with_getopt() {
             esac
             shift 2
             ;;
+        --zxing-cpp)
+            case "$2" in
+                "")
+                    ZXING_CPP=1
+                    ;;
+                *)
+                    ZXING_CPP="$2"
+                    ;;
+            esac
+            shift 2
+            ;;
         --) # End of options
             shift
             break
@@ -337,6 +349,7 @@ show_configuration() {
         echo "  RabbitCommon: $RabbitCommon"
         echo "  QXMPP: $QXMPP"
         echo "  QZXing: $QZXing"
+        echo "  ZXing: $ZXING_CPP"
         echo ""
         echo "Other Settings:"
         echo "  Verbose Mode: $BUILD_VERBOSE"
@@ -511,16 +524,20 @@ if [ $DEFAULT_LIBS -eq 1 ]; then
                     qt6-svg-dev qt6-l10n-tools qt6-translations-l10n \
                     qt6-scxml-dev qt6-multimedia-dev qt6-positioning-dev \
                     libqt6sql6-mysql libqt6sql6-sqlite libqt6sql6-odbc libqt6sql6-psql \
-                    qt6-speech-dev
+                    qt6-speech-dev libqt6qml6
             fi
         else
             if [ $QT -ne 1 ]; then
                 package_install qt5-qmake qtbase5-dev qtbase5-dev-tools qttools5-dev \
                     qtmultimedia5-dev libqt5scxml5-dev libqt5svg5-dev libqt5gstreamer-dev \
-                    qtquickcontrols2-5-dev libqt5multimedia5-plugins
+                    qtquickcontrols2-5-dev libqt5multimedia5-plugins libqt5qml5
             fi
             package_install libqxmpp-dev
         fi
+        if [ $ZXING_CPP -ne 1 ]; then
+            package_install libzxing-dev
+        fi
+
     fi # apt
 
     if [ "$PACKAGE_TOOL" = "dnf" ]; then
@@ -538,7 +555,7 @@ if [ $DEFAULT_LIBS -eq 1 ]; then
     fi
 
     if [ $MACOS -eq 1 ]; then
-        package_install qt
+        package_install qt zxing-cpp
     fi
 fi
 
@@ -636,5 +653,27 @@ if [ $QZXING -eq 1 ]; then
     popd
 fi
 
+if [ $ZXING_CPP -eq 1 ]; then
+    echo_status "Install zxing-cpp ......"
+    pushd "$SOURCE_DIR"
+    if [ ! -d ${INSTALL_DIR}/${LIB_PATH}/cmake/ZXing ]; then
+        if [ ! -d qzxing ]; then
+            git clone -b v3.0.2 https://github.com/zxing-cpp/zxing-cpp.git
+            cd zxing-cpp
+            git submodule update --init --recursive
+        fi
+        cmake -E make_directory $BUILD_DEPEND_DIR/zxing-cpp
+        pushd $BUILD_DEPEND_DIR/zxing-cpp
+        cmake -S $SOURCE_DIR/zxing-cpp -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
+            -DCMAKE_VERBOSE_MAKEFILE=${BUILD_VERBOSE} \
+            -DZXING_EXAMPLES=OFF
+        cmake --build . --config Release --parallel $(nproc)
+        cmake --install . --config Release
+        popd
+    fi
+    popd
+fi
+
 popd
 popd

Script/build_linux.sh

@@ -470,7 +470,7 @@ if [ $DEB -eq 1 ]; then
     echo_status "build deb package ......"
 
     ./build_depend.sh --system_update --base --default ${DEFAULT_QT} \
-        --rabbitcommon --qzxing \
+        --rabbitcommon --qzxing --zxing-cpp \
         --install=${INSTALL_DIR} \
         --source=${SOURCE_DIR} \
         --tools=${TOOLS_DIR} \
@@ -483,7 +483,7 @@ if [ $DEB -eq 1 ]; then
         git config --global --add safe.directory $REPO_ROOT
     fi
 
-    export CMAKE_CONFIG_PARAS="$CMAKE_CONFIG_PARAS -DINSTALL_QZXING=ON "
+    export CMAKE_CONFIG_PARAS="$CMAKE_CONFIG_PARAS -DINSTALL_QZXING=ON -DINSTALL_ZXING_CPP=ON"
     ./build_debpackage.sh --install=${INSTALL_DIR} \
         --rabbitcommon=${SOURCE_DIR}/RabbitCommon \
         --verbose=${BUILD_VERBOSE}
@@ -522,7 +522,7 @@ if [ $APPIMAGE -eq 1 ]; then
     export CMAKE_PREFIX_PATH=${INSTALL_DIR}:${CMAKE_PREFIX_PATH}
 
     ./build_depend.sh --system_update --base --default ${DEFAULT_QT} \
-        --rabbitcommon --qzxing ${depend_para} \
+        --rabbitcommon --qzxing --zxing-cpp ${depend_para} \
         --install=${INSTALL_DIR} \
         --source=${SOURCE_DIR} \
         --tools=${TOOLS_DIR} \
@@ -542,7 +542,7 @@ if [ $RPM -eq 1 ]; then
     echo_status "build rpm package ......"
     #dnf builddep -y ${REPO_ROOT}/Package/rpm/RabbitIm.spec
     ./build_depend.sh --system_update --base --default --package-tool=dnf \
-        --rabbitcommon \
+        --rabbitcommon --zxing-cpp \
         --install=${INSTALL_DIR} \
         --source=${SOURCE_DIR} \
         --tools=${TOOLS_DIR} \

Src/CMakeLists.txt

@@ -5,8 +5,8 @@ project(RabbitIm)
 set(QT_COMPONENTS Multimedia Xml Network)
 
 #QZXing库
-OPTION(OPTION_RABBITIM_USE_QZXING "Use QZXing library" ON)
-if(OPTION_RABBITIM_USE_QZXING)
+OPTION(RABBITIM_USE_QZXING "Use QZXing library" ON)
+if(RABBITIM_USE_QZXING)
     FIND_PACKAGE(qzxing)
     if(qzxing_FOUND)
         list(APPEND RABBITIM_DEFINES RABBITIM_USE_QZXING)
@@ -21,6 +21,20 @@ if(OPTION_RABBITIM_USE_QZXING)
 endif()
 message("Found QZXing: ${qzxing_FOUND}")
 
+OPTION(RABBITIM_USE_ZXING_CPP "Use zxing-cpp library" ON)
+if(RABBITIM_USE_ZXING_CPP)
+    find_package(ZXing)
+    if(ZXing_FOUND)
+        message("ZXing version: ${ZXing_VERSION}")
+        list(APPEND RABBITIM_PRIVATE_LIBS ZXing::ZXing)
+        list(APPEND RABBITIM_DEFINES RABBITIM_USE_ZXING_CPP)
+        OPTION(INSTALL_ZXING_CPP "Install ZXing-cpp target" OFF)
+        if(INSTALL_ZXING_CPP)
+            INSTALL_TARGETS(TARGETS ZXing::ZXing)
+        endif()
+    endif()
+endif()
+
 include(Files.cmake)
 
 #资源
@@ -84,6 +98,7 @@ endforeach()
 ADD_TARGET(NAME ${PROJECT_NAME}
     SOURCE_FILES ${RABBITIM_SOURCES} ${HEADER_FILES} ${RABBITIM_UIS} ${RABBITIM_RCC_FILES}
     LIBS ${RABBITIM_LIBS} ${QT_LIBRARIES}
+    PRIVATE_LIBS ${RABBITIM_PRIVATE_LIBS}
     DEFINITIONS RABBITCOMMON ${RABBITIM_DEFINES}
         RabbitIm_VERSION="${RabbitIm_VERSION}"
         RabbitIm_REVISION="${RabbitIm_REVISION}"

Src/Emoji/Emoji.cpp

@@ -324,4 +324,5 @@ void CEmoji::onSmileyPackChanged()
 {
     loadingMutex.lock();
     QtConcurrent::run(&load, CGlobal::Instance()->GetFileEmoji(), this);
+    return;
 }

Src/Files.cmake

@@ -1,4 +1,4 @@
-SET(INSTALL_HEADER_FILES
+list(APPEND INSTALL_HEADER_FILES
     common/QRCode.h
     common/Tool.h
     Client/Client.h
@@ -11,7 +11,7 @@ SET(INSTALL_HEADER_FILES
     FileTransfer/FileTransfer.h
     )
 
-SET(RABBITIM_HEADER_FILES ${INSTALL_HEADER_FILES}
+list(APPEND RABBITIM_HEADER_FILES ${INSTALL_HEADER_FILES}
     MainWindow.h
     Widgets/MainAnimation.h
     Widgets/FrmLogin/FrmLogin.h
@@ -43,7 +43,7 @@ SET(RABBITIM_HEADER_FILES ${INSTALL_HEADER_FILES}
     ${CMAKE_SOURCE_DIR}/Plugin/ManagePluginProtocol.h
     )
 
-SET(RABBITIM_SOURCES
+list(APPEND RABBITIM_SOURCES
     MainWindow.cpp 
     common/Tool.cpp 
     common/QRCode.cpp 
@@ -112,7 +112,7 @@ SET(RABBITIM_SOURCES
     Widgets/MainAnimation.cpp
 )
 
-SET(RABBITIM_UIS
+list(APPEND RABBITIM_UIS
     MainWindow.ui 
     Widgets/FrmLogin/FrmLogin.ui 
     Widgets/FrmUserList/FrmUserList.ui