aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use Qt OpenGL module since Q5.4.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-04-05 13:56:44 +03:00
parent 3777d57ada
commit 5f181e3a54
5 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common.pri
View File

@ -270,8 +270,13 @@ ISYSTEM += \
-isystem "$$[QT_INSTALL_HEADERS]/QtSvg" \ -isystem "$$[QT_INSTALL_HEADERS]/QtSvg" \
-isystem "$$[QT_INSTALL_HEADERS]/QtNetwork" \ -isystem "$$[QT_INSTALL_HEADERS]/QtNetwork" \
-isystem "$$[QT_INSTALL_HEADERS]/QtTest" \ -isystem "$$[QT_INSTALL_HEADERS]/QtTest" \
-isystem "$$[QT_INSTALL_HEADERS]/QtConcurrent" \ -isystem "$$[QT_INSTALL_HEADERS]/QtConcurrent"
-isystem "$$[QT_INSTALL_HEADERS]/QtOpenGL"
# Don't use Qt OpenGL module since Q5.4
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
ISYSTEM += -isystem "$$[QT_INSTALL_HEADERS]/QtOpenGL"
}
} else { } else {
ISYSTEM += \ ISYSTEM += \
-isystem "$$[QT_INSTALL_LIBS]/QtWidgets.framework/Headers/" \ -isystem "$$[QT_INSTALL_LIBS]/QtWidgets.framework/Headers/" \
@ -293,9 +298,15 @@ ISYSTEM += \
-isystem "$$[QT_INSTALL_LIBS]/QtTest.framework/Headers/" \ -isystem "$$[QT_INSTALL_LIBS]/QtTest.framework/Headers/" \
-isystem "$$[QT_INSTALL_LIBS]/QtTest.framework/Versions/5/Headers/" \ -isystem "$$[QT_INSTALL_LIBS]/QtTest.framework/Versions/5/Headers/" \
-isystem "$$[QT_INSTALL_LIBS]/QtConcurrent.framework/Headers/" \ -isystem "$$[QT_INSTALL_LIBS]/QtConcurrent.framework/Headers/" \
-isystem "$$[QT_INSTALL_LIBS]/QtConcurrent.framework/Versions/5/Headers/" \ -isystem "$$[QT_INSTALL_LIBS]/QtConcurrent.framework/Versions/5/Headers/"
-isystem "$$[QT_INSTALL_LIBS]/QtOpenGL.framework/Headers/" \
-isystem "$$[QT_INSTALL_LIBS]/QtOpenGL.framework/Versions/5/Headers/"
# Don't use Qt OpenGL module since Q5.4
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
ISYSTEM += \
-isystem "$$[QT_INSTALL_LIBS]/QtOpenGL.framework/Headers/" \
-isystem "$$[QT_INSTALL_LIBS]/QtOpenGL.framework/Versions/5/Headers/"
}
} }
# Usefull GCC warnings keys. # Usefull GCC warnings keys.

7
src/app/tape/tape.pro
View File

@ -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 += core gui widgets network xml xmlpatterns printsupport svg concurrent opengl QT += core gui widgets network xml xmlpatterns printsupport svg concurrent
# Don't use Qt OpenGL module since Q5.4
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
QT += opengl
}
# Name of binary file # Name of binary file
TARGET = tape TARGET = tape

7
src/app/valentina/valentina.pro
View File

@ -11,7 +11,12 @@ include(../../../common.pri)
# Here we don't see "network" library, but, i think, "printsupport" depend on this library, so we still need this # Here we don't see "network" library, but, i think, "printsupport" depend on this library, so we still need this
# library in installer. # library in installer.
QT += core gui widgets xml svg printsupport xmlpatterns concurrent opengl QT += core gui widgets xml svg printsupport xmlpatterns concurrent
# Don't use Qt OpenGL module since Q5.4
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
QT += opengl
}
# Use winextras only for Windows 7+ # Use winextras only for Windows 7+
win32:greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) { win32:greaterThan(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) {

7
src/test/CollectionTest/CollectionTest.pro
View File

@ -4,7 +4,12 @@
# #
#------------------------------------------------- #-------------------------------------------------
QT += testlib widgets printsupport concurrent opengl QT += testlib widgets printsupport concurrent
# Don't use Qt OpenGL module since Q5.4
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
QT += opengl
}
QT -= gui QT -= gui

7
src/test/ValentinaTest/ValentinaTest.pro
View File

@ -4,7 +4,12 @@
# #
#------------------------------------------------- #-------------------------------------------------
QT += core testlib gui printsupport xml xmlpatterns concurrent opengl QT += core testlib gui printsupport xml xmlpatterns concurrent
# Don't use Qt OpenGL module since Q5.4
equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 4) {
QT += opengl
}
TARGET = ValentinaTests TARGET = ValentinaTests