Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
psemiletov committed Apr 3, 2021
1 parent 2dfe0cd commit 6160208
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ add_definitions(${Qt${QT_VERSION_MAJOR}Widgets_COMPILE_DEFINITIONS})


set(PROJECT "tea-qt")
project ($PROJECT VERSION 50.1.0 LANGUAGES CXX C)
project ($PROJECT VERSION 60.0.0 LANGUAGES CXX C)
add_definitions(-DVERSION_NUMBER="\\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}\\"")
add_definitions(-DNOCRYPT=1)
add_definitions(-DNOUNCRYPT=1)
Expand Down Expand Up @@ -67,13 +67,11 @@ endif()
find_package(Qt${QT_VERSION_MAJOR} CONFIG REQUIRED Core Widgets)
if(BUILD_TESTING)
find_package(Qt${Test}${QT_VERSION_MAJOR} CONFIG REQUIRED)
endif()
if(Qt${QT_VERSION_MAJOR} STREQUAL "Qt6")
qt6_add_resources(QT_RESOURCES resources.qrc)
endif()
Expand Down Expand Up @@ -244,7 +242,6 @@ target_link_libraries(tea Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::
endif()
install (TARGETS tea DESTINATION bin)
install (FILES ${tea_ICONSVG} DESTINATION share/icons/hicolor/scalable/apps)
install (FILES ${tea_ICONPNG32} DESTINATION share/icons/hicolor/32x32/apps)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ Please note, that TEA source dir after unpacking will be tea-qt-${pkgver}

**qmake** - the traditional one, good for Qt4-Win32-OS/2-Slackware builds. TEA's qmake project file is old and obscure.

**cmake** - good for Qt5 build, the reference one for TEA. I recommend to use cmake to build TEA package.
**cmake** - good for Qt5/Qt6 build, the reference one for TEA. I recommend to use cmake to build TEA package.

**meson** - I use it internally. Does not have the printer support.

Expand Down
4 changes: 2 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
project('tea', ['cpp','c'],
default_options : ['cpp_std=c++11'],
version : '50.1.0',
version : '60.0.0',
license : 'GPLv3')

add_global_arguments('-DVERSION_NUMBER="50.1.0"', language : 'cpp')
add_global_arguments('-DVERSION_NUMBER="60.0.0"', language : 'cpp')
add_global_arguments('-DNOCRYPT="1"', language : 'cpp')
add_global_arguments('-DNOUNCRYPT="1"', language : 'cpp')
add_global_arguments('-DQUAZIP_STATIC="1"', language : 'cpp')
Expand Down
4 changes: 2 additions & 2 deletions tea-qmake.pro
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION = 50.1.0
VERSION = 60.0.0

os2: {
DEFINES += 'VERSION_NUMBER=\'"50.1.0"\''
DEFINES += 'VERSION_NUMBER=\'"60.0.0"\''
} else: {
DEFINES += 'VERSION_NUMBER=\\\"$${VERSION}\\\"'
}
Expand Down

0 comments on commit 6160208

Please sign in to comment.