Bump version to 0.4, update project build files

Author: emericg

CMakeLists.txt

@@ -1,17 +1,19 @@
 cmake_minimum_required(VERSION 3.20)
 
-project(QmlMobileScanner VERSION 0.3 LANGUAGES C CXX)
+project(QmlMobileScanner VERSION 0.4 LANGUAGES C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-string(TIMESTAMP CURRENT_TIMESTAMP "%s" UTC)
 set(APP_NAME ${CMAKE_PROJECT_NAME})
 set(APP_VERSION ${CMAKE_PROJECT_VERSION})
-set(APP_VERSION_CODE ${TIMESTAMP})
+
+option(USE_QZXING "Build with QZXing support (decoder&encoder)" OFF)
+option(USE_ZXINGCPP "Build with zxing-cpp support (decoder&encoder)" ON)
+option(USE_ZINT "Build with zint support (encoder)" OFF)
 
 ################################################################################
 
@@ -51,7 +53,7 @@ set(SOURCES
     thirdparty/IconLibrary/IconLibrary_material.qrc
 )
 
-if(IOS OR ANDROID)
+if (IOS OR ANDROID)
     # Mobile
     set(QAPPLICATION_CLASS QGuiApplication)
 else()
@@ -128,14 +130,12 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE
     Qt6::QuickControls2
 )
 
-if(NOT IOS AND NOT ANDROID)
+if (NOT IOS AND NOT ANDROID)
     # for proper systray and menubar support
     find_package(Qt6 REQUIRED COMPONENTS Widgets)
     target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt6::Widgets)
 endif()
 
-add_definitions(-DENABLE_ZXING)
-
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     #
 endif()
@@ -160,30 +160,44 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE MobileSharing)
 add_subdirectory(thirdparty/ComponentLibrary)
 target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ComponentLibraryplugin)
 
-# QZxing-cpp
-#set(qzxing true)
-#add_definitions(-Dqzxing)
-#add_subdirectory(thirdparty/QZXing)
-#target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE QZXing)
+if (USE_ZXINGCPP)
+    # build zxing-cpp
+    add_subdirectory(thirdparty/zxing-cpp)
+    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ZXing)
+
+    # build zxing-cpp Qt wrapper
+    add_subdirectory(thirdparty/zxing-cpp/wrappers/qt)
+    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ZXingQt)
+
+    set(zxingcpp true)
+    add_definitions(-Dzxingcpp)
+elseif (USE_QZXING)
+    # build QZxing
+    add_subdirectory(thirdparty/QZXing)
+    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE QZXing)
 
-# zxing-cpp
-add_subdirectory(thirdparty/zxing-cpp)
-target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ZXing)
+    set(qzxing true)
+    add_definitions(-Dqzxing)
+else()
+endif()
 
-# zxing-cpp Qt wrapper
-set(zxingcpp true)
-add_definitions(-Dzxingcpp)
-add_subdirectory(thirdparty/zxing-cpp/wrappers/qt/)
-target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ZXingQt)
+if (USE_ZINT)
+    # build zint
+    add_subdirectory(thirdparty/zint-qml)
+    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE zint)
 
-#CONFIG += zint
-#add_subdirectory(thirdparty/zint)
-#target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE zint)
+    # build ZintQml
+    add_subdirectory(thirdparty/zint-qml/wrappers/qml)
+    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ZintQml)
+
+    set(zint true)
+    add_definitions(-Dzint)
+endif()
 
 ################################################################################
 
 ## Android
-if(CMAKE_SYSTEM_NAME STREQUAL "Android")
+if (CMAKE_SYSTEM_NAME STREQUAL "Android")
     set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES
         #QT_ANDROID_ABIS "armeabi-v7a;arm64-v8a;x86;x86_64"
         #QT_ANDROID_BUILD_ALL_ABIS ON
@@ -194,7 +208,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
 endif()
 
 ## macOS
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     #set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
     set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
 
@@ -212,7 +226,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 endif()
 
 ## iOS
-if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
+if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
     #set(app_icon_ios "${CMAKE_SOURCE_DIR}/assets/ios/Assets.xcassets")
     #set_source_files_properties(${app_icon_ios} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 
@@ -234,7 +248,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
 endif()
 
 ## Windows
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     #set(app_icon_windows "${CMAKE_SOURCE_DIR}/assets/windows/${CMAKE_PROJECT_NAME}.rc")
 
     set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES
@@ -243,7 +257,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 endif()
 
 ## Release build? Set "no debug" macros
-if(CMAKE_BUILD_TYPE STREQUAL Release)
+if (CMAKE_BUILD_TYPE STREQUAL Release)
     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE
         NDEBUG
         QT_NO_DEBUG

