[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [rekonq/frameworks] /: Clean up CMakeLists file and Frameworks deps
From: Andrea Diamantini <adjam7 () gmail ! com>
Date: 2014-10-03 16:58:50
Message-ID: E1Xa6Bu-000058-VP () scm ! kde ! org
[Download RAW message or body]
Git commit fdc7dfd60f9b049eb5f8cb3fe0534dd28a7207c9 by Andrea Diamantini.
Committed on 03/10/2014 at 16:59.
Pushed by adjam into branch 'frameworks'.
Clean up CMakeLists file and Frameworks deps
M +23 -162 CMakeLists.txt
M +0 -9 src/CMakeLists.txt
M +3 -0 src/adblock/adblocksettingwidget.h
M +3 -0 src/tabwindow/tabpreviewpopup.h
M +1 -0 src/useragent/useragentinfo.cpp
http://commits.kde.org/rekonq/fdc7dfd60f9b049eb5f8cb3fe0534dd28a7207c9
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ede514..ea5bd5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,44 +6,31 @@
CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12 FATAL_ERROR)
+
# ==================================================================================
# project name
PROJECT (rekonq)
-# ==================================================================================
-# Information to update before to release this package.
-
# rekonq info
SET (REKONQ_VERSION "3.X.Y")
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")
# ==================================================================================
# Extra CMake Modules
FIND_PACKAGE (ECM 1.0.0 REQUIRED NO_MODULE)
-
SET (CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+INCLUDE(ECMInstallIcons)
+INCLUDE(FeatureSummary)
-INCLUDE (ECMOptionalAddSubdirectory)
-INCLUDE (ECMInstallIcons)
-INCLUDE (ECMSetupVersion)
-INCLUDE (ECMGenerateHeaders)
-INCLUDE (GenerateExportHeader)
-
-INCLUDE (CMakePackageConfigHelpers)
-INCLUDE (FeatureSummary)
-INCLUDE (WriteBasicConfigVersionFile)
-INCLUDE (CheckFunctionExists)
+INCLUDE(KDEInstallDirs)
+INCLUDE(KDECMakeSettings)
+INCLUDE(KDECompilerSettings)
-INCLUDE (KDEInstallDirs)
-INCLUDE (KDECMakeSettings)
-INCLUDE (KDECompilerSettings)
-INCLUDE (KDEFrameworkCompilerSettings)
# ==================================================================================
@@ -51,7 +38,17 @@ INCLUDE (KDEFrameworkCompilerSettings)
SET (QT_MIN_VERSION "5.3.0")
-FIND_PACKAGE(Qt5 ${QT_MIN_VERSION} REQUIRED Core Gui Widgets Network Script \
WebKitWidgets Concurrent PrintSupport) +FIND_PACKAGE(Qt5 ${QT_MIN_VERSION} REQUIRED
+ Core
+ Gui
+ Widgets
+ Network
+ Script
+ WebKitWidgets
+ Concurrent
+ PrintSupport
+)
+
# ==================================================================================
# KDE Frameworks
@@ -59,27 +56,18 @@ FIND_PACKAGE(Qt5 ${QT_MIN_VERSION} REQUIRED Core Gui Widgets \
Network Script WebK SET (KF5_MIN_VERSION "5.0.0")
# FIXME: Min version check
-FIND_PACKAGE (KF5 REQUIRED COMPONENTS
- Auth
+FIND_PACKAGE (KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
Bookmarks
- Codecs
- Config
- ConfigWidgets
- CoreAddons
DBusAddons
GlobalAccel
- GuiAddons
I18n
IconThemes
Init
ItemViews
- JobWidgets
KCMUtils
Notifications
Sonnet
- TextWidgets
Wallet
- WidgetsAddons
WindowSystem
XmlGui
# -------------------------
@@ -91,146 +79,19 @@ FIND_PACKAGE (KF5 REQUIRED COMPONENTS
# ==================================================================================
-# optional nepomuk requirements
-
-# we HAVE TO move to Baloo here...
-#if(WITH_NEPOMUK)
-# FIND_PACKAGE(Soprano)
-#
-# FIND_PACKAGE(NepomukCore 0.1.0)
-#endif()
-#
-#IF(SOPRANO_FOUND AND NepomukCore_FOUND)
-# ADD_DEFINITIONS(-DHAVE_NEPOMUK)
-# ENDIF(SOPRANO_FOUND AND NepomukCore_FOUND)
-
-# ==================================================================================
-# optional QCA2 & QtOAuth requirements
+# Adding subdirectories
-# MACRO_OPTIONAL_FIND_PACKAGE(QCA2)
-# MACRO_BOOL_TO_01(QCA2_FOUND HAVE_QCA2)
-#
-# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-qca2.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/src/config-qca2.h )
-#
-#
-# MACRO_OPTIONAL_FIND_PACKAGE(QtOAuth)
-# MACRO_BOOL_TO_01(QTOAUTH_FOUND HAVE_QTOAUTH)
-#
-# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-qtoauth.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/src/config-qtoauth.h ) +ADD_SUBDIRECTORY (src)
+ADD_SUBDIRECTORY (icons)
# ==================================================================================
# Log messages
-MESSAGE(STATUS "")
-MESSAGE(STATUS "-----------------------------------------------------------------------")
-MESSAGE(STATUS " rekonq ${REKONQ_VERSION} dependencies results <${REKONQ_SITE}>")
-MESSAGE(STATUS "")
-
-# Require shared libraries results.
-
-# ----------------------------------- Qt -------------------------------------
-
-IF(Qt5Core_FOUND)
- MESSAGE(STATUS " Qt library found...................... YES")
- MESSAGE(STATUS " Qt version ${Qt5Core_VERSION_STRING} found! ")
-ELSE(Qt5Core_FOUND)
- MESSAGE(STATUS " Qt library found...................... NO")
- MESSAGE(STATUS "")
- MESSAGE(SEND_ERROR " rekonq ${REKONQ_VERSION} needs at least Qt \
${QT_MIN_VERSION}. Please install it and try compiling again.")
- MESSAGE(STATUS " Qt website is at http://qt-project.org")
- MESSAGE(STATUS "")
-ENDIF(Qt5Core_FOUND)
-
-MESSAGE(STATUS "")
-
-# ---------------------------------- KDE -------------------------------------
-
-IF(KF5_FOUND)
- MESSAGE(STATUS " KDE Desktop Environment............... YES")
- MESSAGE(STATUS " KDE version ${KF5_VERSION} found! ")
-ELSE(KF5_FOUND)
- MESSAGE(STATUS " KDE Desktop Environment............... NO")
- MESSAGE(STATUS "")
- MESSAGE(SEND_ERROR " rekonq ${REKONQ_VERSION} needs at least KDE \
${KF5_MIN_VERSION}. Please install it and try compiling again.")
- MESSAGE(STATUS " KDE website is at http://www.kde.org")
- MESSAGE(STATUS "")
-ENDIF(KF5_FOUND)
-
-##### FINAL RESULTS #####
-
-# create suspance..
-MESSAGE(STATUS "")
-MESSAGE(STATUS "")
-
-IF(Qt5Core_FOUND AND KF5_FOUND)
- MESSAGE(STATUS " rekonq will be compiled............... YES")
- SET(REKONQ_CAN_BE_COMPILED true)
-ELSE(Qt5Core_FOUND AND KF5_FOUND)
- MESSAGE(FATAL_ERROR " rekonq will NOT be compiled!")
- SET(REKONQ_CAN_BE_COMPILED false)
-ENDIF(Qt5Core_FOUND AND KF5_FOUND)
-
-# ----------------------- Optional Deps --------------------------------------
-
-IF(REKONQ_CAN_BE_COMPILED)
- MESSAGE(STATUS "")
- MESSAGE(STATUS "")
- MESSAGE(STATUS " ----- Optional Features")
- MESSAGE(STATUS "")
-
- # Nepomuk
-
-# IF(SOPRANO_FOUND AND NepomukCore_FOUND)
-# MESSAGE(STATUS " Nepomuk Libraries..................... YES")
-# MESSAGE(STATUS " Rekonq will be compiled with support for bookmarks nepomuk \
tagging")
-# ELSE(SOPRANO_FOUND AND NepomukCore_FOUND)
-# MESSAGE(STATUS " Nepomuk Libraries..................... NO")
-# MESSAGE(STATUS " Rekonq will be compiled WITHOUT support for bookmarks \
tagging")
-# ENDIF(SOPRANO_FOUND AND NepomukCore_FOUND)
-
- MESSAGE(STATUS "")
-
-# # QCA2
-#
-# IF(HAVE_QCA2)
-# MESSAGE(STATUS " QCA2 Libraries........................ YES")
-# ELSE(HAVE_QCA2)
-# MESSAGE(STATUS " QCA2 Libraries........................ NO")
-# ENDIF(HAVE_QCA2)
-#
-# # QTOAUTH
-#
-# IF(HAVE_QTOAUTH)
-# MESSAGE(STATUS " QtOAuth Libraries..................... YES")
-# ELSE(HAVE_QTOAUTH)
-# MESSAGE(STATUS " QtOAuth Libraries..................... NO")
-# ENDIF(HAVE_QTOAUTH)
-#
-#
-# IF(HAVE_QCA2 AND HAVE_QTOAUTH)
-# MESSAGE(STATUS " Rekonq will be compiled with support for opera sync \
handler")
-# ELSE(HAVE_QCA2 AND HAVE_QTOAUTH)
-# MESSAGE(STATUS " Rekonq will be compiled WITHOUT support for opera sync \
handler")
-# ENDIF(HAVE_QCA2 AND HAVE_QTOAUTH)
-
- MESSAGE(STATUS "")
- MESSAGE(STATUS "-----------------------------------------------------------------------")
- MESSAGE(STATUS "")
-
-ENDIF(REKONQ_CAN_BE_COMPILED)
-
-# ===============================================================================
-
-IF(REKONQ_CAN_BE_COMPILED)
-
- ADD_SUBDIRECTORY (src)
- ADD_SUBDIRECTORY (icons)
-
-ENDIF(REKONQ_CAN_BE_COMPILED)
+FEATURE_SUMMARY(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
-# ================================================================================
+# ================================================================================
# doc & translations
SET_PROPERTY (GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bea6f1a..c205ed5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -248,25 +248,16 @@ TARGET_LINK_LIBRARIES ( kdeinit_rekonq
Qt5::Concurrent
Qt5::PrintSupport
# ---------------------------------------
- KF5::Auth
KF5::Bookmarks
- KF5::Codecs
- KF5::ConfigCore
- KF5::ConfigWidgets
- KF5::CoreAddons
KF5::DBusAddons
KF5::GlobalAccel
- KF5::GuiAddons
KF5::I18n
KF5::IconThemes
KF5::ItemViews
- KF5::JobWidgets
KF5::KCMUtils
KF5::Notifications
KF5::SonnetCore
- KF5::TextWidgets
KF5::Wallet
- KF5::WidgetsAddons
KF5::WindowSystem
KF5::XmlGui
# ---------------------------------------
diff --git a/src/adblock/adblocksettingwidget.h b/src/adblock/adblocksettingwidget.h
index 0869240..746d6fe 100644
--- a/src/adblock/adblocksettingwidget.h
+++ b/src/adblock/adblocksettingwidget.h
@@ -41,6 +41,9 @@
#include <QWidget>
+// NOTE
+// Can we remove from UI the KListWidgetSearchLine class
+// to remove KItemViews dep??
class AdBlockSettingWidget : public QWidget, private Ui::adblock
{
Q_OBJECT
diff --git a/src/tabwindow/tabpreviewpopup.h b/src/tabwindow/tabpreviewpopup.h
index c258227..6af784d 100644
--- a/src/tabwindow/tabpreviewpopup.h
+++ b/src/tabwindow/tabpreviewpopup.h
@@ -41,6 +41,9 @@ class QPixmap;
class QString;
+// NOTE:
+// Can we substitute this with a QLabel (or something different)
+// to remove KNotifications deps?
class TabPreviewPopup : public KPassivePopup
{
Q_OBJECT
diff --git a/src/useragent/useragentinfo.cpp b/src/useragent/useragentinfo.cpp
index 05ffef0..6eba89e 100644
--- a/src/useragent/useragentinfo.cpp
+++ b/src/useragent/useragentinfo.cpp
@@ -42,6 +42,7 @@
// Qt includes
#include <QLocale>
+#include <QStringBuilder>
UserAgentInfo::UserAgentInfo()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic