← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/plugins/qmldesigner/components/formeditor/toolbox.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:
src/plugins/qmldesigner/components/formeditor/toolbox.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
 
49
49
  m_leftToolBar(new QToolBar("LeftSidebar", this)),
50
50
  m_rightToolBar(new QToolBar("RightSidebar", this))
51
51
{
 
52
    setMaximumHeight(44);
52
53
    setSingleRow(false);
53
54
    QFrame *frame = new QFrame(this);
54
55
    m_crumblePath = new Utils::CrumblePath(frame);
65
66
    verticalLayout->setMargin(0);
66
67
    verticalLayout->setSpacing(0);
67
68
 
68
 
    QHBoxLayout *horizontalLayout = new QHBoxLayout(this);
 
69
    QHBoxLayout *horizontalLayout = new QHBoxLayout();
69
70
    verticalLayout->addLayout(horizontalLayout);
70
71
    verticalLayout->addWidget(frame);
71
72
    horizontalLayout->setMargin(0);
96
97
    horizontalLayout->addWidget(m_leftToolBar);
97
98
    horizontalLayout->addWidget(stretchToolbar);
98
99
    horizontalLayout->addWidget(m_rightToolBar);
99
 
 
100
 
    setLayout(verticalLayout);
101
100
}
102
101
 
103
102
void ToolBox::setLeftSideActions(const QList<QAction*> &actions)