kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Update for LibPack3 (#10337)

Browse Source 
* cMake: Add base support for LibPack3

Minor changes to FreeCAD source code to support compiling with Qt 6.5 on MSVC,
and changes to cMake setup to support the new Libpack.

* NETGENPlugin: Fix compilation with MSVC and OCCT 7.8

* Material: Switch to Wrapped_ParseTupleAndKeywords for /fpermissive- on MSVC

* Base: Prevent accidental definition of MIN and MAX by MSVC

* cMake: Prevent accidentally finding an old LibPack

* Material: Wrap another ParseTuple call

* OCCT: Modify includes for 7.8.x

* Part: Change TNP code to use Wrapped_ParseTupleAndArgs

* Spreadsheet: Workaround for MSVC macro pollution

* Mesh: Workaround for MSVC macro pollution

* Base: Remove extra MSVC flag (moved to CMake)

* Tests: Fix compiling with /permissive-

* FEM: Fix Qt warnings about duplicate element names

* cMake: Ensure major version numbers are set

* Address review comments.

* cMake: Further tweaks for LibPack3

* cMake: Modify specification of compiler flags for MSVC

* Main: Remove QtQuick testing code

* cmake: Find Boost before SMESH (which uses it)

* Fixes for LibPack2

* cMake: Another try at importinhg VTK cleanly
This commit is contained in:
Chris Hennes
2024-06-24 11:25:05 -05:00
committed by GitHub
parent c06cbce42c
commit 5e47f6804f
42 changed files with 421 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Gui/MainWindow.cpp
View File

@@ -55,8 +55,12 @@
# include <QPushButton>
#endif
#if defined(Q_OS_WIN) && QT_VERSION < QT_VERSION_CHECK(6,0,0)
# include <QtPlatformHeaders/QWindowsWindowFunctions>
#if defined(Q_OS_WIN)
#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
#include <QtPlatformHeaders/QWindowsWindowFunctions>
#else
#include <qpa/qplatformwindow_p.h>
#endif
#endif
#include <boost/algorithm/string/predicate.hpp>
@@ -1808,10 +1812,17 @@ void MainWindow::loadWindowSettings()
max ? showMaximized() : show();
// make menus and tooltips usable in fullscreen under Windows, see issue #7563
#if defined(Q_OS_WIN) && QT_VERSION < QT_VERSION_CHECK(6,0,0)
if (QWindow* win = this->windowHandle()) {
QWindowsWindowFunctions::setHasBorderInFullScreen(win, true);
}
#if defined(Q_OS_WIN)
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
if (QWindow* win = this->windowHandle()) {
QWindowsWindowFunctions::setHasBorderInFullScreen(win, true);
}
#else
using namespace QNativeInterface::Private;
if (auto *windowsWindow = dynamic_cast<QWindowsWindow*>(this->windowHandle())) {
windowsWindow->setHasBorderInFullScreen(true);
}
#endif
#endif
statusBar()->setVisible(showStatusBar);