Skip to content

Commit 20be365

Browse files
gammasoft71gammasoft71
committed
Using Qt6
1 parent 6bf2f27 commit 20be365

File tree

74 files changed

+325
-138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+325
-138
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ dist: xenial
44
before_install:
55
- sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
66
- sudo apt-get update -qq
7-
- sudo apt-get install qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev
8-
- sudo apt-get install qt5-default qttools5-dev-tools
7+
- sudo apt-get install qtbase5-dev qtdeclarative5-dev libQt6webkit5-dev libsqlite3-dev
8+
- sudo apt-get install Qt6-default qttools5-dev-tools
99
os: linux
1010
script:
1111
- cd Qt.Core

‎Qt.Core/Collections/List/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
project(List)
4-
find_package(Qt5Widgets CONFIG REQUIRED)
4+
find_package(Qt6Widgets CONFIG REQUIRED)
5+
if (NOT Qt6_FOUND)
6+
find_package(Qt5Widgets CONFIG REQUIRED)
7+
endif()
58
set(CMAKE_CXX_STANDARD 17)
69
set(CMAKE_CXX_STANDARD_REQUIRED ON)
710
add_executable(${PROJECT_NAME} src/List.cpp)
8-
target_link_libraries(${PROJECT_NAME} Qt5::Core)
11+
target_link_libraries(${PROJECT_NAME} Qt::Core)
912
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Collections")

‎Qt.Core/Console/Console/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
project(Console)
4-
find_package(Qt5Widgets CONFIG REQUIRED)
4+
find_package(Qt6Widgets CONFIG REQUIRED)
5+
if (NOT Qt6_FOUND)
6+
find_package(Qt5Widgets CONFIG REQUIRED)
7+
endif()
58
set(CMAKE_CXX_STANDARD 17)
69
set(CMAKE_CXX_STANDARD_REQUIRED ON)
710
add_executable(${PROJECT_NAME} src/Console.cpp)
8-
target_link_libraries(${PROJECT_NAME} Qt5::Core)
11+
target_link_libraries(${PROJECT_NAME} Qt::Core)
912
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Console")

‎Qt.Core/Console/Console/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ To build these projects, open each project.pro file with Qt Creator.
2626

2727
To build this project, open "Terminal" and type following lines:
2828

29-
Set "CMAKE_PREFIX_PATH" with Qt5 install path.
29+
Set "CMAKE_PREFIX_PATH" with Qt6 install path.
3030

3131
#### Windows :
3232

‎Qt.Core/Console/ConsoleColor/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@ cmake_minimum_required(VERSION 3.20)
22

33
# Project
44
project(ConsoleColor)
5-
find_package(Qt5Widgets CONFIG REQUIRED)
5+
find_package(Qt6Widgets CONFIG REQUIRED)
6+
if (NOT Qt6_FOUND)
7+
find_package(Qt5Widgets CONFIG REQUIRED)
8+
endif()
69

710
# Options
811
set(CMAKE_CXX_STANDARD 17)
912
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1013

1114
# Application
1215
add_executable(ConsoleColor src/ConsoleColor.cpp)
13-
target_link_libraries(ConsoleColor Qt5::Core)
16+
target_link_libraries(ConsoleColor Qt::Core)
1417
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Console")

‎Qt.Core/Console/ConsoleColor/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ To build these projects, open `ConsoleColor.pro` file with Qt Creator.
5858

5959
To build this project, open "Terminal" and type following lines:
6060

61-
Set `CMAKE_PREFIX_PATH` with Qt5 install path.
61+
Set `CMAKE_PREFIX_PATH` with Qt6 install path.
6262

6363
#### Windows :
6464

‎Qt.Core/Console/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ To build these projects, open `Console.pro` file with Qt Creator.
1515

1616
To build this project, open "Terminal" and type following lines:
1717

18-
Set `CMAKE_PREFIX_PATH` with Qt5 install path.
18+
Set `CMAKE_PREFIX_PATH` with Qt6 install path.
1919

2020
#### Windows :
2121

