[kate] doc/katepart: Turn the version into a integer number (rather thing of a revision)
Git commit 92e71151321fd642e5dc14948a30d1f61edfcbe4 by Dominik Haumann. Committed on 08/09/2016 at 21:30. Pushed by dhaumann into branch 'master'. Turn the version into a integer number (rather thing of a revision) We will change this in the documentation and our hl files, the code stays compatible with the floating point numbers, though. M +3-3doc/katepart/development.docbook http://commits.kde.org/kate/92e71151321fd642e5dc14948a30d1f61edfcbe4 diff --git a/doc/katepart/development.docbook b/doc/katepart/development.docbook index 1c72046..3c106bb 100644 --- a/doc/katepart/development.docbook +++ b/doc/katepart/development.docbook @@ -256,11 +256,11 @@ Available attributes are: name sets the name of the language. It appears in the menus and dialogs afterwards. section specifies the category. extensions defines file extensions, such as "*.cpp;*.h" +version specifies the current revision of the definition file in terms of an integer number. Whenever you change a highlighting definition file, make sure to increase this number. +kateversion specifies the latest supported &kappname; version. Optional attributes: mimetype associates files &MIME; type. -version specifies the current version of the definition file. -kateversion specifies the latest supported &kappname; version. casesensitive defines, whether the keywords are case sensitive or not. priority is necessary if another highlight definition file uses the same extensions. The higher priority will win. author contains the name of the author and his email-address. @@ -269,7 +269,7 @@ Available attributes are: hidden defines whether the name should appear in &kappname;'s menus. So the next line may look like this: -+
[skrooge] /: Show amount sign on lost focus
Git commit fd654830493963b2c8cc5ac114ec971e4cbdb8bb by Stephane Mankowski. Committed on 08/09/2016 at 19:40. Pushed by smankowski into branch 'master'. Show amount sign on lost focus BUG:368356 Update documentation M +1-0CHANGELOG M +1-0doc/index.docbook http://commits.kde.org/skrooge/fd654830493963b2c8cc5ac114ec971e4cbdb8bb diff --git a/CHANGELOG b/CHANGELOG index 41a0d37..40eef7b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ skrooge (2.5.0) *Correction bug 364407: Doesn't build with Qt 5.7 *Correction bug 366025: Skrooge perpetually asks me to save updated tab state *Correction bug 368196: Delete sub-operations in edit delete selected operation in list + *Correction bug 368356: Show amount sign on lost focus *Correction bug 368195: No lock on target account for a transfer *Correction: Migration connect from ui file to cpp file *Correction: Better colors of amounts in tooltips of advices diff --git a/doc/index.docbook b/doc/index.docbook index ad64040..5e89e0a 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -1338,6 +1338,7 @@ The amount is how much you spent or earned with this operation. &appname; requires you enter this in two separate fields: Quantity, and Unit. The quantity is negative for an expense (-30, for example), and positive for an income (+250, or simply 250). This field acts as a calculator, &ie; entering an expression such as 10 + 3.23*2 will result in the field containing 16.46. + If the sign of the quantity is not specified, then &appname; will use the category to find the most appropriate one. &appname; requires you to enter the unit because an operation is not necessarily made in your main currency. For example, when you buy or purchase shares, the unit of the operation is the share unit.
[marble] /: Update some comments & notes to Qt5/KF5
Git commit af95f5f04b6eacb06973a3227faa7366e82bd657 by Friedrich W. H. Kossebau. Committed on 08/09/2016 at 14:28. Pushed by kossebau into branch 'master'. Update some comments & notes to Qt5/KF5 M +7-7INSTALL M +2-2doc/index.docbook M +1-1src/apps/marble-kde/KdeMainWindow.cpp M +1-1src/apps/marble-kde/marble_part.cpp M +2-2src/lib/marble/MarbleDirs.h M +1-1src/plasmarunner/plasmarunner.cpp M +1-1src/thumbnailer/thumbnailer.h http://commits.kde.org/marble/af95f5f04b6eacb06973a3227faa7366e82bd657 diff --git a/INSTALL b/INSTALL index 466b71f..33a7f50 100644 --- a/INSTALL +++ b/INSTALL @@ -2,7 +2,7 @@ This file describes how to build and install Marble The most recent version of this file can be found at: -http://marble.kde.org/sources.php +https://marble.kde.org/sources.php Please refer to the online version above if possible. @@ -14,9 +14,9 @@ NOTE: This file describes how to build Marble as a stand-alone Prerequisites for building Marble are: - - Qt 4.7 or newer - - cmake version 2.4 or newer - - (optional): kdelibs from the KDE subversion repositories. + - Qt 5.3 or newer + - Cmake version 2.8.12 or newer + - (optional): KDE Frameworks 5.7 or newer (KF5) from the KDE repositories. - other dependencies are optional A checkout of Marble. You can check out Marble using GIT via the command: @@ -27,7 +27,7 @@ git clone git://anongit.kde.org/marble ~/marble/sources You can build and install Marble in two different ways: 1. As a Qt-only application. -2. As a KDE application, using kdelibs and KDE based classes. +2. As a KF5-based application, using KDE Frameworks 5 classes. Choose one of them and read below for how to do it. @@ -81,10 +81,10 @@ Finally, also from the build directory, type: and start Marble either from the menu or via the command line: - marble + marble-qt -2. Build Marble as a KDE application. +2. Build Marble as a KF5-based application. 2.1 Create a build directory diff --git a/doc/index.docbook b/doc/index.docbook index 2cf27ed..895e446 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -1456,8 +1456,8 @@ url="https://owncloud.com/";>ownClowd official website. Compilation and Installation - &marble; can be compiled as a &Qt; 4-only version as well as featuring &kde; 4 support. - To compile &marble; with &Qt; 4-only support check out &marble; from &kde; Git into ~/marble and just do: cmake -DWITH_KF5=FALSE ~/marble and sudo make install. To compile &marble; with &kde; support check instructions on how to compile &kde; applications at http://techbase.kde.org/";>&kde;'s TechBase. + &marble; can be compiled as a &Qt; 5-only version as well as featuring &kde; &frameworks; 5 usage. + To compile &marble; with &Qt; 5-only support check out &marble; from its &kde; Git repository into ~/marble and just do: cmake -DWITH_KF5=FALSE ~/marble and sudo make install. To compile &marble; with &kde; &frameworks; 5 usage check instructions on how to compile &kde; applications at http://techbase.kde.org/";>&kde;'s TechBase. diff --git a/src/apps/marble-kde/KdeMainWindow.cpp b/src/apps/marble-kde/KdeMainWindow.cpp index 2c879a9..a668b8a 100644 --- a/src/apps/marble-kde/KdeMainWindow.cpp +++ b/src/apps/marble-kde/KdeMainWindow.cpp @@ -18,7 +18,7 @@ #include #include -// KDE +// KF #include #include #include diff --git a/src/apps/marble-kde/marble_part.cpp b/src/apps/marble-kde/marble_part.cpp index 755c836..b312c0e 100644 --- a/src/apps/marble-kde/marble_part.cpp +++ b/src/apps/marble-kde/marble_part.cpp @@ -32,7 +32,7 @@ #include #include -// KDE +// KF #include #include #include diff --git a/src/lib/marble/MarbleDirs.h b/src/lib/marble/MarbleDirs.h index 1d7a16e..fa44433 100644 --- a/src/lib/marble/MarbleDirs.h +++ b/src/lib/marble/MarbleDirs.h @@ -25,8 +25,8 @@ namespace Marble /** * @short A class that manages data look-up for Marble. * - * The class basically does for Marble what KStandardDirs does for KDE. - * Given that the MarbleWidget is a Qt4-only library and given that it + * The class basically does for Marble what KStandardDirs did for KDE4. + * Given that the MarbleWidget is a Qt5-only library and given that it * comes with its own model and data we need this class. * * The class needs to respect the requirements of the different plattforms, diff --git a/src/plasmarunner/plasmarunner.cpp b/src/plasmarunner/plasmarunner.cpp index c80fc43..f6de8a4 100644 --- a/src/plasmarunner/plasmarunner.cpp +++ b/src/plasmarunner/plasmarunner.cpp @@ -22,7 +22,7 @@ #include #include -// KF5 +// KF #include // Qt diff --git a/src/thumbnailer/thumbnailer.h b/src/thumbnailer/thumbnailer.h index fb5df3e..a85606a 100644 --- a/src/thumbnailer/thumbnailer.h +++ b/src/thumbnailer/thumbnailer.h @@ -20,7 +20,7 @
[marble] /: Remove deprecated QTONLY cmake flag
Git commit 2522847856a96d18a31da248be86d224bfe04ef6 by Friedrich W. H. Kossebau.
Committed on 08/09/2016 at 13:32.
Pushed by kossebau into branch 'master'.
Remove deprecated QTONLY cmake flag
M +0-10 CMakeLists.txt
M +4-4INSTALL
M +1-1doc/index.docbook
M +2-0src/lib/marble/MarbleDirs.cpp
M +1-1tests/CTestNightlyScript.cmake.in
http://commits.kde.org/marble/2522847856a96d18a31da248be86d224bfe04ef6
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bec679..361441c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,16 +120,6 @@ else()
set(MARBLE_NO_DBUS TRUE)
endif()
-if(QTONLY)
- # Forward the old QTONLY=TRUE option to the new WITH_KDE=FALSE
- # needs to be written to cache and forcefully, otherwise
macro_optional_find_package's
- # option(WITH_${_name} ON) seems to operate on a shadowed variant of the
variable
- set(WITH_KF5 FALSE CACHE BOOL "Search for KF5 package" FORCE)
- # And unset it quickly. Nobody shall use it anymore anywhere.
- # to detect if KDE _should_ be used (set by user): WITH_KDE but do not use
it within src/lib/
- unset(QTONLY)
-endif()
-
SET(CMAKE_AUTOMOC TRUE)
# Use M_PI under Windows
diff --git a/INSTALL b/INSTALL
index 83107fc..466b71f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -47,19 +47,19 @@ directory called 'marble-build'.
Go into the build directory and type
- cmake -DQTONLY=ON ../marble
+ cmake -DWITH_KF5=FALSE ../marble
By default, marble is installed into /usr/local. If you want to
install it into any other directory, add
-DCMAKE_INSTALL_PREFIX=/path/to/install/into like in this example:
- cmake -DQTONLY=ON -DCMAKE_INSTALL_PREFIX=~/apps ../marble
+ cmake -DWITH_KF5=FALSE -DCMAKE_INSTALL_PREFIX=~/apps ../marble
If you have no write permission to the installation directory of cmake
(because you have a system installed cmake) you need to add another
parameter -DPACKAGE_ROOT_PREFIX=~/apps to the cmake command:
- cmake -DQTONLY=ON -DCMAKE_INSTALL_PREFIX=~/apps \
+ cmake -DWITH_KF5=FALSE -DCMAKE_INSTALL_PREFIX=~/apps \
-DPACKAGE_ROOT_PREFIX=~/apps ../marble
To modify the position of the data directory at compile time, see the notes
@@ -126,7 +126,7 @@ Use the cmake option -DMARBLE_DATA_PATH to specify the
built-in system path that Marble gathers its data from:
Example:
- cmake -DQTONLY=ON -DMARBLE_DATA_PATH /mnt1/marble/data ~/marble
+ cmake -DWITH_KF5=FALSE -DMARBLE_DATA_PATH /mnt1/marble/data ~/marble
3.2 "At Runtime"
diff --git a/doc/index.docbook b/doc/index.docbook
index df9c8ee..2cf27ed 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -1457,7 +1457,7 @@ url="https://owncloud.com/";>ownClowd official
website.
&marble; can be compiled as a &Qt; 4-only version as well as
featuring &kde; 4 support.
- To compile &marble; with &Qt; 4-only support check out
&marble; from &kde; Git into ~/marble and just do: cmake -DQTONLY=ON
~/marble and sudo make install. To compile
&marble; with &kde; support check instructions on how to compile &kde;
applications at http://techbase.kde.org/";>&kde;'s TechBase.
+ To compile &marble; with &Qt; 4-only support check out
&marble; from &kde; Git into ~/marble and just do: cmake
-DWITH_KF5=FALSE ~/marble and sudo make install.
To compile &marble; with &kde; support check instructions on how to compile
&kde; applications at http://techbase.kde.org/";>&kde;'s
TechBase.
diff --git a/src/lib/marble/MarbleDirs.cpp b/src/lib/marble/MarbleDirs.cpp
index 76ed565..c88c57a 100644
--- a/src/lib/marble/MarbleDirs.cpp
+++ b/src/lib/marble/MarbleDirs.cpp
@@ -167,6 +167,7 @@ QString MarbleDirs::systemPath()
return QDir( QCoreApplication::applicationDirPath()
+// TODO: QTONLY definition was removed during Qt5/KF5 port, check what code
should do
#if defined(QTONLY)
+ QLatin1String( "/data" )
#else
@@ -223,6 +224,7 @@ QString MarbleDirs::pluginSystemPath()
return QDir( QCoreApplication::applicationDirPath()
+// TODO: QTONLY definition was removed during Qt5/KF5 port, check what code
should do
#if defined(QTONLY)
+ QLatin1String( "/plugins" )
#else
diff --git a/tests/CTestNightlyScript.cmake.in
b/tests/CTestNightlyScript.cmake.in
index f68e5b2..c455038 100644
--- a/tests/CTestNightlyScript.cmake.in
+++ b/tests/CTestNightlyScript.cmake.in
@@ -6,7 +6,7 @@ set( CTEST_BINARY_DIRECTORY "@PROJECT_BINARY_DIR@" )
set ( CTEST_COMMAND "@CMAKE_CTEST_COMMAND@ -D Nightly --verbose" )
#set the command for configuring the dashboard
-set ( CTEST_CMAKE_COMMAND "@CMAKE_COMMAND@ -DQTONLY=ON" )
+set ( CTEST_CMAKE_COMMAND "@CMAKE_COMMAND@ -DWITH_KF5=FALSE" )
#wipe the binary tree before running
set ( CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE )
