Skip to content

Commit bfd4a90

Browse files
authored
Switch to Qt6 (#69)
* Now library supports only Qt6. We've updated interface of the main classes in compliance with Qt6: * QList<QString> instead of QStringList * QStringConverter::Encoding instead of QTextCodec * qsizetype instead of int * Simplification - no more PIMPL classes * Switch to C++11/14/17 * Minor code style changes * Move all CI jobs to Appveyor New contributors: Bogdan Cristea (https://github.com/cristeab), Markus Krause (https://github.com/markusdd)
1 parent 76cc2d5 commit bfd4a90

29 files changed

+1055
-1542
lines changed

.travis.yml

Lines changed: 0 additions & 94 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
cmake_minimum_required (VERSION 3.0)
22

3-
project (qtcsv VERSION 1.6.0 LANGUAGES CXX)
3+
project (qtcsv VERSION 1.7.0 LANGUAGES CXX)
44

55
# set options
66
option(STATIC_LIB "build as static lib if ON, otherwise build shared lib" OFF)
7-
option(USE_QT4 "builds against Qt4 if ON, otherwise builds against Qt5" OFF)
87
option(BUILD_TESTS "build tests" ON)
98

109
# find qt package
11-
if(USE_QT4)
12-
find_package(Qt4 REQUIRED)
13-
set(QT_CORE_TARGET Qt4::QtCore)
14-
else()
15-
# if cmake failed to find Qt5Core configuration file, set path manually:
16-
#list(APPEND CMAKE_PREFIX_PATH "/path/to/Qt/lib/cmake/Qt5Core/")
17-
18-
find_package(Qt5Core REQUIRED)
19-
set(QT_CORE_TARGET Qt5::Core)
20-
endif(USE_QT4)
10+
find_package(Qt6 COMPONENTS Core REQUIRED)
11+
set(QT_CORE_TARGET Qt6::Core)
2112

2213
# instruct CMake to run moc automatically when needed.
2314
set(CMAKE_AUTOMOC ON)

0 commit comments

Comments
 (0)