‎Qt.Core/HelloWorlds/HelloWorldConsole/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
project(HelloWorldConsole)
4-
find_package(Qt5Widgets CONFIG REQUIRED)
4+
find_package(Qt6Widgets CONFIG REQUIRED)
5+
if (NOT Qt6_FOUND)
6+
find_package(Qt5Widgets CONFIG REQUIRED)
7+
endif()
58
set(CMAKE_CXX_STANDARD 17)
69
set(CMAKE_CXX_STANDARD_REQUIRED ON)
710
add_executable(${PROJECT_NAME} src/HelloWorldConsole.cpp)
8-
target_link_libraries(${PROJECT_NAME} Qt5::Core)
11+
target_link_libraries(${PROJECT_NAME} Qt::Core)
912
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/HelloWorlds")

‎Qt.Core/HelloWorlds/HelloWorldConsole/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To build these projects, open `HelloWorldConsole.pro` file with Qt Creator.
2424

2525
To build this project, open "Terminal" and type following lines:
2626

27-
Set `CMAKE_PREFIX_PATH` with Qt5 install path.
27+
Set `CMAKE_PREFIX_PATH` with Qt6 install path.
2828

2929
#### Windows :
3030

‎Qt.Core/HelloWorlds/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ To build these projects, open `HelloWorlds.pro` file with Qt Creator.
1414

1515
To build this project, open "Terminal" and type following lines:
1616

17-
Set `CMAKE_PREFIX_PATH` with Qt5 install path.
17+
Set `CMAKE_PREFIX_PATH` with Qt6 install path.
1818

1919
#### Windows :
2020

‎Qt.Core/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To build these projects, open `Qt.Core.pro` file with Qt Creator.
2323

2424
To build this project, open "Terminal" and type following lines:
2525

26-
Set `CMAKE_PREFIX_PATH` with Qt5 install path.
26+
Set `CMAKE_PREFIX_PATH` with Qt6 install path.
2727

2828
#### Windows :
2929

‎Qt.Core/Strings/StringSplit/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
project(StringSplit)
4-
find_package(Qt5Widgets CONFIG REQUIRED)
4+
find_package(Qt6Widgets CONFIG REQUIRED)
5+
if (NOT Qt6_FOUND)
6+
find_package(Qt5Widgets CONFIG REQUIRED)
7+
endif()
58
set(CMAKE_CXX_STANDARD 17)
69
set(CMAKE_CXX_STANDARD_REQUIRED ON)
710
add_executable(${PROJECT_NAME} src/StringSplit.cpp)
8-
target_link_libraries(${PROJECT_NAME} Qt5::Core)
11+
target_link_libraries(${PROJECT_NAME} Qt::Core)
912
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Strings")

‎Qt.Core/Strings/StringUnicode/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
project(StringUnicode)
4-
find_package(Qt5Widgets CONFIG REQUIRED)
4+
find_package(Qt6Widgets CONFIG REQUIRED)
5+
if (NOT Qt6_FOUND)
6+
find_package(Qt5Widgets CONFIG REQUIRED)
7+
endif()
58
set(CMAKE_CXX_STANDARD 17)
69
set(CMAKE_CXX_STANDARD_REQUIRED ON)
710
add_executable(${PROJECT_NAME} src/StringUnicode.cpp)
8-
target_link_libraries(${PROJECT_NAME} Qt5::Core)
11+
target_link_libraries(${PROJECT_NAME} Qt::Core)
912
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Strings")

‎Qt.Core/Strings/StringUnicode2/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
project(StringUnicode2)
4-
find_package(Qt5Widgets CONFIG REQUIRED)
4+
find_package(Qt6Widgets CONFIG REQUIRED)
5+
if (NOT Qt6_FOUND)
6+
find_package(Qt5Widgets CONFIG REQUIRED)
7+
endif()
58
set(CMAKE_CXX_STANDARD 17)
69
set(CMAKE_CXX_STANDARD_REQUIRED ON)
710
add_executable(${PROJECT_NAME} src/StringUnicode2.cpp)
8-
target_link_libraries(${PROJECT_NAME} Qt5::Core)
11+
target_link_libraries(${PROJECT_NAME} Qt::Core)
912
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Strings")

