projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from branch "sput" r50:55 back into trunk.
[quassel.git]
/
main
/
main_gui.cpp
diff --git
a/main/main_gui.cpp
b/main/main_gui.cpp
index
b6e15b0
..
3ee9f9f
100644
(file)
--- a/
main/main_gui.cpp
+++ b/
main/main_gui.cpp
@@
-23,6
+23,7
@@
#include <QtGui>
#include <QApplication>
#include <QtGui>
#include <QApplication>
+#include "style.h"
#include "global.h"
#include "guiproxy.h"
#include "coreconnectdlg.h"
#include "global.h"
#include "guiproxy.h"
#include "coreconnectdlg.h"
@@
-42,6
+43,8
@@
int main(int argc, char **argv) {
global = new Global();
guiProxy = new GUIProxy();
global = new Global();
guiProxy = new GUIProxy();
+ Style::init();
+
MainWin mainWin;
int exitCode = app.exec();
delete guiProxy;
MainWin mainWin;
int exitCode = app.exec();
delete guiProxy;