Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3b77012865044a9e1544d248bfcc9f448d60ccf0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3b77012865044a9e1544d248bfcc9f448d60ccf0)
  • Date: Fri, 1 Oct 2021 15:46:24 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

qt5-cmake/qt-creator/DEPENDS | 26 ++++++++++++++++++--------
qt5-cmake/qt-creator/DETAILS | 8 ++++----
qt5-cmake/qt-creator/HISTORY | 4 ++++
3 files changed, 26 insertions(+), 12 deletions(-)

New commits:
commit 3b77012865044a9e1544d248bfcc9f448d60ccf0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qt-creator - add qt6 support

commit 391de0e96f87e4028e46aeade0288469dd0a9791
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qt-creator: => 5.0.2

diff --git a/qt5-cmake/qt-creator/DEPENDS b/qt5-cmake/qt-creator/DEPENDS
index e7f1cad..a82a503 100755
--- a/qt5-cmake/qt-creator/DEPENDS
+++ b/qt5-cmake/qt-creator/DEPENDS
@@ -1,13 +1,23 @@
source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
-depends qtbase &&
-depends qtx11extras &&
-depends qtdeclarative &&
-depends zstd &&
-optional_depends syntax-highlighting '' '' 'syntax highlighting' &&
-optional_depends qtsvg '' '' 'SVG support' &&
-optional_depends qttools '' '' '' &&
-optional_depends qtwebengine '' '' 'help browser' &&
+optional_depends qt6base " -DCMAKE_PREFIX_PATH=$QT6DIR" "" 'use Qt6' &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative &&
+ depends qt5compat &&
+ optional_depends qt6svg '' '' 'SVG support' &&
+ optional_depends qt6tools '' '' '' &&
+ optional_depends qt6webengine '' '' 'help browser'
+else
+ depends qtbase &&
+ depends qtx11extras &&
+ depends qtdeclarative &&
+ optional_depends qtsvg '' '' 'SVG support' &&
+ optional_depends qttools '' '' '' &&
+ optional_depends qtwebengine '' '' 'help browser' &&
+ optional_depends syntax-highlighting '' '' 'syntax highlighting'
+fi &&
+depends python3 &&
+depends zstd &&
optional_depends -sub CLANG llvm '' '' 'build Clang Code Model' &&
#optional_depends qbs '' '' 'use system qbs'
optional_depends elfutils '' '' '' &&
diff --git a/qt5-cmake/qt-creator/DETAILS b/qt5-cmake/qt-creator/DETAILS
index 7a54410..0e86725 100755
--- a/qt5-cmake/qt-creator/DETAILS
+++ b/qt5-cmake/qt-creator/DETAILS
@@ -1,12 +1,12 @@
SPELL=qt-creator
if [[ "${QTCREATOR_DEVEL}" == "y" ]]; then
- VERSION=4.14.0
-
SOURCE_HASH=sha512:7cf74d3f6a25a55cb6b0eca584b41727f8ee467f2901ab27d1f5de40d0d7635c560af87d38e2a17a168ea74755d28928c911aa7d07e1684160dfa7df1c4e27e9
+ VERSION=5.0.2
+
SOURCE_HASH=sha512:a2111f0687fa2177a5c0b7c4a8768544d5f63b1aa7b53e1d1f9dcc69fc49a00f12399f988da35b1243de9d690d23aa05029d4385ea3882014a56b022a4a0e447
SOURCE=$SPELL-opensource-src-$VERSION.tar.xz

SOURCE_URL[0]=http://download.qt.io/official_releases/qtcreator/${VERSION%.*}/${VERSION}/${SOURCE}
else
- VERSION=4.14.0
-
SOURCE_HASH=sha512:7cf74d3f6a25a55cb6b0eca584b41727f8ee467f2901ab27d1f5de40d0d7635c560af87d38e2a17a168ea74755d28928c911aa7d07e1684160dfa7df1c4e27e9
+ VERSION=5.0.2
+
SOURCE_HASH=sha512:a2111f0687fa2177a5c0b7c4a8768544d5f63b1aa7b53e1d1f9dcc69fc49a00f12399f988da35b1243de9d690d23aa05029d4385ea3882014a56b022a4a0e447
SOURCE=$SPELL-opensource-src-$VERSION.tar.xz

SOURCE_URL[0]=https://download.qt.io/official_releases/qtcreator/${VERSION%.*}/${VERSION}/${SOURCE}
fi
diff --git a/qt5-cmake/qt-creator/HISTORY b/qt5-cmake/qt-creator/HISTORY
index 0e8d2b0..3573241 100644
--- a/qt5-cmake/qt-creator/HISTORY
+++ b/qt5-cmake/qt-creator/HISTORY
@@ -1,3 +1,7 @@
+2021-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.0.2
+ * DEPENDS: enable build with qt6
+
2020-12-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.14.0 (both)
* DEPENDS: adjust



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3b77012865044a9e1544d248bfcc9f448d60ccf0), Treeve Jelbert, 10/01/2021

Archive powered by MHonArc 2.6.24.

Top of Page