diff --git a/CMakeLists.txt b/CMakeLists.txt index c0b9c39..e5e45d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # -# QQuickMaterialHelperGallery CMake script by Olivier Le Doeuff +# QaterialGallery CMake script by Olivier Le Doeuff # # ┌──────────────────────────────────────────────────────────────────┐ @@ -12,19 +12,19 @@ cmake_minimum_required(VERSION 3.11.0 FATAL_ERROR) # │ PROJECT SETTINGS │ # └──────────────────────────────────────────────────────────────────┘ -set(QQUICKMATERIALHELPERGALLERY_TARGET "QQuickMaterialHelperGallery" CACHE STRING "Target Name") -set(QQUICKMATERIALHELPERGALLERY_PROJECT "QQuickMaterialHelperGallery" CACHE STRING "Project Name") -set(QQUICKMATERIALHELPERGALLERY_BUILD_SHARED OFF CACHE BOOL "Build as a shared library") -set(QQUICKMATERIALHELPERGALLERY_BUILD_STATIC OFF CACHE BOOL "Build as a static library") +set(QATERIALGALLERY_TARGET "QaterialGallery" CACHE STRING "Target Name") +set(QATERIALGALLERY_PROJECT "QaterialGallery" CACHE STRING "Project Name") +set(QATERIALGALLERY_BUILD_SHARED OFF CACHE BOOL "Build as a shared library") +set(QATERIALGALLERY_BUILD_STATIC OFF CACHE BOOL "Build as a static library") -if(QQUICKMATERIALHELPERGALLERY_BUILD_SHARED) - set(QQUICKMATERIALHELPERGALLERY_BUILD_EXE OFF CACHE BOOL "Build as an executable") +if(QATERIALGALLERY_BUILD_SHARED) + set(QATERIALGALLERY_BUILD_EXE OFF CACHE BOOL "Build as an executable") else() - set(QQUICKMATERIALHELPERGALLERY_BUILD_EXE ON CACHE BOOL "Build as an executable") + set(QATERIALGALLERY_BUILD_EXE ON CACHE BOOL "Build as an executable") endif() -set(QQUICKMATERIALHELPERGALLERY_USE_NAMESPACE ON CACHE BOOL "Should the library be compiled with a namespace. Default: ON") -set(QQUICKMATERIALHELPERGALLERY_NAMESPACE "Qqhg" CACHE STRING "Namespace of the library is QQUICKMATERIALHELPERGALLERY_USE_NAMESPACE is ON. Default : Qqhg") +set(QATERIALGALLERY_USE_NAMESPACE ON CACHE BOOL "Should the library be compiled with a namespace. Default: ON") +set(QATERIALGALLERY_NAMESPACE "Qqhg" CACHE STRING "Namespace of the library is QATERIALGALLERY_USE_NAMESPACE is ON. Default : Qg") set(QTANDROIDCMAKE_REPOSITORY "https://github.com/OlivierLDff/QtAndroidCMake.git" CACHE STRING "Repository of QtAndroidCMake") set(QTANDROIDCMAKE_TAG "master" CACHE STRING "Git Tag of QtAndroidCMake") @@ -44,35 +44,35 @@ set(QQTIOSCMAKE_TAG master CACHE STRING "QtIosCMake git tag") set(QBC_REPOSITORY "https://github.com/OlivierLdff/QBCInstaller.git" CACHE STRING "QBC repository, can be a local URL") set(QBC_TAG master CACHE STRING "QBC git tag") -set(QQUICKMATERIALHELPER_REPOSITORY "https://github.com/OlivierLDff/QQuickMaterialHelper.git" CACHE STRING "Repository of QQuickMaterialHelper") -set(QQUICKMATERIALHELPER_TAG "master" CACHE STRING "Git Tag of QQuickMaterialHelper") +set(QATERIAL_REPOSITORY "https://github.com/OlivierLDff/Qaterial.git" CACHE STRING "Repository of Qaterial") +set(QATERIAL_TAG "master" CACHE STRING "Git Tag of Qaterial") # ┌──────────────────────────────────────────────────────────────────┐ # │ VERSION │ # └──────────────────────────────────────────────────────────────────┘ # Project version must be set here -set(QQUICKMATERIALHELPERGALLERY_VERSION_MAJOR 1) -set(QQUICKMATERIALHELPERGALLERY_VERSION_MINOR 2) -set(QQUICKMATERIALHELPERGALLERY_VERSION_PATCH 0) +set(QATERIALGALLERY_VERSION_MAJOR 1) +set(QATERIALGALLERY_VERSION_MINOR 3) +set(QATERIALGALLERY_VERSION_PATCH 0) if(EXISTS "${CMAKE_SOURCE_DIR}/.git") execute_process( COMMAND git describe --always WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - OUTPUT_VARIABLE QQUICKMATERIALHELPERGALLERY_VERSION_TAG + OUTPUT_VARIABLE QATERIALGALLERY_VERSION_TAG OUTPUT_STRIP_TRAILING_WHITESPACE ) endif() -if(NOT QQUICKMATERIALHELPERGALLERY_VERSION_TAG) - set(QQUICKMATERIALHELPERGALLERY_VERSION_TAG 00000000) -endif(NOT QQUICKMATERIALHELPERGALLERY_VERSION_TAG) -set(QQUICKMATERIALHELPERGALLERY_VERSION_TAG_HEX 0x${QQUICKMATERIALHELPERGALLERY_VERSION_TAG}) -set(QQUICKMATERIALHELPERGALLERY_VERSION ${QQUICKMATERIALHELPERGALLERY_VERSION_MAJOR}.${QQUICKMATERIALHELPERGALLERY_VERSION_MINOR}.${QQUICKMATERIALHELPERGALLERY_VERSION_PATCH}) +if(NOT QATERIALGALLERY_VERSION_TAG) + set(QATERIALGALLERY_VERSION_TAG 00000000) +endif(NOT QATERIALGALLERY_VERSION_TAG) +set(QATERIALGALLERY_VERSION_TAG_HEX 0x${QATERIALGALLERY_VERSION_TAG}) +set(QATERIALGALLERY_VERSION ${QATERIALGALLERY_VERSION_MAJOR}.${QATERIALGALLERY_VERSION_MINOR}.${QATERIALGALLERY_VERSION_PATCH}) -project(${QQUICKMATERIALHELPERGALLERY_PROJECT} VERSION ${QQUICKMATERIALHELPERGALLERY_VERSION} LANGUAGES CXX) +project(${QATERIALGALLERY_PROJECT} VERSION ${QATERIALGALLERY_VERSION} LANGUAGES CXX) set_property(GLOBAL PROPERTY USE_FOLDERS ON) # ────────── PRE BUILD PLATFORM DEPENDANCIES ───────────── @@ -96,47 +96,47 @@ find_package(Qt5QuickCompiler CONFIG REQUIRED) # └──────────────────────────────────────────────────────────────────┘ # ─── GLOBAL ──────── -message(STATUS "------ ${QQUICKMATERIALHELPERGALLERY_TARGET} Configuration ------") -message(STATUS "QQUICKMATERIALHELPERGALLERY_BUILD_SHARED : ${QQUICKMATERIALHELPERGALLERY_BUILD_SHARED}") -message(STATUS "QQUICKMATERIALHELPERGALLERY_BUILD_STATIC : ${QQUICKMATERIALHELPERGALLERY_BUILD_STATIC}") -message(STATUS "QQUICKMATERIALHELPERGALLERY_BUILD_EXE : ${QQUICKMATERIALHELPERGALLERY_BUILD_EXE}") -message(STATUS "QQUICKMATERIALHELPERGALLERY_VERSION : ${QQUICKMATERIALHELPERGALLERY_VERSION}") -message(STATUS "QQUICKMATERIALHELPERGALLERY_VERSION_TAG_HEX : ${QQUICKMATERIALHELPERGALLERY_VERSION_TAG_HEX}") +message(STATUS "------ ${QATERIALGALLERY_TARGET} Configuration ------") +message(STATUS "QATERIALGALLERY_BUILD_SHARED : ${QATERIALGALLERY_BUILD_SHARED}") +message(STATUS "QATERIALGALLERY_BUILD_STATIC : ${QATERIALGALLERY_BUILD_STATIC}") +message(STATUS "QATERIALGALLERY_BUILD_EXE : ${QATERIALGALLERY_BUILD_EXE}") +message(STATUS "QATERIALGALLERY_VERSION : ${QATERIALGALLERY_VERSION}") +message(STATUS "QATERIALGALLERY_VERSION_TAG_HEX : ${QATERIALGALLERY_VERSION_TAG_HEX}") # ─── NAMESPACE ──────── -message(STATUS "QQUICKMATERIALHELPERGALLERY_USE_NAMESPACE : ${QQUICKMATERIALHELPERGALLERY_USE_NAMESPACE}") +message(STATUS "QATERIALGALLERY_USE_NAMESPACE : ${QATERIALGALLERY_USE_NAMESPACE}") -if(QQUICKMATERIALHELPERGALLERY_USE_NAMESPACE) - message(STATUS "QQUICKMATERIALHELPERGALLERY_NAMESPACE : ${QQUICKMATERIALHELPERGALLERY_NAMESPACE}") +if(QATERIALGALLERY_USE_NAMESPACE) + message(STATUS "QATERIALGALLERY_NAMESPACE : ${QATERIALGALLERY_NAMESPACE}") endif() -message(STATUS "------ ${QQUICKMATERIALHELPERGALLERY_TARGET} End Configuration ------") +message(STATUS "------ ${QATERIALGALLERY_TARGET} End Configuration ------") # ────────── CHECK CONFLICT ────────────────────────────────────────── -if(QQUICKMATERIALHELPERGALLERY_BUILD_SHARED) - if(QQUICKMATERIALHELPERGALLERY_BUILD_STATIC) - message(FATAL_ERROR "QQuickMaterialHelperGallery can't compile shared and static library at the same time") +if(QATERIALGALLERY_BUILD_SHARED) + if(QATERIALGALLERY_BUILD_STATIC) + message(FATAL_ERROR "QaterialGallery can't compile shared and static library at the same time") endif() - if(QQUICKMATERIALHELPERGALLERY_BUILD_EXE) - message(FATAL_ERROR "QQuickMaterialHelperGallery can't compile shared library and executable at the same time") + if(QATERIALGALLERY_BUILD_EXE) + message(FATAL_ERROR "QaterialGallery can't compile shared library and executable at the same time") endif() endif() -if(QQUICKMATERIALHELPERGALLERY_BUILD_STATIC) - if(QQUICKMATERIALHELPERGALLERY_BUILD_SHARED) - message(FATAL_ERROR "QQuickMaterialHelperGallery can't compile shared and static library at the same time") +if(QATERIALGALLERY_BUILD_STATIC) + if(QATERIALGALLERY_BUILD_SHARED) + message(FATAL_ERROR "QaterialGallery can't compile shared and static library at the same time") endif() - if(QQUICKMATERIALHELPERGALLERY_BUILD_EXE) - message(FATAL_ERROR "QQuickMaterialHelperGallery can't compile static library and executable at the same time") + if(QATERIALGALLERY_BUILD_EXE) + message(FATAL_ERROR "QaterialGallery can't compile static library and executable at the same time") endif() endif() -if(QQUICKMATERIALHELPERGALLERY_BUILD_EXE) - if(QQUICKMATERIALHELPERGALLERY_BUILD_SHARED) - message(FATAL_ERROR "QQuickMaterialHelperGallery can't compile shared library and executable at the same time") +if(QATERIALGALLERY_BUILD_EXE) + if(QATERIALGALLERY_BUILD_SHARED) + message(FATAL_ERROR "QaterialGallery can't compile shared library and executable at the same time") endif() - if(QQUICKMATERIALHELPERGALLERY_BUILD_STATIC) - message(FATAL_ERROR "QQuickMaterialHelperGallery can't compile static library and executable at the same time") + if(QATERIALGALLERY_BUILD_STATIC) + message(FATAL_ERROR "QaterialGallery can't compile static library and executable at the same time") endif() endif() @@ -153,18 +153,19 @@ FetchContent_Declare( GIT_TAG ${QTSTATICCMAKE_TAG} ) -# MaterialHelper +# Qaterial +set(QATERIAL_FOLDER_PREFIX "Dependencies/Qaterial" CACHE STRING "") FetchContent_Declare( - QQuickMaterialHelper - GIT_REPOSITORY ${QQUICKMATERIALHELPER_REPOSITORY} - GIT_TAG ${QQUICKMATERIALHELPER_TAG} + Qaterial + GIT_REPOSITORY ${QATERIAL_REPOSITORY} + GIT_TAG ${QATERIAL_TAG} ) set(FETCHCONTENT_UPDATES_DISCONNECTED ON) #set(FETCHCONTENT_QUIET ON) # Make all dependencies avaiables -FetchContent_MakeAvailable(QQuickMaterialHelper) +FetchContent_MakeAvailable(Qaterial) if(QT_STATIC) FetchContent_MakeAvailable(QtStaticCMake) endif() @@ -173,21 +174,21 @@ endif() # │ SOURCES │ # └──────────────────────────────────────────────────────────────────┘ -file(GLOB_RECURSE QQUICKMATERIALHELPERGALLERY_QML_SRCS qml/*.qml) +file(GLOB_RECURSE QATERIALGALLERY_QML_SRCS qml/*.qml) -FOREACH(SOURCE IN ITEMS ${QQUICKMATERIALHELPERGALLERY_QML_SRCS}) +FOREACH(SOURCE IN ITEMS ${QATERIALGALLERY_QML_SRCS}) GET_FILENAME_COMPONENT(SOURCE_PATH "${SOURCE}" PATH) FILE(RELATIVE_PATH SOURCE_PATH_REL ${CMAKE_CURRENT_SOURCE_DIR} "${SOURCE_PATH}") STRING(REPLACE "/" "\\" GROUP_PATH "${SOURCE_PATH_REL}") SOURCE_GROUP("${GROUP_PATH}" FILES "${SOURCE}") ENDFOREACH() -set(QQUICKMATERIALHELPERGALLERY_SRCS +set(QATERIALGALLERY_SRCS # Main ${CMAKE_CURRENT_SOURCE_DIR}/src/Main.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/QQuickMaterialHelperGallery.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/QQuickMaterialHelperGallery.cpp - ${QQUICKMATERIALHELPERGALLERY_QML_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/src/include/QaterialGallery.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/QaterialGallery.cpp + ${QATERIALGALLERY_QML_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/images/images.qrc ) @@ -198,11 +199,11 @@ set(QQUICKMATERIALHELPERGALLERY_SRCS # ────────── QML TO CACHE ─────────── # Add qml to the qtquick compiler -qtquick_compiler_add_resources(QQUICKMATERIALHELPERGALLERY_QML_RES ${CMAKE_CURRENT_SOURCE_DIR}/qml/qquickHelperGallery.qrc) +qtquick_compiler_add_resources(QATERIALGALLERY_QML_RES ${CMAKE_CURRENT_SOURCE_DIR}/qml/qaterialGallery.qrc) -# Trick to rerun cmake each time qquickHelperGallery.qrc is updated +# Trick to rerun cmake each time qaterialGallery.qrc is updated configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/qml/qquickHelperGallery.qrc + ${CMAKE_CURRENT_SOURCE_DIR}/qml/qaterialGallery.qrc ${CMAKE_CURRENT_BINARY_DIR}/qml.junk ) @@ -212,54 +213,54 @@ configure_file( ) # Dont Run Moc on cpp file generated from qml -FOREACH(CacheQml ${QQUICKMATERIALHELPERGALLERY_QML_RES}) +FOREACH(CacheQml ${QATERIALGALLERY_QML_RES}) SET_PROPERTY(SOURCE ${CacheQml} PROPERTY SKIP_AUTOMOC ON) SOURCE_GROUP("QtQuickCompiler Files" FILES ${CacheQml}) ENDFOREACH() # ───── SHARED ────────────── -if(QQUICKMATERIALHELPERGALLERY_BUILD_SHARED) - add_library(${QQUICKMATERIALHELPERGALLERY_TARGET} SHARED ${QQUICKMATERIALHELPERGALLERY_SRCS} ${QQUICKMATERIALHELPERGALLERY_QML_RES}) - target_compile_definitions(${QQUICKMATERIALHELPERGALLERY_TARGET} PRIVATE -DQQUICKMATERIALHELPERGALLERY_SHARED) +if(QATERIALGALLERY_BUILD_SHARED) + add_library(${QATERIALGALLERY_TARGET} SHARED ${QATERIALGALLERY_SRCS} ${QATERIALGALLERY_QML_RES}) + target_compile_definitions(${QATERIALGALLERY_TARGET} PRIVATE -DQATERIALGALLERY_SHARED) endif() # ───── STATIC ────────────── -if(QQUICKMATERIALHELPERGALLERY_BUILD_STATIC) - add_library(${QQUICKMATERIALHELPERGALLERY_TARGET} STATIC ${QQUICKMATERIALHELPERGALLERY_SRCS} ${QQUICKMATERIALHELPERGALLERY_QML_RES}) - target_compile_definitions(${QQUICKMATERIALHELPERGALLERY_TARGET} PUBLIC -DQQUICKMATERIALHELPERGALLERY_STATIC) +if(QATERIALGALLERY_BUILD_STATIC) + add_library(${QATERIALGALLERY_TARGET} STATIC ${QATERIALGALLERY_SRCS} ${QATERIALGALLERY_QML_RES}) + target_compile_definitions(${QATERIALGALLERY_TARGET} PUBLIC -DQATERIALGALLERY_STATIC) endif() # ───── EXE ────────────── -if(QQUICKMATERIALHELPERGALLERY_BUILD_EXE) - ADD_EXECUTABLE(${QQUICKMATERIALHELPERGALLERY_TARGET} ${QQUICKMATERIALHELPERGALLERY_SRCS} ${QQUICKMATERIALHELPERGALLERY_QML_RES}) - target_compile_definitions(${QQUICKMATERIALHELPERGALLERY_TARGET} PUBLIC -DQQUICKMATERIALHELPERGALLERY_STATIC) +if(QATERIALGALLERY_BUILD_EXE) + ADD_EXECUTABLE(${QATERIALGALLERY_TARGET} ${QATERIALGALLERY_SRCS} ${QATERIALGALLERY_QML_RES}) + target_compile_definitions(${QATERIALGALLERY_TARGET} PUBLIC -DQATERIALGALLERY_STATIC) endif() # ───── COMMON ────────────── -target_include_directories(${QQUICKMATERIALHELPERGALLERY_TARGET} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src) -target_compile_definitions(${QQUICKMATERIALHELPERGALLERY_TARGET} PRIVATE -DQQUICKMATERIALHELPERGALLERY_VERSION_MAJOR=${QQUICKMATERIALHELPERGALLERY_VERSION_MAJOR}) -target_compile_definitions(${QQUICKMATERIALHELPERGALLERY_TARGET} PRIVATE -DQQUICKMATERIALHELPERGALLERY_VERSION_MINOR=${QQUICKMATERIALHELPERGALLERY_VERSION_MINOR}) -target_compile_definitions(${QQUICKMATERIALHELPERGALLERY_TARGET} PRIVATE -DQQUICKMATERIALHELPERGALLERY_VERSION_PATCH=${QQUICKMATERIALHELPERGALLERY_VERSION_PATCH}) -target_compile_definitions(${QQUICKMATERIALHELPERGALLERY_TARGET} PRIVATE -DQQUICKMATERIALHELPERGALLERY_VERSION_TAG=${QQUICKMATERIALHELPERGALLERY_VERSION_TAG}) -target_compile_definitions(${QQUICKMATERIALHELPERGALLERY_TARGET} PRIVATE -DQQUICKMATERIALHELPERGALLERY_VERSION_TAG_HEX=${QQUICKMATERIALHELPERGALLERY_VERSION_TAG_HEX}) +target_include_directories(${QATERIALGALLERY_TARGET} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src/include) +target_compile_definitions(${QATERIALGALLERY_TARGET} PRIVATE -DQATERIALGALLERY_VERSION_MAJOR=${QATERIALGALLERY_VERSION_MAJOR}) +target_compile_definitions(${QATERIALGALLERY_TARGET} PRIVATE -DQATERIALGALLERY_VERSION_MINOR=${QATERIALGALLERY_VERSION_MINOR}) +target_compile_definitions(${QATERIALGALLERY_TARGET} PRIVATE -DQATERIALGALLERY_VERSION_PATCH=${QATERIALGALLERY_VERSION_PATCH}) +target_compile_definitions(${QATERIALGALLERY_TARGET} PRIVATE -DQATERIALGALLERY_VERSION_TAG=${QATERIALGALLERY_VERSION_TAG}) +target_compile_definitions(${QATERIALGALLERY_TARGET} PRIVATE -DQATERIALGALLERY_VERSION_TAG_HEX=${QATERIALGALLERY_VERSION_TAG_HEX}) -if(QQUICKMATERIALHELPERGALLERY_USE_NAMESPACE) - target_compile_definitions(${QQUICKMATERIALHELPERGALLERY_TARGET} PUBLIC -DQQUICKMATERIALHELPERGALLERY_USE_NAMESPACE) - target_compile_definitions(${QQUICKMATERIALHELPERGALLERY_TARGET} PUBLIC -DQQUICKMATERIALHELPERGALLERY_NAMESPACE=${QQUICKMATERIALHELPERGALLERY_NAMESPACE}) +if(QATERIALGALLERY_USE_NAMESPACE) + target_compile_definitions(${QATERIALGALLERY_TARGET} PUBLIC -DQATERIALGALLERY_USE_NAMESPACE) + target_compile_definitions(${QATERIALGALLERY_TARGET} PUBLIC -DQATERIALGALLERY_NAMESPACE=${QATERIALGALLERY_NAMESPACE}) endif() -target_link_libraries(${QQUICKMATERIALHELPERGALLERY_TARGET} ${QQUICKMATERIALHELPER_TARGET}) -set_target_properties(${QQUICKMATERIALHELPERGALLERY_TARGET} PROPERTIES AUTOMOC TRUE) -set_target_properties(${QQUICKMATERIALHELPERGALLERY_TARGET} PROPERTIES AUTORCC TRUE) -qt5_use_modules(${QQUICKMATERIALHELPERGALLERY_TARGET} Core Gui Svg Xml XmlPatterns Quick QuickControls2) +target_link_libraries(${QATERIALGALLERY_TARGET} ${QATERIAL_TARGET}) +set_target_properties(${QATERIALGALLERY_TARGET} PROPERTIES AUTOMOC TRUE) +set_target_properties(${QATERIALGALLERY_TARGET} PROPERTIES AUTORCC TRUE) +qt5_use_modules(${QATERIALGALLERY_TARGET} Core Gui Svg Xml XmlPatterns Quick QuickControls2) if(QT_STATIC) - qt_generate_qml_plugin_import(${QQUICKMATERIALHELPERGALLERY_TARGET} QML_SRC ${CMAKE_CURRENT_SOURCE_DIR}/qml VERBOSE) - qt_generate_plugin_import(${QQUICKMATERIALHELPERGALLERY_TARGET} VERBOSE) + qt_generate_qml_plugin_import(${QATERIALGALLERY_TARGET} QML_SRC ${CMAKE_CURRENT_SOURCE_DIR}/qml VERBOSE) + qt_generate_plugin_import(${QATERIALGALLERY_TARGET} VERBOSE) endif(QT_STATIC) # ────────── POST BUILD PLATFORM DEPENDANCIES ───────────── diff --git a/README.md b/README.md index 3fad320..020abe8 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,8 @@ -# QQuickMaterialHelperGallery +# Qaterial Gallery +QaterialGallery is a showcase application and contains example for the library Qaterial . It is still under development. - - - - -QQuickMaterialHelperGallery is a showcase application and contains example for the library QQuickMaterialHelper. It is still under development. - -This project also showcase multiplatform deployment. +This project also showcase multiplatform deployment with Qt. - [x] Windows - [ ] Linux *(Compile but no deployment)* @@ -31,7 +26,7 @@ DOC TODO ## Build -QQuickMaterialHelperGallery is a cross platform application that can be build natively or cross compiled. Qt precompiled binary are required and can be download from the [official website](http://download.qt.io/archive/qt/). Then simply use the qt manager to install the toolchain that you need. Minimum Qt version is `5.12`. +QaterialGallery is a cross platform application that can be build natively or cross compiled. Qt precompiled binary are required and can be download from the [official website](http://download.qt.io/archive/qt/). Then simply use the qt manager to install the toolchain that you need. Minimum Qt version is `5.12`. ### Windows @@ -48,8 +43,8 @@ export QT_DIR_MSVC64=C:/Qt/$QT_WIN_VERSION/msvc2017_64 Then simply clone the repository and create an in source build folder. ```bash -git clone https://github.com/OlivierLdff/QQuickMaterialHelperGallery -cd QQuickMaterialHelperGallery && mkdir build && cd build +git clone https://github.com/OlivierLdff/QaterialGallery +cd QaterialGallery && mkdir build && cd build ``` **MinGw 32 bits - Make** @@ -132,7 +127,7 @@ Depending on Qt Version you might need to change the Android STL. **CMAKE_BUILD_TYPE** can be set to multiple values. *Debug | Release | MinSizeRel | RelWithDebInfo*. -*Tip for windows: If you don't have make installed you can use the one in the ndk:* +*Tip for windows: If you don't have make installed you can use the one in the ndk:* ```bash -DCMAKE_MAKE_PROGRAM="$ANDROID_NDK/prebuilt/windows-x86_64/bin/make.exe" @@ -149,15 +144,15 @@ cmake -DQT_DIR=$QT_DIR_ARMV7A -G "Unix Makefiles" \ -DANDROID_NATIVE_API_LEVEL=27 \ -DANDROID_STL=c++_shared \ -DANDROID_TOOLCHAIN=clang \ --DQQUICKMATERIALHELPERGALLERY_BUILD_SHARED=ON \ --DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE=Path/To/Keystore \ --DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_ALIAS=KeystoreAlias \ --DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_PASSWORD=xxxx \ +-DQATERIALGALLERY_BUILD_SHARED=ON \ +-DQATERIALGALLERY_ANDROID_KEYSTORE=Path/To/Keystore \ +-DQATERIALGALLERY_ANDROID_KEYSTORE_ALIAS=KeystoreAlias \ +-DQATERIALGALLERY_ANDROID_KEYSTORE_PASSWORD=xxxx \ .. make -j8 ``` -The resulted apk will be in `QQuickMaterialHelperGallery-armeabi-v7a/build/outputs/apk/release/`. +The resulted apk will be in `QaterialGallery-armeabi-v7a/build/outputs/apk/release/`. #### Arm64 v8a @@ -170,14 +165,14 @@ cmake -DQT_DIR=$QT_DIR_ARM64V8A -G "Unix Makefiles" \ -DANDROID_NATIVE_API_LEVEL=27 \ -DANDROID_STL=c++_shared \ -DANDROID_TOOLCHAIN=clang \ --DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE=Path/To/Keystore \ --DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_ALIAS=KeystoreAlias \ --DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_PASSWORD=xxxx \ +-DQATERIALGALLERY_ANDROID_KEYSTORE=Path/To/Keystore \ +-DQATERIALGALLERY_ANDROID_KEYSTORE_ALIAS=KeystoreAlias \ +-DQATERIALGALLERY_ANDROID_KEYSTORE_PASSWORD=xxxx \ .. make -j8 ``` -The resulted apk will be in `QQuickMaterialHelperGallery-arm64-v8a/build/outputs/apk/release/`. +The resulted apk will be in `QaterialGallery-arm64-v8a/build/outputs/apk/release/`. #### x86 @@ -190,15 +185,15 @@ cmake -DQT_DIR=$QT_DIR_X86 -G "Unix Makefiles" \ -DANDROID_NATIVE_API_LEVEL=27 \ -DANDROID_STL=c++_shared \ -DANDROID_TOOLCHAIN=clang \ --DQQUICKMATERIALHELPERGALLERY_BUILD_SHARED=ON \ --DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE=Path/To/Keystore \ --DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_ALIAS=KeystoreAlias \ --DQQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_PASSWORD=xxxx \ +-DQATERIALGALLERY_BUILD_SHARED=ON \ +-DQATERIALGALLERY_ANDROID_KEYSTORE=Path/To/Keystore \ +-DQATERIALGALLERY_ANDROID_KEYSTORE_ALIAS=KeystoreAlias \ +-DQATERIALGALLERY_ANDROID_KEYSTORE_PASSWORD=xxxx \ .. make -j8 ``` -The resulted apk will be in `QQuickMaterialHelperGallery-x86/build/outputs/apk/release/`. +The resulted apk will be in `QaterialGallery-x86/build/outputs/apk/release/`. ### Ios @@ -262,25 +257,25 @@ or launch the generated XCode project. *Note: Exe, Shared and Static can't be ON at the same time.* -* **QQUICKMATERIALHELPERGALLERY_BUILD_SHARED** : Build as a shared library [ON OFF]. *Default: OFF*. -* **QQUICKMATERIALHELPERGALLERY_BUILD_STATIC** : Build as a static library [ON OFF]. *Default: OFF*. -* **QQUICKMATERIALHELPERGALLERY_BUILD_EXE** : Build as an executable [ON OFF]. *Default: ON*. -* **QQUICKMATERIALHELPERGALLERY_PROJECT** : Name of the project. *Default: QQuickMaterialHelperGallery*. -* **QQUICKMATERIALHELPERGALLERY_TARGET** : Name of the project. *Default: QQuickMaterialHelperGallery*. -* **QQUICKMATERIALHELPERGALLERY_USE_NAMESPACE** : Should the library be compiled with a namespace. *Default: ON*. -* **QQUICKMATERIALHELPERGALLERY_NAMESPACE** : Namespace of the library ig **QQUICKMATERIALHELPERGALLERY_USE_NAMESPACE** is ON. *Default : Qqmh.* +* **QATERIALGALLERY_BUILD_SHARED** : Build as a shared library [ON OFF]. *Default: OFF*. +* **QATERIALGALLERY_BUILD_STATIC** : Build as a static library [ON OFF]. *Default: OFF*. +* **QATERIALGALLERY_BUILD_EXE** : Build as an executable [ON OFF]. *Default: ON*. +* **QATERIALGALLERY_PROJECT** : Name of the project. *Default: QaterialGallery*. +* **QATERIALGALLERY_TARGET** : Name of the project. *Default: QaterialGallery*. +* **QATERIALGALLERY_USE_NAMESPACE** : Should the library be compiled with a namespace. *Default: ON*. +* **QATERIALGALLERY_NAMESPACE** : Namespace of the library ig **QATERIALGALLERY_USE_NAMESPACE** is ON. *Default : Qqmh.* ### Dependencies ### Output -* **QQUICKMATERIALHELPERGALLERY_TARGET** : Output target to link to. *Default: QQuickMaterialHelperGallery* +* **QATERIALGALLERY_TARGET** : Output target to link to. *Default: QaterialGallery* ## Versions -To create a new release: +To create a new release: -* Update in `CMakelist.txt` variables **QQUICKMATERIALHELPERGALLERY_VERSION_MAJOR**, **QQUICKMATERIALHELPERGALLERY_VERSION_MINOR**, **QQUICKMATERIALHELPERGALLERY_VERSION_PATCH**. +* Update in `CMakelist.txt` variables **QATERIALGALLERY_VERSION_MAJOR**, **QATERIALGALLERY_VERSION_MINOR**, **QATERIALGALLERY_VERSION_PATCH**. * Increment in `platform/PostBuildPlatform.cmake` the parameter **VERSION_CODE** in the android apk macro ## Authors diff --git a/images/ic_launcher.ico b/images/ic_launcher.ico new file mode 100644 index 0000000..1616a84 Binary files /dev/null and b/images/ic_launcher.ico differ diff --git a/images/ic_launcher.png b/images/ic_launcher.png new file mode 100644 index 0000000..059963d Binary files /dev/null and b/images/ic_launcher.png differ diff --git a/images/icon.ico b/images/icon.ico deleted file mode 100644 index 6abc70f..0000000 Binary files a/images/icon.ico and /dev/null differ diff --git a/images/icon.png b/images/icon.png deleted file mode 100644 index 11baa9d..0000000 Binary files a/images/icon.png and /dev/null differ diff --git a/images/icon_127.png b/images/icon_127.png deleted file mode 100644 index c5c6f96..0000000 Binary files a/images/icon_127.png and /dev/null differ diff --git a/images/icon_16.png b/images/icon_16.png deleted file mode 100644 index 4fc5aa5..0000000 Binary files a/images/icon_16.png and /dev/null differ diff --git a/images/icon_24.png b/images/icon_24.png deleted file mode 100644 index a39ff08..0000000 Binary files a/images/icon_24.png and /dev/null differ diff --git a/images/icon_256.png b/images/icon_256.png deleted file mode 100644 index b6c2416..0000000 Binary files a/images/icon_256.png and /dev/null differ diff --git a/images/icon_32.png b/images/icon_32.png deleted file mode 100644 index 37f6eb6..0000000 Binary files a/images/icon_32.png and /dev/null differ diff --git a/images/icon_64.png b/images/icon_64.png deleted file mode 100644 index da03be7..0000000 Binary files a/images/icon_64.png and /dev/null differ diff --git a/images/images.qrc b/images/images.qrc index 4fb9efb..588a25d 100644 --- a/images/images.qrc +++ b/images/images.qrc @@ -1,5 +1,5 @@ - + icon.png icons/back.png icons/drawer.png @@ -14,13 +14,13 @@ icons/airplane.svg icons/briefcase.svg icons/compass.svg - + icons/album.svg icons/settings.svg icons/music-note.svg icons/heart.svg icons/thumb-up.svg - + icons/pencil.svg icons/content-copy.svg icons/crosshairs-gps.svg @@ -72,6 +72,6 @@ card168x168_3.png card168x168_4.png card168x168_5.png - + \ No newline at end of file diff --git a/platform/PostBuildPlatform.cmake b/platform/PostBuildPlatform.cmake index 0d890f7..e4b8ac9 100644 --- a/platform/PostBuildPlatform.cmake +++ b/platform/PostBuildPlatform.cmake @@ -3,7 +3,7 @@ MESSAGE(STATUS "Post Build Platform Dependancies Configuration") # ───────── WINDOWS ────────── IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - IF(QQUICKMATERIALHELPERGALLERY_BUILD_EXE) + IF(QATERIALGALLERY_BUILD_EXE) message(STATUS "Download QtWindowsCMake from ${QTWINDOWSCMAKE_REPOSITORY}") @@ -15,13 +15,13 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ) FetchContent_MakeAvailable(QtWindowsCMake) - add_qt_windows_exe( ${QQUICKMATERIALHELPERGALLERY_TARGET} + add_qt_windows_exe( ${QATERIALGALLERY_TARGET} ALL - NAME "QQuickMaterialHelperGallery" - VERSION ${QQUICKMATERIALHELPERGALLERY_VERSION} + NAME "QaterialGallery" + VERSION ${QATERIALGALLERY_VERSION} PUBLISHER "OlivierLdff" - PRODUCT_URL "www.materialGallery.com" - PACKAGE "com.oliv.materialGallery" + PRODUCT_URL "https://github.com/OlivierLDff/QaterialGallery" + PACKAGE "com.oliv.qaterial" ICON ${CMAKE_CURRENT_SOURCE_DIR}/platform/windows/icon.ico ICON_RC ${CMAKE_CURRENT_SOURCE_DIR}/platform/windows/icon.rc QML_DIR ${QT_WINDOWS_QT_ROOT}/qml @@ -31,10 +31,10 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ) if(MSVC) - set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${QQUICKMATERIALHELPERGALLERY_TARGET}) + set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${QATERIALGALLERY_TARGET}) endif() # MSVC - endif() # QQUICKMATERIALHELPERGALLERY_BUILD_EXE + endif() # QATERIALGALLERY_BUILD_EXE endif() # Windows # ────────── LINUX ─────────── @@ -55,18 +55,18 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Android") FetchContent_MakeAvailable(QtAndroidCMake) # Set keystore variable - IF(QQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE) + IF(QATERIALGALLERY_ANDROID_KEYSTORE) SET(KEYSTORE_SIGNATURE - KEYSTORE ${QQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE} ${QQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_ALIAS} - KEYSTORE_PASSWORD ${QQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE_PASSWORD} + KEYSTORE ${QATERIALGALLERY_ANDROID_KEYSTORE} ${QATERIALGALLERY_ANDROID_KEYSTORE_ALIAS} + KEYSTORE_PASSWORD ${QATERIALGALLERY_ANDROID_KEYSTORE_PASSWORD} ) - ENDIF(QQUICKMATERIALHELPERGALLERY_ANDROID_KEYSTORE) + ENDIF(QATERIALGALLERY_ANDROID_KEYSTORE) - add_qt_android_apk(${QQUICKMATERIALHELPERGALLERY_TARGET}Apk ${QQUICKMATERIALHELPERGALLERY_TARGET} - NAME "QQuickMaterialHelperGallery" - VERSION_NAME ${QQUICKMATERIALHELPERGALLERY_VERSION} + add_qt_android_apk(${QATERIALGALLERY_TARGET}Apk ${QATERIALGALLERY_TARGET} + NAME "Qaterial Gallery" + VERSION_NAME ${QATERIALGALLERY_VERSION} VERSION_CODE 1 # Must be incremented on each release - PACKAGE_NAME "com.oliv.materialGallery" + PACKAGE_NAME "com.oliv.qaterial" PACKAGE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/platform/android/src ANDROID_MANIFEST_IN_PATH ${CMAKE_CURRENT_SOURCE_DIR}/platform/android/AndroidManifest.xml.in ${KEYSTORE_SIGNATURE} @@ -92,11 +92,11 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "iOS") SET(TEAM_ID "AAAAAAAA") ENDIF(NOT TEAM_ID) - add_qt_ios_app(${QQUICKMATERIALHELPERGALLERY_TARGET} + add_qt_ios_app(${QATERIALGALLERY_TARGET} NAME "Qml Material Helper Gallery" - BUNDLE_IDENTIFIER "com.oliv.materialGallery" - VERSION ${QQUICKMATERIALHELPERGALLERY_VERSION} - LONG_VERSION ${QQUICKMATERIALHELPERGALLERY_VERSION}.${QQUICKMATERIALHELPERGALLERY_VERSION_TAG} + BUNDLE_IDENTIFIER "com.oliv.qaterial" + VERSION ${QATERIALGALLERY_VERSION} + LONG_VERSION ${QATERIALGALLERY_VERSION}.${QATERIALGALLERY_VERSION_TAG} CODE_SIGN_IDENTITY "iPhone Developer" TEAM_ID ${TEAM_ID} # TEAM_ID must be specified when executing cmake or later in XCode COPYRIGHT "Copyright Olivier Ldff 2019" diff --git a/platform/PreBuildPlatform.cmake b/platform/PreBuildPlatform.cmake index 96eb547..4716ec4 100644 --- a/platform/PreBuildPlatform.cmake +++ b/platform/PreBuildPlatform.cmake @@ -20,8 +20,8 @@ ENDMACRO(download_qbc) IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - set(QQUICKMATERIALHELPERGALLERY_PLATFORM_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/platform/windows/icon.rc") - set(QQUICKMATERIALHELPERGALLERY_PLATFORM_TARGET WIN32) + set(QATERIALGALLERY_PLATFORM_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/platform/windows/icon.rc") + set(QATERIALGALLERY_PLATFORM_TARGET WIN32) ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") @@ -45,9 +45,9 @@ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") IF(${CMAKE_SYSTEM_NAME} STREQUAL "Android") - set(QQUICKMATERIALHELPERGALLERY_BUILD_SHARED ON CACHE BOOL "Build as a shared library" FORCE) - set(QQUICKMATERIALHELPERGALLERY_BUILD_STATIC OFF CACHE BOOL "Build as a static library" FORCE) - set(QQUICKMATERIALHELPERGALLERY_BUILD_EXE OFF CACHE BOOL "Build as an executable" FORCE) + set(QATERIALGALLERY_BUILD_SHARED ON CACHE BOOL "Build as a shared library" FORCE) + set(QATERIALGALLERY_BUILD_STATIC OFF CACHE BOOL "Build as a static library" FORCE) + set(QATERIALGALLERY_BUILD_EXE OFF CACHE BOOL "Build as an executable" FORCE) ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Android") diff --git a/platform/android/src/res/mipmap-hdpi/ic_launcher.png b/platform/android/src/res/mipmap-hdpi/ic_launcher.png index ca048d3..2c1c987 100644 Binary files a/platform/android/src/res/mipmap-hdpi/ic_launcher.png and b/platform/android/src/res/mipmap-hdpi/ic_launcher.png differ diff --git a/platform/android/src/res/mipmap-mdpi/ic_launcher.png b/platform/android/src/res/mipmap-mdpi/ic_launcher.png index 392cce5..37f29db 100644 Binary files a/platform/android/src/res/mipmap-mdpi/ic_launcher.png and b/platform/android/src/res/mipmap-mdpi/ic_launcher.png differ diff --git a/platform/android/src/res/mipmap-xhdpi/ic_launcher.png b/platform/android/src/res/mipmap-xhdpi/ic_launcher.png index a776261..b43eedd 100644 Binary files a/platform/android/src/res/mipmap-xhdpi/ic_launcher.png and b/platform/android/src/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/platform/android/src/res/mipmap-xxhdpi/ic_launcher.png b/platform/android/src/res/mipmap-xxhdpi/ic_launcher.png index b96fe53..2794946 100644 Binary files a/platform/android/src/res/mipmap-xxhdpi/ic_launcher.png and b/platform/android/src/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/platform/android/src/res/mipmap-xxxhdpi/ic_launcher.png b/platform/android/src/res/mipmap-xxxhdpi/ic_launcher.png index d411dc8..059963d 100644 Binary files a/platform/android/src/res/mipmap-xxxhdpi/ic_launcher.png and b/platform/android/src/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/platform/ios/LaunchScreen.storyboard b/platform/ios/LaunchScreen.storyboard index c2b127c..cb60b8e 100644 --- a/platform/ios/LaunchScreen.storyboard +++ b/platform/ios/LaunchScreen.storyboard @@ -21,7 +21,7 @@ -