mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Several adjustments related to Qt6
* Avoid ambiguous definition during unity build on Windows * Add missing include * Add Qt6 to expressionparser * Add Qt6 to nightcharts * Replace forward define of QStringList with include <QStringList> * Use toMSecsSinceEpoch * Use setContentsMargins
This commit is contained in:
@@ -11,13 +11,23 @@ set(MOC_HEADER_FILES cafFrameAnimationControl.h cafAnimationToolBar.h
|
||||
cafPopupMenuButton.h
|
||||
)
|
||||
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
|
||||
if(CEE_USE_QT6)
|
||||
find_package(
|
||||
Qt6
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets
|
||||
)
|
||||
set(QT_LIBRARIES Qt6::Core Qt6::Gui Qt6::Widgets)
|
||||
qt_standard_project_setup()
|
||||
else()
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
|
||||
endif()
|
||||
|
||||
# NOTE! Resources in this subfolder appends to the variable QRC_FILES in parent
|
||||
# scope CMakeList.txt in the application folder (parent scope) must use the
|
||||
|
||||
@@ -34,7 +34,13 @@
|
||||
//
|
||||
//##################################################################################################
|
||||
|
||||
// This include is required to avoid ambiguous definition during unity build
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
#endif // WIN32
|
||||
|
||||
#include "cafProgressInfo.h"
|
||||
|
||||
#include "cafAssert.h"
|
||||
#include "cafMemoryInspector.h"
|
||||
#include "cafProgressState.h"
|
||||
|
||||
Reference in New Issue
Block a user