QmlMobileScanner.pro

@@ -1,10 +1,10 @@
 TARGET  = QmlMobileScanner
 
-VERSION = 0.2
+VERSION = 0.4
 DEFINES+= APP_NAME=\\\"$$TARGET\\\"
 DEFINES+= APP_VERSION=\\\"$$VERSION\\\"
 
-CONFIG += c++17
+CONFIG += c++20
 QT     += core qml quickcontrols2 svg
 QT     += multimedia concurrent sql positioning
 
@@ -53,10 +53,11 @@ HEADERS  += src/DatabaseManager.h  \
             src/Barcode.h \
             src/utils_camera.h
 
-INCLUDEPATH += src/ src/thirdparty/
+INCLUDEPATH += src/ thirdparty/
 
-RESOURCES   += qml/ComponentLibrary/ComponentLibrary.qrc
-RESOURCES   += qml/qml.qrc assets/assets.qrc assets/icons.qrc
+RESOURCES   += thirdparty/ComponentLibrary/ComponentLibrary.qrc
+RESOURCES   += thirdparty/IconLibrary/IconLibrary_material.qrc
+RESOURCES   += qml/qml.qrc assets/assets.qrc
 
 OTHER_FILES += .gitignore \
                .github/workflows/builds_mobile.yml \
@@ -65,30 +66,30 @@ OTHER_FILES += .gitignore \
 # Project dependencies #########################################################
 
 # AppUtils
-include(src/thirdparty/AppUtils/AppUtils.pri)
+include(thirdparty/AppUtils/AppUtils.pri)
 
 # Utils for mobile OS
-include(src/thirdparty/MobileUI/MobileUI.pri)
-include(src/thirdparty/MobileSharing/MobileSharing.pri)
+include(thirdparty/MobileUI/MobileUI.pri)
+include(thirdparty/MobileSharing/MobileSharing.pri)
 
 # Barcode reader/writer (zxing-cpp)
 CONFIG(zxingcpp, zxingcpp|qzxing) {
     message("Building QmlMobileScanner with zxing-cpp backend")
-    include(src/thirdparty/zxing-cpp/zxing-cpp.pri)
+    include(thirdparty/zxing-cpp/zxing-cpp.pri)
     DEFINES += zxingcpp
 }
 
 # Barcode reader/writer (QZXing)
 CONFIG(qzxing, zxingcpp|qzxing) {
     message("Building QmlMobileScanner with QZXing backend")
-    include(src/thirdparty/QZXing/QZXing.pri)
+    include(thirdparty/QZXing/QZXing.pri)
     DEFINES += qzxing
 }
 
 # Barcode writer (zint)
 CONFIG(zint) {
     message("Building QmlMobileScanner with zint backend")
-    include(src/thirdparty/zint-qml/zint-qml.pri)
+    include(thirdparty/zint-qml/zint-qml.pri)
     DEFINES += zint
 }
 

README.md

@@ -10,7 +10,7 @@ QmlMobileScanner is a DEMO barcode & QR code scanner based on qzxing and zxing-c
 Available backends:
 - QZXing / v3.3.0 + Qt6 port + many patches
 - zxing-cpp / v2.3.0 + custom QML integration
-- zint / v2.13 + custom QML integration
+- zint / v2.15 + custom QML integration
 
 > Works on Android and iOS!
 

assets/android/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto"
-          android:versionCode="00030001" android:versionName="0.3">
+          android:versionCode="00040001" android:versionName="0.4">
 
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true" />
 

assets/android/build.gradle

@@ -87,7 +87,7 @@ android {
         ndk.abiFilters = qtTargetAbiList.split(",")
 
         namespace 'io.emeric.qmlmobilescanner'
-        versionName "0.3"
+        versionName "0.4"
         versionCode timestampInt
         manifestPlaceholders = [versionName: versionName, versionCode: versionCode]
     }

assets/ios/Info.plist

@@ -21,10 +21,10 @@
 	<string>io.emeric.qmlmobilescanner</string>
 
 	<key>CFBundleVersion</key>
-	<string>000301</string>
+	<string>000401</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>0.3</string>
+	<string>0.4</string>
 
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>

assets/macos/Info.plist

@@ -24,10 +24,10 @@
 	<string>QmlMobileScanners.icns</string>
 
 	<key>CFBundleVersion</key>
-	<string>000301</string>
+	<string>000401</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>0.3</string>
+	<string>0.4</string>
 
 	<key>LSMinimumSystemVersion</key>
 	<string>11.0</string>