mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Bug 566118 - nsAppShell initialized earlier than QApplication.
This commit is contained in:
parent
e304b7ac76
commit
9577f1f59e
@ -79,7 +79,6 @@
|
||||
#include <QX11EmbedWidget>
|
||||
#include <QGraphicsView>
|
||||
#include <QGraphicsWidget>
|
||||
#include "nsQAppInstance.h"
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_WIDGET_GTK2
|
||||
@ -114,9 +113,6 @@ TabChild::Init()
|
||||
#ifdef MOZ_WIDGET_GTK2
|
||||
gtk_init(NULL, NULL);
|
||||
#endif
|
||||
#ifdef MOZ_WIDGET_QT
|
||||
nsQAppInstance::AddRef();
|
||||
#endif
|
||||
|
||||
nsCOMPtr<nsIWebBrowser> webBrowser = do_CreateInstance(NS_WEBBROWSER_CONTRACTID);
|
||||
if (!webBrowser) {
|
||||
|
@ -85,6 +85,8 @@ nsAppShell::Init()
|
||||
sPokeEvent = QEvent::User+5000;
|
||||
#endif
|
||||
|
||||
nsQAppInstance::AddRef();
|
||||
|
||||
return nsBaseAppShell::Init();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user