‎Qt.Core/Tests/TestConsole/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@ cmake_minimum_required(VERSION 3.20)
22

33
# Project
44
project(TestConsole)
5-
find_package(Qt5Widgets CONFIG REQUIRED)
5+
find_package(Qt6Widgets CONFIG REQUIRED)
6+
if (NOT Qt6_FOUND)
7+
find_package(Qt5Widgets CONFIG REQUIRED)
8+
endif()
69

710
# Options
811
set(CMAKE_CXX_STANDARD 17)
912
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1013

1114
# Application
1215
add_executable(TestConsole src/main.cpp)
13-
target_link_libraries(TestConsole Qt5::Core Qt5::Widgets)
16+
target_link_libraries(TestConsole Qt::Core Qt::Widgets)
1417
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/tests")

‎Qt.Widgets/Applications/Application/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.20)
22

33
# Project
44
project(Application)
5-
find_package(Qt5 COMPONENTS Widgets REQUIRED)
5+
find_package(Qt6Widgets CONFIG REQUIRED)
6+
if (NOT Qt6_FOUND)
7+
find_package(Qt5Widgets CONFIG REQUIRED)
8+
endif()
69

710
# Options
811
set(CMAKE_AUTOMOC ON)
@@ -13,5 +16,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
1316

1417
# Application
1518
add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE src/Application.cpp)
16-
target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
19+
target_link_libraries(${PROJECT_NAME} Qt::Widgets)
1720
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Applications")

‎Qt.Widgets/Applications/ApplicationAndException/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.20)
22

33
# Project
44
project(ApplicationAndException)
5-
find_package(Qt5 COMPONENTS Widgets REQUIRED)
5+
find_package(Qt6Widgets CONFIG REQUIRED)
6+
if (NOT Qt6_FOUND)
7+
find_package(Qt5Widgets CONFIG REQUIRED)
8+
endif()
69

710
# Options
811
set(CMAKE_AUTOMOC ON)
@@ -13,5 +16,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
1316

1417
# Application
1518
add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE src/ApplicationAndException.cpp src/ApplicationAndException.h)
16-
target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
19+
target_link_libraries(${PROJECT_NAME} Qt::Widgets)
1720
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Applications")

‎Qt.Widgets/Applications/DarkMode/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.20)
22

33
# Project
44
project(DarkMode)
5-
find_package(Qt5Widgets CONFIG REQUIRED)
5+
find_package(Qt6Widgets CONFIG REQUIRED)
6+
if (NOT Qt6_FOUND)
7+
find_package(Qt5Widgets CONFIG REQUIRED)
8+
endif()
69

710
# Options
811
set(CMAKE_AUTOMOC ON)
@@ -13,5 +16,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
1316

1417
# Application
1518
add_executable(DarkMode WIN32 MACOSX_BUNDLE src/DarkMode.cpp src/DarkMode.h)
16-
target_link_libraries(DarkMode Qt5::Widgets)
19+
target_link_libraries(DarkMode Qt::Widgets)
1720
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Applications")

‎Qt.Widgets/Components/Cursors/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.20)
22

33
# Project
44
project(Cursors)
5-
find_package(Qt5Widgets CONFIG REQUIRED)
5+
find_package(Qt6Widgets CONFIG REQUIRED)
6+
if (NOT Qt6_FOUND)
7+
find_package(Qt5Widgets CONFIG REQUIRED)
8+
endif()
69

710
# Options
811
set(CMAKE_AUTOMOC ON)
@@ -13,5 +16,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
1316

1417
# Application
1518
add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE src/Cursors.cpp src/Cursors.h)
16-
target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
19+
target_link_libraries(${PROJECT_NAME} Qt::Widgets)
1720
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Components")

‎Qt.Widgets/Components/Timer/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.20)
22

33
# Project
44
project(Timer)
5-
find_package(Qt5Widgets CONFIG REQUIRED)
5+
find_package(Qt6Widgets CONFIG REQUIRED)
6+
if (NOT Qt6_FOUND)
7+
find_package(Qt5Widgets CONFIG REQUIRED)
8+
endif()
69

