Merge remote-tracking branch 'marcrbouvier/master'

2013-08-24 15:13:07 +02:00 · 2013-08-24 15:13:07 +02:00 · 948cb0ef34
commit 948cb0ef34
parent f605dcdd24 2e8b0cf502
2 changed files with 2 additions and 2 deletions
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@ -1,7 +1,7 @@

 #include "editor.hpp"

-#include <QtGui/QApplication>
+#include <QApplication>

 #include "model/doc/document.hpp"
 #include "model/world/data.hpp"
--- a/apps/opencs/main.cpp
+++ b/apps/opencs/main.cpp
@ -4,7 +4,7 @@
 #include <exception>
 #include <iostream>

-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QIcon>

 class Application : public QApplication