[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kexi] src: Merge remote-tracking branch 'origin/3.1'
From:       Jaroslaw Staniek <null () kde ! org>
Date:       2018-04-09 9:42:28
Message-ID: E1f5TJk-0000w4-Bw () code ! kde ! org
[Download RAW message or body]

Git commit 87f3b8d9c8ecae45a990fc9c60f5acf46da2313b by Jaroslaw Staniek.
Committed on 09/04/2018 at 09:38.
Pushed by staniek into branch 'master'.

Merge remote-tracking branch 'origin/3.1'

M  +3    -1    src/config-kexi.h.cmake

https://commits.kde.org/kexi/87f3b8d9c8ecae45a990fc9c60f5acf46da2313b

diff --cc src/config-kexi.h.cmake
index 072a610af,82f24ac66..c4f5785c9
--- a/src/config-kexi.h.cmake
+++ b/src/config-kexi.h.cmake
@@@ -99,11 -99,12 +99,12 @@@
  #cmakedefine KEXI_SHOW_UNIMPLEMENTED
  =

  //! @def KEXI_PROJECT_TEMPLATES
 -//! @brief If defined, support for project templates is enabled in Kexi
 +//! @brief If defined, support for project templates is enabled in KEXI
  #cmakedefine KEXI_PROJECT_TEMPLATES
  =

+ #ifndef KEXI_MOBILE
  //! @def KEXI_AUTORISE_TABBED_TOOLBAR
 -//! @brief If defined, tabs in the main tabbed toolbar autorise in Kexi
 +//! @brief If defined, tabs in the main tabbed toolbar autorise in KEXI
  #cmakedefine KEXI_AUTORISE_TABBED_TOOLBAR
  =

  //! @def KEXI_USE_KFILEWIDGET
[prev in list] [next in list] [prev in thread] [next in thread]