mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-06 09:04:37 +02:00
Don't use Qt OpenGL module since Q5.4.
--HG-- branch : release
This commit is contained in:
parent
6c63c0d948
commit
9a4e8e2bc5
|
@ -297,7 +297,6 @@ win32:*g++* {
|
||||||
$$[QT_INSTALL_BINS]/icuuc*.dll \ # Different name for different Qt releases
|
$$[QT_INSTALL_BINS]/icuuc*.dll \ # Different name for different Qt releases
|
||||||
$$[QT_INSTALL_BINS]/Qt5Core.dll \
|
$$[QT_INSTALL_BINS]/Qt5Core.dll \
|
||||||
$$[QT_INSTALL_BINS]/Qt5Concurrent.dll \
|
$$[QT_INSTALL_BINS]/Qt5Concurrent.dll \
|
||||||
$$[QT_INSTALL_BINS]/Qt5OpenGL.dll \
|
|
||||||
$$[QT_INSTALL_BINS]/Qt5Gui.dll \
|
$$[QT_INSTALL_BINS]/Qt5Gui.dll \
|
||||||
$$[QT_INSTALL_BINS]/Qt5Network.dll \
|
$$[QT_INSTALL_BINS]/Qt5Network.dll \
|
||||||
$$[QT_INSTALL_BINS]/Qt5PrintSupport.dll \
|
$$[QT_INSTALL_BINS]/Qt5PrintSupport.dll \
|
||||||
|
@ -309,6 +308,11 @@ win32:*g++* {
|
||||||
$$[QT_INSTALL_BINS]/libstdc++-6.dll \
|
$$[QT_INSTALL_BINS]/libstdc++-6.dll \
|
||||||
$$[QT_INSTALL_BINS]/libwinpthread-1.dll
|
$$[QT_INSTALL_BINS]/libwinpthread-1.dll
|
||||||
|
|
||||||
|
# Don't use Qt OpenGL module since Q5.4
|
||||||
|
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
|
||||||
|
package.files += $$[QT_INSTALL_BINS]/Qt5OpenGL.dll
|
||||||
|
}
|
||||||
|
|
||||||
# For support Windows 7+
|
# For support Windows 7+
|
||||||
greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) {
|
greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) {
|
||||||
package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll
|
package.files += $$[QT_INSTALL_BINS]/Qt5WinExtras.dll
|
||||||
|
|
|
@ -7,7 +7,12 @@
|
||||||
# File with common stuff for whole project
|
# File with common stuff for whole project
|
||||||
include(../../../common.pri)
|
include(../../../common.pri)
|
||||||
|
|
||||||
QT += widgets printsupport opengl
|
QT += widgets printsupport
|
||||||
|
|
||||||
|
# Don't use Qt OpenGL module since Q5.4
|
||||||
|
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
|
||||||
|
QT += opengl
|
||||||
|
}
|
||||||
|
|
||||||
# Name of the library
|
# Name of the library
|
||||||
TARGET = vwidgets
|
TARGET = vwidgets
|
||||||
|
|
Loading…
Reference in a new issue