mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-02-16 01:38:45 +01:00
Qt5 built in qwt (#570)
- qt4->qt5 - in built qt5 6.1.5 because rhel7 is not upto date with qt5, removed findqwt.cmake - made a fix in qwt lib (qwt_plot_layout.h) to work with 5.15 and lower versions for qrect constr. - qt5 forms fixed, qt4 many hard coding forms switched to forms including qtabwidget, scrolls etc, fonts moved to forms - docking option enabled by default, removed option to disable docking feature from "Mode" - added qVersionResolve utility functions to handle compatibility before and after qt5.12 - qtplots (ian's code) takes in gain mode enable to set some settings within the class, with proper gain plot ticks - ensure gain plots have no zooming of z axis in 2d and y axis in 1d - removed placeholder text in qpalette in main window form as its not supportd until 5.12 (so using qt5.9 designer insted of qt5.15 to cope) - tab order Servers: - fixed some error messages that were empty for fail in funcs (mostly minor as if this error, major issues)
This commit is contained in:
37
libs/qwt-6.1.5/features/qwt.prf
Normal file
37
libs/qwt-6.1.5/features/qwt.prf
Normal file
@@ -0,0 +1,37 @@
|
||||
################################################################
|
||||
# Qwt Widget Library
|
||||
# Copyright (C) 1997 Josef Wilgen
|
||||
# Copyright (C) 2002 Uwe Rathmann
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the Qwt License, Version 1.0
|
||||
################################################################
|
||||
|
||||
include ( ./qwtconfig.pri )
|
||||
include ( ./qwtfunctions.pri )
|
||||
|
||||
contains(QWT_CONFIG, QwtDll) {
|
||||
|
||||
DEFINES *= QWT_DLL
|
||||
}
|
||||
|
||||
contains(QWT_CONFIG, QwtSvg) {
|
||||
|
||||
QT *= svg
|
||||
}
|
||||
else {
|
||||
|
||||
DEFINES *= QWT_NO_SVG
|
||||
}
|
||||
|
||||
contains(QWT_CONFIG, QwtFramework) {
|
||||
|
||||
INCLUDEPATH *= $${QWT_INSTALL_LIBS}/qwt.framework/Headers
|
||||
}
|
||||
else {
|
||||
|
||||
INCLUDEPATH *= $${QWT_INSTALL_HEADERS}
|
||||
}
|
||||
|
||||
# QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
|
||||
qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt)
|
||||
Reference in New Issue
Block a user