d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-08 21:04:26 +00:00
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -529,10 +529,21 @@ 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;
} }
return true; return true;
} }
}; };

13
qcm/libnotify.qcm
View File

@ -40,10 +40,21 @@ 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;
} }
return true; return true;
} }
}; };

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.");