equal
deleted
inserted
replaced
26 #include <QMainWindow> |
26 #include <QMainWindow> |
27 #include <QPushButton> |
27 #include <QPushButton> |
28 #include <hbapplication.h> |
28 #include <hbapplication.h> |
29 #include "hbsplashgenerator_p.h" |
29 #include "hbsplashgenerator_p.h" |
30 #include "hbsplashdefs_p.h" |
30 #include "hbsplashdefs_p.h" |
|
31 #include "hbsplashindicompositor_p.h" |
31 |
32 |
32 #if defined(Q_OS_SYMBIAN) |
33 #if defined(Q_OS_SYMBIAN) |
33 #include "hbsplashgen_server_symbian_p.h" |
34 #include "hbsplashgen_server_symbian_p.h" |
34 #include "hbsplashdefs_p.h" |
|
35 #include <e32std.h> |
35 #include <e32std.h> |
36 #include <eikenv.h> |
36 #include <eikenv.h> |
37 #include <apgwgnam.h> |
37 #include <apgwgnam.h> |
38 CApaApplication *appFactory() |
38 CApaApplication *appFactory() |
39 { |
39 { |
86 mw.setCentralWidget(btnRegen); |
86 mw.setCentralWidget(btnRegen); |
87 mw.show(); |
87 mw.show(); |
88 #endif |
88 #endif |
89 |
89 |
90 // The server must be initialized before calling HbSplashGenerator::start(). |
90 // The server must be initialized before calling HbSplashGenerator::start(). |
91 #ifdef Q_OS_SYMBIAN |
91 #if defined(Q_OS_SYMBIAN) |
92 qDebug("[hbsplashgenerator] starting server"); |
92 qDebug("[hbsplashgenerator] starting server"); |
93 HbSplashGenServer server(&gen); |
93 HbSplashGenServer server(&gen); |
94 // If there was an error then exit right away. |
94 // If there was an error then exit right away. |
95 if (!server.startupSuccess()) { |
95 if (!server.startupSuccess()) { |
96 qDebug("[hbsplashgenerator] exiting due to failed server startup"); |
96 qDebug("[hbsplashgenerator] exiting due to failed server startup"); |
99 #endif |
99 #endif |
100 |
100 |
101 qDebug("[hbsplashgenerator] starting generator"); |
101 qDebug("[hbsplashgenerator] starting generator"); |
102 gen.start(forceRegen); |
102 gen.start(forceRegen); |
103 |
103 |
|
104 HbSplashIndicatorCompositor indiCompositor(&gen); |
|
105 |
104 #if defined(Q_OS_SYMBIAN) |
106 #if defined(Q_OS_SYMBIAN) |
|
107 server.addCompositor(&indiCompositor); |
105 if (mutexToSignal) { |
108 if (mutexToSignal) { |
106 qDebug("[hbsplashgenerator] signaling mutex"); |
109 qDebug("[hbsplashgenerator] signaling mutex"); |
107 static_cast<RMutex *>(mutexToSignal)->Signal(); |
110 static_cast<RMutex *>(mutexToSignal)->Signal(); |
108 } |
111 } |
109 #endif |
112 #endif |