Merge remote-tracking branch 'graffy76/next' into next

Conflicts:
	apps/opencs/CMakeLists.txt

apps/opencs/CMakeLists.txt

@@ -75,7 +75,7 @@ opencs_units_noqt (view/tools
 set (OPENCS_US
     )
 
-set (OPENCS_RES
+set (OPENCS_RES ../../files/opencs/resources.qrc
     )
 
 source_group (opencs FILES ${OPENCS_SRC} ${OPENCS_HDR})
@@ -104,4 +104,4 @@ target_link_libraries(opencs
     ${Boost_LIBRARIES}
     ${QT_LIBRARIES}
     components
-)
+)

apps/opencs/main.cpp

@@ -5,6 +5,7 @@
 #include <iostream>
 
 #include <QtGui/QApplication>
+#include <QIcon>
 
 class Application : public QApplication
 {
@@ -31,9 +32,12 @@ class Application : public QApplication
 
 int main(int argc, char *argv[])
 {
+    Q_INIT_RESOURCE (resources);
     Application mApplication (argc, argv);
 
+    mApplication.setWindowIcon (QIcon (":./opencs.png"));
+
     CS::Editor editor;
 
     return editor.run();
-}
+}

files/opencs/resources.qrc

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>opencs.png</file>
+    </qresource>
+</RCC>