Mercurial > mxe-octave
view src/qt6-qtbase-1-fixes.patch @ 6837:6adeb47401d6
Add qt6 usage to mxe-octave
* src/qt6-qtbase-1-fixes.patch, src/qt6-qtbase.mk,
src/qt6-qtimageformats-1-fixes.patch, src/qt6-qtimageformats.mk,
src/qt6-qtsvg.mk, src/qt6-qttools.mk, src/qt6-qttranslations.mk,
src/qt6.mk, src/qt6-qt5compat.mk: new files
* Makefile.in: add use of ENABLE_QT and add qt6 values
* configure.ac: add --enable-qt=xxx option, remove--enable-qt5
* dist-files.mk, index.html: add refs to new files
* src/blas_switch.mk, src/gnuplot.mk, src/opengl_switch.mk,
src/default-octave.mk, src/qscintilla.mk,
src/release-octave.mk, src/stable-octave.mk: add prrocessing of ENABLE_QT value
* src/qt5.mk: dont include qt6* files in dependancies
* src/gnuplot-2-qt6.patch: new patch file
* binary-dist-rules.mk: include qtversion in build of octave-launch
* installer-files/octave-firsttime.vbs, installer-files/octave-launch.c
installer-files/octave.bat, installer-files/octave.vbs
: include qt6 file paths
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Wed, 23 Aug 2023 08:48:00 -0400 |
parents | |
children | cb939ded70d5 |
line wrap: on
line source
This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Mon, 14 Dec 2020 15:09:00 +1100 Subject: [PATCH 1/2] optionally build docs diff --git a/CMakeLists.txt b/CMakeLists.txt index 1111111..2222222 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,7 +173,9 @@ if(NOT QT_BUILD_STANDALONE_TESTS) qt_internal_set_up_config_optimizations_like_in_qmake() ## Setup documentation - add_subdirectory(doc) + if(QT_BUILD_DOCS) + add_subdirectory(doc) + endif() ## Visit all the directories: add_subdirectory(src) From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 3 Apr 2023 13:12:47 +0200 Subject: [PATCH 2/2] add missing oleaut32 dependency for networklistmanager Required for symbols VariantInit and VariantClear. diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt index 1111111..2222222 100644 --- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt +++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt @@ -14,6 +14,11 @@ qt_internal_add_plugin(QNLMNIPlugin Qt::NetworkPrivate ) +qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32 + LIBRARIES + oleaut32 +) + qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32 AND MSVC AND NOT CLANG LIBRARIES runtimeobject