summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt32
-rw-r--r--config-version.h.cmake4
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/data/CMakeLists.txt1
-rw-r--r--src/data/about.html.in45
-rw-r--r--src/main.cpp184
6 files changed, 86 insertions, 182 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25bb8a06..5d551f8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,30 +3,27 @@
# ==================================================================================
cmake_minimum_required(VERSION 3.23.3)
-project(rekonq VERSION 3.0.0)
+project(rekonq
+ VERSION 3.0.0
+ HOMEPAGE_URL https://bitbucket.org/celestriad/rekonq
+ LANGUAGES CXX)
+set(CMAKE_CXX_STANDARD 20)
# ==================================================================================
# Information to update before to release this package.
-# rekonq info
-SET(REKONQ_VERSION "3.0.0") # TODO change to CMAKE_PROJECT_VERSION
-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config-version.h )
-
-SET(REKONQ_SITE "http://rekonq.kde.org") # TODO change to CMAKE_PROJECT_HOMEPAGE_URL
-
-
-SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
# ==================================================================================
-
include(FeatureSummary)
include(GNUInstallDirs)
find_package(Qt6 6.3.0 COMPONENTS Core Gui Network WebEngineWidgets REQUIRED)
-set(AUTO_MOC ON)
-set(AUTO_UIC ON)
-set(AUTO_RCC ON)
+# turn on automatic moc/uic/rcc for all targets
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
#FIND_PACKAGE(KDE4 4.8.4 REQUIRED)
@@ -38,6 +35,13 @@ set(AUTO_RCC ON)
ADD_DEFINITIONS(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+option(TESTING "Enable tests" OFF)
+if(TESTING)
+ include(CTest)
+ enable_testing()
+ find_package(GTest REQUIRED)
+ add_definitions(-DREKONQ_TEST_EXPORT)
+endif()
# ==================================================================================
# optional nepomuk requirements
@@ -80,7 +84,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kactivities.h.cmake ${CMAKE_CU
MESSAGE(STATUS "")
MESSAGE(STATUS "-----------------------------------------------------------------------")
-MESSAGE(STATUS " rekonq ${REKONQ_VERSION} dependencies results <${REKONQ_SITE}>")
+MESSAGE(STATUS " rekonq ${CMAKE_PROJECT_VERSION} dependencies results <${CMAKE_PROJECT_HOMEPAGE_URL}>")
MESSAGE(STATUS "")
feature_summary(WHAT ALL)
diff --git a/config-version.h.cmake b/config-version.h.cmake
index cbc6492b..a63ff0f5 100644
--- a/config-version.h.cmake
+++ b/config-version.h.cmake
@@ -1,2 +1,4 @@
-#define REKONQ_VERSION "${REKONQ_VERSION}"
+#pragma once
+
+#define REKONQ_VERSION "${CMAKE_PROJECT_VERSION}"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0eb98dc9..c89267ca 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -234,7 +234,7 @@ ADD_DEFINITIONS ( ${KDE4_DEFINITIONS} )
### --------------- ADDING EXECUTABLE...
#KDE4_ADD_KDEINIT_EXECUTABLE( rekonq ${rekonq_KDEINIT_SRCS} main.cpp )
-add_executable(rekonq ${rekonq_KDEINIT_SRCS} main.cpp)
+add_executable(rekonq EXCLUDE_FROM_ALL ${rekonq_KDEINIT_SRCS} main.cpp)
### --------------- TARGETTING LINK LIBRARIES...
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index 51fd0bf6..33fe8eb3 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -48,3 +48,4 @@ INSTALL(
)
message(STATUS "install ${CMAKE_INSTALL_DATAROOTDIR}/rekonq")
+configure_file(about.html.in about.html)
diff --git a/src/data/about.html.in b/src/data/about.html.in
new file mode 100644
index 00000000..3c40ecb4
--- /dev/null
+++ b/src/data/about.html.in
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>About rekonq</title>
+</head>
+<body>
+
+<p>rekonq ${CMAKE_PROJECT_VERSION}</p>
+<p>License: GPL v3</p>
+<p>(C) 2008-2013 Andrea Diamantini"</p>
+<p>${CMAKE_PROJECT_HOMEPAGE_URL}</p>
+
+<h2> Authors </h2>
+<p>Andrea Diamantini, Project Lead, Developer, Maintainer, adjam7@gmail.com, http://www.adjam.org</p>
+<p>Johannes Tröscher, QGraphicsEffect expert. Tabbar highlight animation, fritz_van_tom@hotmail.com</p>
+<p>Furkan Uzumcu, A lot of improvements, especially on usability, furkanuzumcu@gmail.com</p>
+<p>Yoann Laissus, Developer, History & Bookmarks Improvements, yoann.laissus@gmail.com</p>
+<p>Cédric Bellegarde, Patched code quite everywhere :), gnumdk@adishatz.1s.fr</p>
+<p>Jon Ander Peñalba, Bookmarks code peer reviewer. A fantastic help, jonan88@gmail.com, http://identi.ca/jonan</p>
+<p>Pierre Rossi, Urlbar, tests, new tab page, bars... and more, pierre.rossi@gmail.com</p>
+<p>Lionel Chauvin, Development, Ideas, Mockups, rekonq Icon, megabigbug@yahoo.fr</p>
+<p>Siteshwar Vashisht, Code, Ideas, sync... and IRC chats!, siteshwar@gmail.com</p>
+<p>Tirtha Chatterjee, A lot of nice work, here and there in the code :), tirtha.p.chatterjee@gmail.com</p>
+<p>Lindsay Mathieson, Implemented inline spellcheck, provided hints, discovered bugs, lindsay.mathieson@gmail.com</p>
+
+<h2>Credits</h2>
+<p>Dawit Alemayehu, KDEWebKit (main) developer. And KIO. And KUriFilter. And more..., adawit@kde.org</p>
+<p>Jekyll Wu, Bug triaging. Impressive job about..., adaptee@gmail.com</p>
+<p>Dimitrios Christidis, Provides patches, fixes and good testing, dchristidis@ceid.upatras.gr</p>
+<p>Panagiotis Papadopoulos, Quite everything but code, pano_90@gmx.net</p>
+<p>Phaneendra Hedge, Nepomuk fancy bookmarking, pnh.pes@gmail.com</p>
+<p>Jonathan Raphael Joachim Kolberg, Handbook, Maintains a Kubuntu PPA with rekonq git packages, bulldog98@freenet.de</p>
+<p>Benjamin Poulain, The "QtWebKit guy". Adblock (new) implementation. Code quality improvements, ikipou@gmail.com, http://www.openyourcode.org/</p>
+<p>Rohan Garg, Handbook, Maintains a Kubuntu PPA with rekonq git packages, rohan16garg@gmail.com</p>
+<p>Anton Kreuzkamp, Session Management, patches, akreuzkamp@web.de</p>
+<p>David E. Narváez, Implemented User Session Management and cleaned up SessionManager code, david.narvaez@computer.org</p>
+<p>Marc Deop, Access Keys Navigation, damnshock@gmail.com</p>
+<p>Yuri Chornoivan, Checking rekonq strings, helping with docs, yurchor@ukr.net</p>
+<p>Burkhard Lück, Checking rekonq strings, helping with docs, lueck@hube-lueck.de</p>
+<p>Andrius da Costa Ribas, Helped letting rekonq compile on Windows/MSVC and Mac OS X, andriusmao@gmail.com</p>
+<p>Pino Toscano, fixuifiles ;), pino@kde.org</p>
+
+</body>
+</html> \ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 430e322b..85414391 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,7 +34,6 @@
#include "urlresolver.h"
// KDE Includes
-#include <KDE/KAboutData>
#include <KDE/KUniqueApplication>
#include <KDE/KCmdLineArgs>
#include <KDebug>
@@ -50,171 +49,24 @@ static const char description[] =
extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
- KAboutData about("rekonq",
- 0,
- ki18n("rekonq"),
- REKONQ_VERSION,
- ki18n(description),
- KAboutData::License_GPL_V3,
- ki18n("(C) 2008-2013 Andrea Diamantini"),
- KLocalizedString(),
- "http://rekonq.kde.org"
- );
-
-
- // --------------- about authors -----------------------------
- about.addAuthor(ki18n("Andrea Diamantini"),
- ki18n("Project Lead, Developer, Maintainer"),
- "adjam7@gmail.com",
- "http://www.adjam.org");
-
- about.addAuthor(ki18n("Johannes Tröscher"),
- ki18n("QGraphicsEffect expert. Tabbar highlight animation"),
- "fritz_van_tom@hotmail.com",
- "");
-
- about.addAuthor(ki18n("Furkan Uzumcu"),
- ki18n("A lot of improvements, especially on usability"),
- "furkanuzumcu@gmail.com",
- "");
-
- about.addAuthor(ki18n("Yoann Laissus"),
- ki18n("Developer, History & Bookmarks Improvements"),
- "yoann.laissus@gmail.com",
- "");
-
- about.addAuthor(ki18n("Cédric Bellegarde"),
- ki18n("Patched code quite everywhere :)"),
- "gnumdk@adishatz.1s.fr",
- "");
-
- about.addAuthor(ki18n("Jon Ander Peñalba"),
- ki18n("Bookmarks code peer reviewer. A fantastic help"),
- "jonan88@gmail.com",
- "http://identi.ca/jonan");
-
- about.addAuthor(ki18n("Pierre Rossi"),
- ki18n("Urlbar, tests, new tab page, bars... and more"),
- "pierre.rossi@gmail.com",
- "");
-
- about.addAuthor(ki18n("Lionel Chauvin"),
- ki18n("Development, Ideas, Mockups, rekonq Icon"),
- "megabigbug@yahoo.fr",
- "");
-
- about.addAuthor(ki18n("Siteshwar Vashisht"),
- ki18n("Code, Ideas, sync... and IRC chats!"),
- "siteshwar@gmail.com",
- "");
-
- about.addAuthor(ki18n("Tirtha Chatterjee"),
- ki18n("A lot of nice work, here and there in the code :)"),
- "tirtha.p.chatterjee@gmail.com",
- "");
-
- about.addAuthor(ki18n("Lindsay Mathieson"),
- ki18n("Implemented inline spellcheck, provided hints, discovered bugs"),
- "lindsay.mathieson@gmail.com",
- "");
-
-
- // --------------- about credits -----------------------------
- about.addCredit(ki18n("Dawit Alemayehu"),
- ki18n("KDEWebKit (main) developer. And KIO. And KUriFilter. And more.."),
- "adawit@kde.org",
- "");
-
- about.addCredit(ki18n("Jekyll Wu"),
- ki18n("Bug triaging. Impressive job about..."),
- "adaptee@gmail.com",
- "");
-
- about.addCredit(ki18n("Dimitrios Christidis"),
- ki18n("Provides patches, fixes and good testing"),
- "dchristidis@ceid.upatras.gr",
- "");
-
- about.addCredit(ki18n("Panagiotis Papadopoulos"),
- ki18n("Quite everything but code"),
- "pano_90@gmx.net",
- "");
-
- about.addCredit(ki18n("Phaneendra Hedge"),
- ki18n("Nepomuk fancy bookmarking"),
- "pnh.pes@gmail.com",
- "");
-
- about.addCredit(ki18n("Jonathan Raphael Joachim Kolberg"),
- ki18n("Handbook, Maintains a Kubuntu PPA with rekonq git packages"),
- "bulldog98@freenet.de",
- "");
-
- about.addCredit(ki18n("Benjamin Poulain"),
- ki18n("The \"QtWebKit guy\". Adblock (new) implementation. Code quality improvements"),
- "ikipou@gmail.com",
- "http://www.openyourcode.org/");
-
- about.addCredit(ki18n("Rohan Garg"),
- ki18n("Handbook, Maintains a Kubuntu PPA with rekonq git packages."),
- "rohan16garg@gmail.com",
- "");
-
- about.addCredit(ki18n("Anton Kreuzkamp"),
- ki18n("Session Management, patches"),
- "akreuzkamp@web.de",
- "");
-
- about.addCredit(ki18n("David E. Narváez"),
- ki18n("Implemented User Session Management and cleaned up SessionManager code"),
- "david.narvaez@computer.org",
- "");
-
- about.addCredit(ki18n("Marc Deop"),
- ki18n("Access Keys Navigation"),
- "damnshock@gmail.com",
- "");
-
- about.addCredit(ki18n("Yuri Chornoivan"),
- ki18n("Checking rekonq strings, helping with docs"),
- "yurchor@ukr.net",
- "");
-
- about.addCredit(ki18n("Burkhard Lück"),
- ki18n("Checking rekonq strings, helping with docs"),
- "lueck@hube-lueck.de",
- "");
-
- about.addCredit(ki18n("Andrius da Costa Ribas"),
- ki18n("Helped letting rekonq compile on Windows/MSVC and Mac OS X"),
- "andriusmao@gmail.com",
- "");
-
- about.addCredit(ki18n("Pino Toscano"),
- ki18n("fixuifiles ;)"),
- "pino@kde.org",
- "");
-
-
- // Initialize command line args
- KCmdLineArgs::init(argc, argv, &about);
-
- // Define the command line options using KCmdLineOptions
- KCmdLineOptions options;
-
- // adding options
- options.add("incognito" , ki18n("Open in incognito mode"));
- options.add("webapp" , ki18n("Open URL as web app (in a simple window)"));
- options.add("+[URL]" , ki18n("Location to open"));
-
- // Register the supported options
- KCmdLineArgs::addCmdLineOptions(options);
-
- if (!Application::start())
- {
- kWarning() << "rekonq is already running!";
- return 0;
- }
+ // Initialize command line args
+ KCmdLineArgs::init(argc, argv, &about);
+
+ // Define the command line options using KCmdLineOptions
+ KCmdLineOptions options;
+
+ // adding options
+ options.add("incognito", ki18n("Open in incognito mode"));
+ options.add("webapp", ki18n("Open URL as web app (in a simple window)"));
+ options.add("+[URL]", ki18n("Location to open"));
+
+ // Register the supported options
+ KCmdLineArgs::addCmdLineOptions(options);
+
+ if (!Application::start()) {
+ kWarning() << "rekonq is already running!";
+ return 0;
+ }
#if defined(Q_WS_X11)
// On X11, the raster engine gives better performance than native.
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 19:22:08 +0000