~aacid/qtubuntu/remove_unused_signal

« back to all changes in this revision

Viewing changes to src/ubuntumirclient/plugin.cpp

Committer: Bileto Bot
Date: 2017-01-16 06:39:32 UTC
mfrom: (360.2.4 qtubuntu)
Revision ID: ci-train-bot@canonical.com-20170116063932-70jenqyqw3jplt3q

Resync trunk.

files added:
debian/qtubuntu-appmenutheme.install

src/ubuntuappmenu

src/ubuntuappmenu/com.ubuntu.MenuRegistrar.xml

src/ubuntuappmenu/gmenumodelexporter.cpp

src/ubuntuappmenu/gmenumodelexporter.h

src/ubuntuappmenu/gmenumodelplatformmenu.cpp

src/ubuntuappmenu/gmenumodelplatformmenu.h

src/ubuntuappmenu/logging.h

src/ubuntuappmenu/menuregistrar.cpp

src/ubuntuappmenu/menuregistrar.h

src/ubuntuappmenu/registry.cpp

src/ubuntuappmenu/registry.h

src/ubuntuappmenu/themeplugin.cpp

src/ubuntuappmenu/themeplugin.h

src/ubuntuappmenu/ubuntuappmenu.json

src/ubuntuappmenu/ubuntuappmenu.pro

files renamed:
src/ubuntumirclient/theme.cpp => src/ubuntuappmenu/theme.cpp

src/ubuntumirclient/theme.h => src/ubuntuappmenu/theme.h

files modified:
README

debian/changelog

debian/control

debian/gles-patches/convert-to-gles.patch

debian/rules

src/src.pro

src/ubuntumirclient/integration.cpp

src/ubuntumirclient/nativeinterface.cpp

src/ubuntumirclient/plugin.cpp

src/ubuntumirclient/ubuntumirclient.pro

src/ubuntumirclient/window.cpp

src/ubuntumirclient/window.h

Show diffs side-by-side

added added

removed removed

src/ubuntumirclient/plugin.cpp

#include "plugin.h"

#include "integration.h"

#include "logging.h"

#include "qpa/qplatformwindow.h"

Q_LOGGING_CATEGORY(ubuntumirclient, "ubuntumirclient", QtWarningMsg)

const QStringList &/*paramList*/,

int &argc, char **argv)

{

qRegisterMetaType<QPlatformWindow*>("QPlatformWindow*");

if (system.toLower() == QLatin1String("ubuntumirclient")) {

#ifdef PLATFORM_API_TOUCH

setenv("UBUNTU_PLATFORM_API_BACKEND", "touch_mirclient", 1);

Older »