equal
deleted
inserted
replaced
136 if (flags & Hb::SplashFixedVertical) { |
136 if (flags & Hb::SplashFixedVertical) { |
137 splashFlags |= HbSplashScreen::FixedVertical; |
137 splashFlags |= HbSplashScreen::FixedVertical; |
138 } else if (flags & Hb::SplashFixedHorizontal) { |
138 } else if (flags & Hb::SplashFixedHorizontal) { |
139 splashFlags |= HbSplashScreen::FixedHorizontal; |
139 splashFlags |= HbSplashScreen::FixedHorizontal; |
140 } |
140 } |
|
141 if (flags & Hb::ForceQtSplash) { |
|
142 splashFlags |= HbSplashScreen::ForceQt; |
|
143 } |
141 |
144 |
142 #if defined(Q_OS_SYMBIAN) && defined(HBAPP_LOGGING) |
145 #if defined(Q_OS_SYMBIAN) && defined(HBAPP_LOGGING) |
143 ELAPSED_TIMER t; |
146 ELAPSED_TIMER t; |
144 t.start(); |
147 t.start(); |
145 #endif |
148 #endif |
158 #endif |
161 #endif |
159 |
162 |
160 // This function contains code that needs to be executed before |
163 // This function contains code that needs to be executed before |
161 // the QApplication constructor. |
164 // the QApplication constructor. |
162 |
165 |
163 if (!HbSplashScreenExt::needsQt()) { |
166 if (!HbSplashScreenExt::needsQt() && !flags.testFlag(Hb::ForceQtSplash)) { |
164 // The splash screen is capable of working without relying on Qt in any |
167 // The splash screen is capable of working without relying on Qt in any |
165 // way. So launch it now. This is the ideal case because we don't have |
168 // way. So launch it now. This is the ideal case because we don't have |
166 // to wait for the potentially slow QApplication construction. |
169 // to wait for the potentially slow QApplication construction. |
167 initSplash(flags); |
170 initSplash(flags); |
168 } |
171 } |
178 return argc; |
181 return argc; |
179 } |
182 } |
180 |
183 |
181 static void handleQtBasedSplash(Hb::ApplicationFlags flags) |
184 static void handleQtBasedSplash(Hb::ApplicationFlags flags) |
182 { |
185 { |
183 if (HbSplashScreenExt::needsQt()) { |
186 if (HbSplashScreenExt::needsQt() || flags.testFlag(Hb::ForceQtSplash)) { |
184 // Splash needs Qt so it has not yet been started. Launch it now. |
187 // Splash needs Qt so it has not yet been started. Launch it now. |
185 initSplash(flags); |
188 initSplash(flags); |
186 } else { |
189 } else { |
187 // Splash is already up and running, notify that Qt is now available. |
190 // Splash is already up and running, notify that Qt is now available. |
188 HbSplashScreenExt::doQtPhase(); |
191 HbSplashScreenExt::doQtPhase(); |