710
# Options
811
set(CMAKE_AUTOMOC ON)
@@ -13,5 +16,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
1316

1417
# Application
1518
add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE src/Timer.cpp src/Timer.h)
16-
target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
19+
target_link_libraries(${PROJECT_NAME} Qt::Widgets)
1720
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Components")

‎Qt.Widgets/Containers/Frame/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.20)
22

33
# Project
44
project(Frame)
5-
find_package(Qt5Widgets CONFIG REQUIRED)
5+
find_package(Qt6Widgets CONFIG REQUIRED)
6+
if (NOT Qt6_FOUND)
7+
find_package(Qt5Widgets CONFIG REQUIRED)
8+
endif()
69

710
# Options
811
set(CMAKE_AUTOMOC ON)
@@ -13,5 +16,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
1316

1417
# Application
1518
add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE src/Frame.cpp src/Frame.h)
16-
target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
19+
target_link_libraries(${PROJECT_NAME} Qt::Widgets)
1720
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Containers")

‎Qt.Widgets/Containers/GroupBox/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.20)
22

33
# Project
44
project(GroupBox)
5-
find_package(Qt5Widgets CONFIG REQUIRED)
5+
find_package(Qt6Widgets CONFIG REQUIRED)
6+
if (NOT Qt6_FOUND)
7+
find_package(Qt5Widgets CONFIG REQUIRED)
8+
endif()
69

710
# Options
811
set(CMAKE_AUTOMOC ON)
@@ -13,5 +16,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
1316

1417
# Application
1518
add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE src/GroupBox.cpp src/GroupBox.h)
16-
target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
19+
target_link_libraries(${PROJECT_NAME} Qt::Widgets)
1720
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Containers")

‎Qt.Widgets/Containers/TabWidget/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.20)
22

33
# Project
44
project(TabWidget)
5-
find_package(Qt5Widgets CONFIG REQUIRED)
5+
find_package(Qt6Widgets CONFIG REQUIRED)
6+
if (NOT Qt6_FOUND)
7+
find_package(Qt5Widgets CONFIG REQUIRED)
8+
endif()
69

710
# Options
811
set(CMAKE_AUTOMOC ON)
@@ -13,5 +16,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
1316

1417
# Application
1518
add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE src/TabWidget.cpp src/TabWidget.h)
16-
target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
19+
target_link_libraries(${PROJECT_NAME} Qt::Widgets)
1720
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Containers")

‎Qt.Widgets/Controls/CheckBox/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.20)
22

33
# Project
44
project(CheckBox)
5-
find_package(Qt5Widgets CONFIG REQUIRED)
5+
find_package(Qt6Widgets CONFIG REQUIRED)
6+
if (NOT Qt6_FOUND)
7+
find_package(Qt5Widgets CONFIG REQUIRED)
8+
endif()
69

710
# Options
811
set(CMAKE_AUTOMOC ON)
@@ -13,5 +16,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
1316

1417
# Application
1518
add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE src/CheckBox.h src/CheckBox.cpp)
16-
target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
19+
target_link_libraries(${PROJECT_NAME} Qt::Widgets)
1720
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Controls")

‎Qt.Widgets/Controls/CheckedListWidget/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.20)
22

33
# Project
44
project(CheckedListWidget)
5-
find_package(Qt5Widgets CONFIG REQUIRED)
5+
find_package(Qt6Widgets CONFIG REQUIRED)
6+
if (NOT Qt6_FOUND)
7+
find_package(Qt5Widgets CONFIG REQUIRED)
8+
endif()
69

710
# Options
811
set(CMAKE_AUTOMOC ON)
@@ -13,5 +16,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
1316

1417
# Application
1518
add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE src/CheckedListWidget.cpp src/CheckedListWidget.h)
16-
target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
19+
target_link_libraries(${PROJECT_NAME} Qt::Widgets)
1720
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Controls")

0 commit comments

Comments
 (0)