feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '1.2' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source
This commit is contained in:
Roberto Raggi
2009-06-09 18:38:52 +02:00
parent 91bbd724b9 c85435d9ab
commit 8c41eddaf4
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/qtcreator.qdocconf
+1 -1
View File
@@ -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
src/plugins/coreplugin/welcomemode.cpp
+1 -1
View File
@@ -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"),
src/plugins/texteditor/basetexteditor.cpp
+2 -1
View File
@@ -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)),