← Back to branch summary

~abreu-alexandre/webbrowser-app/container-extension

« back to all changes in this revision

Viewing changes to src/Ubuntu/Web/plugin.cpp

  • Committer: CI Train Bot
  • Author(s): Olivier Tilloy
  • Date: 2016-04-28 14:39:20 UTC
  • mfrom: (1432.3.2 lsb-release)
  • Revision ID: ci-train-bot@canonical.com-20160428143920-pelbdewsijv38gzu
Read the ubuntu version at build time, instead of hardcoding it. Fixes: #1466427

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Ubuntu/Web/plugin.cpp
45
45
    Q_PROPERTY(QString webviewDevtoolsDebugHost READ devtoolsHost CONSTANT)
46
46
    Q_PROPERTY(int webviewDevtoolsDebugPort READ devtoolsPort CONSTANT)
47
47
    Q_PROPERTY(QStringList webviewHostMappingRules READ hostMappingRules CONSTANT)
 
48
    Q_PROPERTY(QString ubuntuVersion READ ubuntuVersion CONSTANT)
48
49
 
49
50
public:
50
51
    UbuntuWebPluginContext(QObject* parent = 0);
56
57
    QString devtoolsHost();
57
58
    int devtoolsPort();
58
59
    QStringList hostMappingRules();
 
60
    QString ubuntuVersion() const;
59
61
 
60
62
Q_SIGNALS:
61
63
    void cacheLocationChanged() const;
205
207
    return m_devtoolsPort;
206
208
}
207
209
 
 
210
QString UbuntuWebPluginContext::ubuntuVersion() const
 
211
{
 
212
    return QStringLiteral(UBUNTU_VERSION);
 
213
}
 
214
 
208
215
void UbuntuWebPluginContext::onFocusWindowChanged(QWindow* window)
209
216
{
210
217
    updateScreen();