diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2009-06-09 18:38:52 +0200 |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2009-06-09 18:38:52 +0200 |
| commit | 8c41eddaf4bbb6b0b472e5dc4ca8889d7f3accb7 (patch) | |
| tree | c4d734c4ae7c33f78b4a74e0fa7d2ff59fcf5dc5 | |
| parent | 91bbd724b90d76e072684cfee90a02d79da94dea (diff) | |
| parent | c85435d9ab2d4bbaaa79779bcdfb104042ce3cfb (diff) | |
| download | qt-creator-8c41eddaf4bbb6b0b472e5dc4ca8889d7f3accb7.tar.gz | |
Merge branch '1.2' of git@scm.dev.nokia.troll.no:creator/mainline
| -rw-r--r-- | doc/qtcreator.qdocconf | 2 | ||||
| -rw-r--r-- | src/plugins/coreplugin/welcomemode.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/texteditor/basetexteditor.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index ac3058e9fc..0a09b28662 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -13,7 +13,7 @@ exampledirs = $SRCDIR extraimages.HTML = qt-logo \ trolltech-logo -sources.fileextensions = "qtcreator.qdoc" +sources.fileextensions = "qtcreator.qdoc addressbook-sdk.qdoc" qhp.projects = QtCreator diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp index 74a8def7b0..c0506a222a 100644 --- a/src/plugins/coreplugin/welcomemode.cpp +++ b/src/plugins/coreplugin/welcomemode.cpp @@ -178,7 +178,7 @@ WelcomeMode::WelcomeMode() : m_d->ui.tutorialTreeWidget->addItem(tr("<b>Qt Creator - A quick tour</b>"), QString("qthelp://com.nokia.qtcreator.%1%2/doc/index.html").arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR)); m_d->ui.tutorialTreeWidget->addItem(tr("Creating an address book"), - QLatin1String("qthelp://com.trolltech.qt/qdoc/tutorials-addressbook.html")); + QLatin1String("qthelp://com.nokia.qtcreator/doc/tutorials-addressbook-sdk.html")); m_d->ui.tutorialTreeWidget->addItem(tr("Understanding widgets"), QLatin1String("qthelp://com.trolltech.qt/qdoc/widgets-tutorial.html")); m_d->ui.tutorialTreeWidget->addItem(tr("Building with qmake"), diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 22882ed6eb..e79e617310 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -2315,7 +2315,8 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e) // if (documentLayout->doubleMarkCount) // markWidth += fm.lineSpacing() / 3; - const int extraAreaWidth = d->m_extraArea->width() - collapseBoxWidth(fm); + const int collapseColumnWidth = d->m_codeFoldingVisible ? collapseBoxWidth(fm): 0; + const int extraAreaWidth = d->m_extraArea->width() - collapseColumnWidth; painter.fillRect(e->rect(), pal.color(QPalette::Base)); painter.fillRect(e->rect().intersected(QRect(0, 0, extraAreaWidth, INT_MAX)), |