mirror of
https://github.com/d47081/qBittorrent.git
synced 2025-02-06 03:44:29 +00:00
- Dropped Qt4.2 support, it becomes too difficult to maintain for me and Trolltech broke backward compatibility for UI files...
This commit is contained in:
parent
f1114387ae
commit
0e81f3731f
1
TODO
1
TODO
@ -119,4 +119,5 @@ beta6->beta7 changelog:
|
||||
- BUGFIX: Fixed torrent create (can only one file or one folder)
|
||||
- BUGFIX: the function that set the rows color doesn't handle hidden columns anymore
|
||||
- BUGFIX: improved search engine plugin manager code and fixed bugs
|
||||
- BUGFIX: Dropped Qt4.2 support, becomes too difficult to maintain
|
||||
- COSMETIC: Improved some icons
|
||||
|
16
configure
vendored
16
configure
vendored
@ -340,21 +340,21 @@ fi
|
||||
|
||||
gen_files() {
|
||||
cat >$1/modules.cpp <<EOT
|
||||
#line 1 "qt42.qcm"
|
||||
#line 1 "qt4.qcm"
|
||||
/*
|
||||
-----BEGIN QCMOD-----
|
||||
name: Qt >= 4.2
|
||||
name: Qt >= 4.3
|
||||
-----END QCMOD-----
|
||||
*/
|
||||
class qc_qt42 : public ConfObj
|
||||
class qc_qt4 : public ConfObj
|
||||
{
|
||||
public:
|
||||
qc_qt42(Conf *c) : ConfObj(c) {}
|
||||
QString name() const { return "Qt >= 4.2"; }
|
||||
QString shortname() const { return "qt42"; }
|
||||
qc_qt4(Conf *c) : ConfObj(c) {}
|
||||
QString name() const { return "Qt >= 4.3"; }
|
||||
QString shortname() const { return "Qt 4.3"; }
|
||||
bool exec()
|
||||
{
|
||||
return(QT_VERSION >= 0x040200);
|
||||
return(QT_VERSION >= 0x040300);
|
||||
}
|
||||
};
|
||||
#line 1 "libtorrent.qcm"
|
||||
@ -738,7 +738,7 @@ public:
|
||||
|
||||
EOT
|
||||
cat >$1/modules_new.cpp <<EOT
|
||||
o = new qc_qt42(conf);
|
||||
o = new qc_qt4(conf);
|
||||
o->required = true;
|
||||
o->disabled = false;
|
||||
o = new qc_libtorrent(conf);
|
||||
|
@ -3,7 +3,7 @@
|
||||
<profile>qbittorrent.pro</profile>
|
||||
<moddir>qcm</moddir>
|
||||
<datadir/>
|
||||
<dep type='qt42'>
|
||||
<dep type='qt4'>
|
||||
<required/>
|
||||
</dep>
|
||||
<dep type='libtorrent'>
|
||||
|
16
qcm/qt4.qcm
Normal file
16
qcm/qt4.qcm
Normal file
@ -0,0 +1,16 @@
|
||||
/*
|
||||
-----BEGIN QCMOD-----
|
||||
name: Qt >= 4.3
|
||||
-----END QCMOD-----
|
||||
*/
|
||||
class qc_qt4 : public ConfObj
|
||||
{
|
||||
public:
|
||||
qc_qt4(Conf *c) : ConfObj(c) {}
|
||||
QString name() const { return "Qt >= 4.3"; }
|
||||
QString shortname() const { return "Qt 4.3"; }
|
||||
bool exec()
|
||||
{
|
||||
return(QT_VERSION >= 0x040300);
|
||||
}
|
||||
};
|
16
qcm/qt42.qcm
16
qcm/qt42.qcm
@ -1,16 +0,0 @@
|
||||
/*
|
||||
-----BEGIN QCMOD-----
|
||||
name: Qt >= 4.2
|
||||
-----END QCMOD-----
|
||||
*/
|
||||
class qc_qt42 : public ConfObj
|
||||
{
|
||||
public:
|
||||
qc_qt42(Conf *c) : ConfObj(c) {}
|
||||
QString name() const { return "Qt >= 4.2"; }
|
||||
QString shortname() const { return "qt42"; }
|
||||
bool exec()
|
||||
{
|
||||
return(QT_VERSION >= 0x040200);
|
||||
}
|
||||
};
|
17
src/src.pro
17
src/src.pro
@ -78,9 +78,7 @@ QMAKE_CXXFLAGS_DEBUG += -fwrapv -O1
|
||||
CONFIG += link_pkgconfig
|
||||
PKGCONFIG += libtorrent libccext2 libccgnu2
|
||||
|
||||
contains(DEFINES, HAVE_MAGICK){
|
||||
#PKGCONFIG += ImageMagick++
|
||||
}else{
|
||||
!contains(DEFINES, HAVE_MAGICK){
|
||||
message(ImageMagick disabled)
|
||||
}
|
||||
|
||||
@ -89,19 +87,6 @@ QT += network xml
|
||||
DEFINES += QT_NO_CAST_TO_ASCII
|
||||
#QT_NO_CAST_FROM_ASCII
|
||||
|
||||
contains(DEBUG_MODE, 0){
|
||||
contains(QT_VERSION, 4.2.0) {
|
||||
message(Qt 4.2.0 detected : enabling debug output because of a bug in this version of Qt)
|
||||
}else{
|
||||
contains(QT_VERSION, 4.2.1) {
|
||||
message(Qt 4.2.1 detected : enabling debug output because of a bug in this version of Qt)
|
||||
}else{
|
||||
DEFINES += QT_NO_DEBUG_OUTPUT
|
||||
}
|
||||
}
|
||||
CONFIG += release
|
||||
}
|
||||
|
||||
# Windows
|
||||
win32 {
|
||||
LIBS += -ltorrent -lccext2 -lccgnu2
|
||||
|
Loading…
x
Reference in New Issue
Block a user