← Back to branch summary

~feng-kylin/unity8/OpenUrlInIndicator

« back to all changes in this revision

Viewing changes to main.cpp

  • Committer: Tarmac
  • Author(s): Nick Dedekind, Launchpad Translations on behalf of unity-team
  • Date: 2013-07-11 19:50:27 UTC
  • mfrom: (2.5.114 indicators-client)
  • Revision ID: tarmac-20130711195027-yheu3w2oc42c1h7s
Moved indicators-client code into unity8. Fixes: https://bugs.launchpad.net/bugs/1191132, https://bugs.launchpad.net/bugs/1191822.

Approved by PS Jenkins bot, Michał Sawicz, Nicolas d'Offay.

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.cpp
22
22
#include <QtGui/QIcon>
23
23
#include <QtGui/QGuiApplication>
24
24
#include <QtQml/QQmlEngine>
 
25
#include <QtQml/QQmlContext>
25
26
#include <qpa/qplatformnativeinterface.h>
26
27
#include <QLibrary>
27
28
#include <libintl.h>
131
132
    nativeInterface->setProperty("ubuntuSessionType", 1);
132
133
    view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
133
134
 
134
 
    QObject::connect(view->engine(), SIGNAL(quit()), qApp, SLOT(quit()));
135
 
 
136
135
    QUrl source("Shell.qml");
137
136
    prependImportPaths(view->engine(), ::overrideImportPaths());
138
137
    appendImportPaths(view->engine(), ::fallbackImportPaths());