Skip to Content.
Sympa Menu

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

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 (6725e055cca4ce8f4dcf93e35ddeaf01c66140b2)
  • Date: Sun, 2 Apr 2023 12:18:10 +0000

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

qt5-qmake/dooble/BUILD | 14 ++++++++------
qt5-qmake/dooble/HISTORY | 1 +
2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 6725e055cca4ce8f4dcf93e35ddeaf01c66140b2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dooble - fix qt6 build

diff --git a/qt5-qmake/dooble/BUILD b/qt5-qmake/dooble/BUILD
index 5dc2acd..bb9c668 100755
--- a/qt5-qmake/dooble/BUILD
+++ b/qt5-qmake/dooble/BUILD
@@ -1,10 +1,12 @@
cd $SOURCE_DIRECTORY &&
-if is_depends_enabled qt6base;then
- export PATH="$QT6DIR/bin:$PATH"
- export PKG_CONFIG_PATH="$QT6DIR/lib/pkgconfig"
- export QT_MAJOR_VERSION=6
- qt6_build
+if is_depends_enabled $SPELL qt6base;then
+ CXXFLAGS+=" -Wno-deprecated" &&
+ CXXFLAGS+=" -Wno-deprecated-declarations" &&
+ CXXFLAGS+=" -Wno-switch" &&
+ /opt/qt6/bin/qmake \
+ QMAKE_CONFIG="$OPTS" QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" \
+ dooble.pro &&
+ make
else
- export QT_MAJOR_VERSION=5
qt5_build
fi
diff --git a/qt5-qmake/dooble/HISTORY b/qt5-qmake/dooble/HISTORY
index 974152b..a633686 100644
--- a/qt5-qmake/dooble/HISTORY
+++ b/qt5-qmake/dooble/HISTORY
@@ -1,6 +1,7 @@
2023-04-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2023.04.01
* *: add qt6 support
+ * BUILD: fix qt6 build

2021-05-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2021.02.20



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6725e055cca4ce8f4dcf93e35ddeaf01c66140b2), Treeve Jelbert, 04/02/2023

Archive powered by MHonArc 2.6.24.

Top of Page