projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to fix icons not being found on some systems
[quassel.git]
/
src
/
qtui
/
qtuiapplication.cpp
diff --git
a/src/qtui/qtuiapplication.cpp
b/src/qtui/qtuiapplication.cpp
index
80cc4d4
..
0049bff
100644
(file)
--- a/
src/qtui/qtuiapplication.cpp
+++ b/
src/qtui/qtuiapplication.cpp
@@
-27,9
+27,15
@@
#include "qtui.h"
#include "sessionsettings.h"
#include "qtui.h"
#include "sessionsettings.h"
-#include "iconloader.h"
-
QtUiApplication::QtUiApplication(int &argc, char **argv) : QApplication(argc, argv), Quassel() {
QtUiApplication::QtUiApplication(int &argc, char **argv) : QApplication(argc, argv), Quassel() {
+ Q_INIT_RESOURCE(pics);
+# ifdef QUASSEL_ICONS_BUILTIN
+ Q_INIT_RESOURCE(hicolor);
+# endif
+# ifdef OXYGEN_ICONS_BUILTIN
+ Q_INIT_RESOURCE(oxygen);
+# endif
+
setRunMode(Quassel::ClientOnly);
// put client-only arguments here
setRunMode(Quassel::ClientOnly);
// put client-only arguments here
@@
-48,9
+54,6
@@
bool QtUiApplication::init() {
gui->init();
resumeSessionIfPossible();
gui->init();
resumeSessionIfPossible();
- // DEBUG
- QPixmap pix = IconLoader::global()->loadIcon("network-connect", IconLoader::Small);
- qDebug() << pix;
return true;
}
return false;
return true;
}
return false;