Update build scripts

CMakeLists.txt

@@ -2,4 +2,6 @@ cmake_minimum_required(VERSION 3.1.0)
 
 project(theterminal VERSION 1.0.0 LANGUAGES CXX)
 
+find_package(QT REQUIRED NAMES Qt6)
+
 add_subdirectory(terminal)

README.md

@@ -2,22 +2,21 @@
 
 ---
 <p align="center">
-<a href="https://travis-ci.org/vicr123/theTerminal"><img src="https://img.shields.io/travis/vicr123/theterminal/blueprint?label=Linux%2C%20macOS&style=for-the-badge" alt="Travis CI Build Status" /></a>
-<img src="https://img.shields.io/github/license/vicr123/theterminal?style=for-the-badge" />
+<img src="https://img.shields.io/github/license/theCheeseboard/theterminal?style=for-the-badge" />
 </p>
 
 theTerminal is a terminal emulator designed to integrate well with theShell and come with many features.
 
 ---
 
 # Dependencies
-- Qt 5
+- Qt 6
   - Qt Core
   - Qt GUI
   - Qt Widgets
   - Qt WebEngine
   - Qt SVG
-- [the-libs](https://github.com/vicr123/the-libs)
+- [libcontemporary](https://github.com/vicr123/libcontemporary)
 - [tttermwidget](https://github.com/vicr123/tttermwidget)
 
 # Get
@@ -27,19 +26,18 @@ If you're using a supported operating system, we may have binaries available:
 |-------------------|---------------------------------------------------------------------------------------------------------|
 | macOS | ~~[Application Bundle on GitHub Releases](https://github.com/vicr123/theTerminal/releases)~~ Coming soon! |
 | Arch Linux | `theterminal` on the AUR |
-| Other Linux | [AppImage on GitHub Releases](https://github.com/vicr123/theTerminal/releases) |
 
 ## Build
 Run the following commands in your terminal. 
 ```
-qmake
-make
+cmake -B build -S .
+cmake --build build
 ```
 
 ## Install
 On Linux, run the following command in your terminal (with superuser permissions)
 ```
-make install
+cmake --install build
 ```
 
 On macOS, drag the resulting application bundle (`theTerminal.app` or `theTerminal Blueprint.app`, depending on which branch you're building) into your Applications folder
@@ -49,6 +47,6 @@ Thanks for your interest in theTerminal! Check out the [CONTRIBUTING.md](CONTRIB
 
 ---
 
-> © Victor Tran, 2019. This project is licensed under the GNU General Public License, version 3, or at your option, any later version.
+> © Victor Tran, 2023. This project is licensed under the GNU General Public License, version 3, or at your option, any later version.
 > 
-> Check the [LICENSE](LICENSE) file for more information.
+> Check the [LICENSE](LICENSE) file for more information.

terminal/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.21.0)
 
 project(theterminal VERSION 1.0.0 LANGUAGES CXX)
 
-find_package(Qt6 REQUIRED COMPONENTS Widgets DBus)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets DBus)
 find_package(libcontemporary REQUIRED)
 find_package(tttermwidget REQUIRED)
 
@@ -74,7 +74,7 @@ set_target_properties(theterminal PROPERTIES
         MACOSX_BUNDLE_GUI_IDENTIFIER com.vicr123.theterminal
         CNTP_DATA_SUBDIR theterminal)
 
-cntp_init(theterminal 17)
+cntp_init(theterminal 20)
 cntp_translate(theterminal)
 cntp_target_name(theterminal "theTerminal")
 cntp_app_icon(theterminal
@@ -86,7 +86,7 @@ cntp_target_desktop_file(theterminal
 cntp_defaults_file(theterminal
     DEFAULTS_FILE theterminal.conf)
 
-target_link_libraries(theterminal Qt6::Widgets Qt6::DBus libcontemporary tttermwidget)
+target_link_libraries(theterminal Qt::Widgets Qt::DBus libcontemporary tttermwidget)
 
 install(TARGETS theterminal
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

terminal/terminalpart.cpp

@@ -118,11 +118,11 @@ void TerminalPart::setup() {
 
     reloadThemeSettings();
 
-    connect(this, &TerminalPart::copyAvailable, [=](bool copyAvailable) {
+    connect(this, &TerminalPart::copyAvailable, this, [this](bool copyAvailable) {
         d->copyOk = copyAvailable;
     });
 
-    connect(this, &TerminalPart::bell, [=] {
+    connect(this, &TerminalPart::bell, this, [this] {
         if (this->hasFocus()) {
             // Active terminal
             if (d->settings.value("bell/bellActiveSound", true).toBool()) {
@@ -148,7 +148,7 @@ void TerminalPart::setup() {
             }
         }
     });
-    connect(this, &TerminalPart::shellProgramFinished, this, [=](int exitCode) {
+    connect(this, &TerminalPart::shellProgramFinished, this, [this](int exitCode) {
         if (d->quitType == TerminalPartPrivate::UseSettings) {
             d->quitType = static_cast<TerminalPartPrivate::QuitType>(d->settings.value("term/quitType", 0).toInt());
         }