github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-16 02:03:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Imported recent patches from stable branch

Browse source
This commit is contained in:
Christophe Dumez 2010-07-20 17:13:28 +00:00
parent e2208a484e
commit 107b833703
3 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
configure vendored
View file

@ -529,6 +529,17 @@ public:
} else { } else {
return false; return false;
} }
QStringList incs3;
QString req_ver3 = "2.0";
QString version3, libs3, other3;
if(conf->findPkgConfig("gtk+-2.0", mode, req_ver3, &version3, &incs3, &libs3, &other3)) {
for(int n = 0; n < incs3.count(); ++n)
conf->addIncludePath(incs3[n]);
if(!libs3.isEmpty())
conf->addLib(libs3);
} else {
return false;
}
} else { } else {
return false; return false;
} }

11
qcm/libnotify.qcm
View file

@ -40,6 +40,17 @@ public:
} else { } else {
return false; return false;
} }
QStringList incs3;
QString req_ver3 = "2.0";
QString version3, libs3, other3;
if(conf->findPkgConfig("gtk+-2.0", mode, req_ver3, &version3, &incs3, &libs3, &other3)) {
for(int n = 0; n < incs3.count(); ++n)
conf->addIncludePath(incs3[n]);
if(!libs3.isEmpty())
conf->addLib(libs3);
} else {
return false;
}
} else { } else {
return false; return false;
} }

8
src/main.cpp
View file

@ -181,6 +181,14 @@ int main(int argc, char *argv[]){
#endif #endif
#endif #endif
// XXX: Workaround to avoid the following Qt bug:
// http://bugreports.qt.nokia.com/browse/QTBUG-7105
#ifndef DISABLE_GUI
// Force the creation of an input context to avoid
// a crash in QApplication destructor
app->inputContext();
#endif
// Check if qBittorrent is already running for this user // Check if qBittorrent is already running for this user
if(app->isRunning()) { if(app->isRunning()) {
qDebug("qBittorrent is already running for this user."); qDebug("qBittorrent is already running for this user.");