Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed compilation
  • Loading branch information
tmeshkova committed Feb 2, 2014
1 parent c5cc79b commit b26a541
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions embedding/embedlite/tests/embedLiteCoreInitTest.cpp
Expand Up @@ -7,7 +7,7 @@
#include "mozilla/embedlite/EmbedLiteApp.h"

#ifdef MOZ_WIDGET_QT
#include <QApplication>
#include <QGuiApplication>
#elif defined(MOZ_WIDGET_GTK2)
#include <glib-object.h>
#endif
Expand All @@ -34,7 +34,7 @@ class MyListener : public EmbedLiteAppListener
int main(int argc, char** argv)
{
#ifdef MOZ_WIDGET_QT
QApplication app(argc, argv);
QGuiApplication app(argc, argv);
#elif defined(MOZ_WIDGET_GTK2)
g_type_init();
g_thread_init(NULL);
Expand Down
8 changes: 4 additions & 4 deletions embedding/embedlite/tests/embedLiteViewInitTest.cpp
Expand Up @@ -8,7 +8,7 @@
#include "mozilla/embedlite/EmbedLiteView.h"

#ifdef MOZ_WIDGET_QT
#include <QApplication>
#include <QGuiApplication>
#if defined(Q_WS_X11) && QT_VERSION < 0x040800
#include <X11/Xlib.h>
#endif
Expand Down Expand Up @@ -128,12 +128,12 @@ int main(int argc, char** argv)
{
#ifdef MOZ_WIDGET_QT
#if QT_VERSION >= 0x040800
QApplication::setAttribute(Qt::AA_X11InitThreads, true);
QGuiApplication::setAttribute(Qt::AA_X11InitThreads, true);
#else
XInitThreads();
QApplication::setAttribute(static_cast<Qt::ApplicationAttribute>(10), true);
QGuiApplication::setAttribute(static_cast<Qt::ApplicationAttribute>(10), true);
#endif
QApplication app(argc, argv);
QGuiApplication app(argc, argv);
#elif defined(MOZ_WIDGET_GTK2)
g_type_init();
g_thread_init(NULL);
Expand Down
1 change: 1 addition & 0 deletions gfx/thebes/gfxQtPlatform.cpp
Expand Up @@ -44,6 +44,7 @@ using namespace mozilla;
using namespace mozilla::unicode;
using namespace mozilla::gfx;

gfxFontconfigUtils *gfxQtPlatform::sFontconfigUtils = nullptr;
#ifdef MOZ_X11
bool gfxQtPlatform::sUseXRender = true;
#endif
Expand Down

0 comments on commit b26a541

Please sign in to comment.