github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-20 21:33:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Drop Qt4 related settings from QMake project

Browse source
This commit is contained in:
Vladimir Golovnev (Glassez) 2017-04-26 08:53:47 +03:00
commit d5d946dd66
6 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
macxconf.pri
View file

@ -11,9 +11,6 @@ exists($$OUT_PWD/../conf.pri) {
LIBS += -framework Carbon -framework IOKit LIBS += -framework Carbon -framework IOKit
# C++11 support
lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++11
QT_LANG_PATH = ../dist/qt-translations QT_LANG_PATH = ../dist/qt-translations
DIST_PATH = ../dist/mac DIST_PATH = ../dist/mac

3
os2conf.pri
View file

@ -1,6 +1,3 @@
# C++11 support
lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++11
exists(conf.pri) { exists(conf.pri) {
# to the conf.pri goes all system dependent stuff # to the conf.pri goes all system dependent stuff
include(conf.pri) include(conf.pri)

5
qm_gen.pri
View file

@ -1,13 +1,10 @@
TS_IN = $$fromfile(src/src.pro,TRANSLATIONS) TS_IN = $$fromfile(src/src.pro,TRANSLATIONS)
TS_IN_NOEXT = $$replace(TS_IN,".ts","") TS_IN_NOEXT = $$replace(TS_IN,".ts","")
isEmpty(QMAKE_LRELEASE) { isEmpty(QMAKE_LRELEASE) {
win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
unix { unix {
equals(QT_MAJOR_VERSION, 4) {
!exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
}
equals(QT_MAJOR_VERSION, 5) { equals(QT_MAJOR_VERSION, 5) {
!exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 } !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 }
} }

5
src/src.pro
View file

@ -6,8 +6,6 @@ CONFIG += qt thread silent
CONFIG += c++11 CONFIG += c++11
DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES
lessThan(QT_MAJOR_VERSION, 5): DEFINES += QStringLiteral=QLatin1String
# Windows specific configuration # Windows specific configuration
win32: include(../winconf.pri) win32: include(../winconf.pri)
@ -25,8 +23,7 @@ nogui {
DEFINES += DISABLE_GUI DEFINES += DISABLE_GUI
TARGET = qbittorrent-nox TARGET = qbittorrent-nox
} else { } else {
QT += xml QT += xml concurrent widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent widgets
CONFIG(static) { CONFIG(static) {
DEFINES += QBT_STATIC_QT DEFINES += QBT_STATIC_QT
QTPLUGIN += qico QTPLUGIN += qico

3
unixconf.pri
View file

@ -9,9 +9,6 @@ exists($$OUT_PWD/../conf.pri) {
include(conf.pri) include(conf.pri)
} }
# C++11 support
lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=c++11
# COMPILATION SPECIFIC # COMPILATION SPECIFIC
!nogui:dbus: QT += dbus !nogui:dbus: QT += dbus

3
winconf-mingw.pri
View file

@ -1,6 +1,3 @@
# C++11 support
lessThan(QT_MAJOR_VERSION, 5): QMAKE_CXXFLAGS += -std=gnu++11
strace_win{ strace_win{
contains(QMAKE_HOST.arch, x86) { contains(QMAKE_HOST.arch, x86) {
# i686 arch requires frame pointer preservation # i686 arch requires frame pointer preservation