← Back to branch summary

~timo-jyrinki/ubuntu/saucy/qtcreator/add_workaround_back

« back to all changes in this revision

Viewing changes to .pc/03_fix_DOCPATH.diff/src/plugins/help/helpplugin.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2011-11-18 16:18:49 UTC
  • mfrom: (1.1.16)
  • Revision ID: package-import@ubuntu.com-20111118161849-5t8jugl6egvs4iev
Tags: 2.4.0~rc-0ubuntu1
* New upstream release candidate.
* Drop 04_fix_ftbfs_arm_qreal.diff, merged upstream.
* Refresh 01_fix_installation_paths.diff.
* Compress binary packages with xz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/03_fix_DOCPATH.diff/src/plugins/help/helpplugin.cpp
4
4
**
5
5
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
6
6
**
7
 
** Contact: Nokia Corporation (info@qt.nokia.com)
 
7
** Contact: Nokia Corporation (qt-info@nokia.com)
8
8
**
9
9
**
10
10
** GNU Lesser General Public License Usage
26
26
** conditions contained in a signed written agreement between you and Nokia.
27
27
**
28
28
** If you have questions regarding the use of this file, please contact
29
 
** Nokia at info@qt.nokia.com.
 
29
** Nokia at qt-info@nokia.com.
30
30
**
31
31
**************************************************************************/
32
32
 
203
203
    QAction *action = new QAction(QIcon(QLatin1String(IMAGEPATH "home.png")),
204
204
        tr("Home"), this);
205
205
    Core::ActionManager *am = m_core->actionManager();
206
 
    Core::Command *cmd = am->registerAction(action, "Help.Home", globalcontext);
 
206
    am->registerAction(action, "Help.Home", globalcontext);
207
207
    connect(action, SIGNAL(triggered()), m_centralWidget, SLOT(home()));
208
208
 
209
209
    action = new QAction(QIcon(QLatin1String(IMAGEPATH "previous.png")),
210
210
        tr("Previous Page"), this);
211
 
    cmd = am->registerAction(action, Core::Id("Help.Previous"), modecontext);
 
211
    Core::Command *cmd = am->registerAction(action, Core::Id("Help.Previous"), modecontext);
212
212
    cmd->setDefaultKeySequence(QKeySequence::Back);
213
213
    action->setEnabled(m_centralWidget->isBackwardAvailable());
214
214
    connect(action, SIGNAL(triggered()), m_centralWidget, SLOT(backward()));