Avoid warning message with dbus inialized before a QApplication
This commit is contained in:
parent
32fe732f64
commit
1c6d164219
12
src/main.cpp
12
src/main.cpp
|
@ -317,12 +317,6 @@ int main(int argc, char* argv[]) {
|
||||||
1);
|
1);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_LIBLASTFM
|
|
||||||
lastfm::ws::ApiKey = LastFMService::kApiKey;
|
|
||||||
lastfm::ws::SharedSecret = LastFMService::kSecret;
|
|
||||||
lastfm::setNetworkAccessManager(new NetworkAccessManager);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Output the version, so when people attach log output to bug reports they
|
// Output the version, so when people attach log output to bug reports they
|
||||||
// don't have to tell us which version they're using.
|
// don't have to tell us which version they're using.
|
||||||
qLog(Info) << "Clementine-qt5" << CLEMENTINE_VERSION_DISPLAY;
|
qLog(Info) << "Clementine-qt5" << CLEMENTINE_VERSION_DISPLAY;
|
||||||
|
@ -336,6 +330,12 @@ int main(int argc, char* argv[]) {
|
||||||
|
|
||||||
QtSingleApplication a(argc, argv);
|
QtSingleApplication a(argc, argv);
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBLASTFM
|
||||||
|
lastfm::ws::ApiKey = LastFMService::kApiKey;
|
||||||
|
lastfm::ws::SharedSecret = LastFMService::kSecret;
|
||||||
|
lastfm::setNetworkAccessManager(new NetworkAccessManager);
|
||||||
|
#endif
|
||||||
|
|
||||||
// A bug in Qt means the wheel_scroll_lines setting gets ignored and replaced
|
// A bug in Qt means the wheel_scroll_lines setting gets ignored and replaced
|
||||||
// with the default value of 3 in QApplicationPrivate::initialize.
|
// with the default value of 3 in QApplicationPrivate::initialize.
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue