krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Conflicts:
	apps/opencs/CMakeLists.txt
This commit is contained in:
Marc Zinnschlag 2013-02-17 17:38:33 +01:00
commit 9221c861c5
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/opencs/CMakeLists.txt
View file

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

6
apps/opencs/main.cpp
View file

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

BIN
files/opencs/opencs.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 64 KiB

5
files/opencs/resources.qrc Normal file
View file

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