← Back to branch summary

~zeller-benjamin/qtcreator-plugin-ubuntu/bughunt-27082015

« back to all changes in this revision

Viewing changes to src/ubuntu/ubuntuplugin.cpp

  • Committer: CI Train Bot
  • Author(s): Benjamin Zeller
  • Date: 2015-07-20 12:53:08 UTC
  • mfrom: (394.3.6 qtcreator-plugin-ubuntu)
  • Revision ID: ci-train-bot@canonical.com-20150720125308-itp4rdxmzf01kmql
- Remove QtScript dependency from the manifest.json parser
- Fix Bug lp:1461026 "Kits creation for a project should match targeted framework"
- Fix Bug lp:1461014 "Match application name to click package name"
- Fix Bug lp:1461019 "Default in project creation dialog should be a qmake project"
- Fix Bug lp:1340061: "Some dialogs have unreadable (too small) text" Fixes: #1340061, #1461014, #1461019, #1461026
Approved by: Zoltan Balogh, PS Jenkins bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ubuntu/ubuntuplugin.cpp
106
106
    Q_UNUSED(arguments)
107
107
    Q_UNUSED(errorString)
108
108
 
 
109
    QFont defaultFont = QGuiApplication::font();
 
110
    defaultFont.setFamily(QStringLiteral("Ubuntu"));
 
111
    defaultFont.setWeight(QFont::Light);
 
112
 
109
113
    qmlRegisterUncreatableType<UbuntuQmlDeviceConnectionState>("Ubuntu.DevicesModel",0,1,"DeviceConnectionState",QStringLiteral("Not instantiable"));
110
114
    qmlRegisterUncreatableType<UbuntuQmlDeviceDetectionState>("Ubuntu.DevicesModel",0,1,"DeviceDetectionState",QStringLiteral("Not instantiable"));
111
115
    qmlRegisterUncreatableType<UbuntuQmlFeatureState>("Ubuntu.DevicesModel",0,1,"FeatureState",QStringLiteral("Not instantiable"));
269
273
 
270
274
    connect(m_migrateProjectAction, SIGNAL(triggered()), this, SLOT(migrateProject()));
271
275
 
 
276
    /* Fix Bug lp:1340061 "Some dialogs have unreadable (too small) text"
 
277
     * The Bug is caused by UITK that overrides the default Font that is based
 
278
     * on the grid units, which is not useable in Widget based applications
 
279
     */
 
280
    QGuiApplication::setFont(defaultFont);
 
281
 
272
282
    return true;
273
283
}
274
284