diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.ui b/src/plugins/projectexplorer/projectwelcomepagewidget.ui index 081d1c4883a4a36bb11ede96cf3d4e7762b5aab7..2e4ad9a954698f10b90d96a8b0b32229309f38c0 100644 --- a/src/plugins/projectexplorer/projectwelcomepagewidget.ui +++ b/src/plugins/projectexplorer/projectwelcomepagewidget.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>667</width> - <height>365</height> + <width>639</width> + <height>322</height> </rect> </property> <property name="windowTitle"> @@ -46,15 +46,15 @@ <string/> </property> <layout class="QGridLayout" name="gridLayout_5"> + <property name="rightMargin"> + <number>9</number> + </property> <property name="horizontalSpacing"> <number>0</number> </property> <property name="verticalSpacing"> <number>3</number> </property> - <property name="rightMargin"> - <number>9</number> - </property> <item row="3" column="0" colspan="3"> <widget class="Utils::WelcomeModeTreeWidget" name="projTreeWidget"> <property name="sizePolicy"> diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index dff8e5a9c6f58c49b9a8bc428962f5f404fd61cd..68d910248f064c6f63ba003e3f3b7df151408254 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp @@ -72,7 +72,7 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent connect(ui->tutorialTreeWidget, SIGNAL(activated(QString)), SLOT(slotOpenHelpPage(const QString&))); ui->tutorialTreeWidget->addItem(tr("The Qt Creator User Interface"), - QString("qthelp://com.nokia.qtcreator.%1%2/doc/index.html").arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR)); + QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html")); ui->tutorialTreeWidget->addItem(tr("Creating a Qt C++ Application"), QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-writing-program.html?view=split")); ui->tutorialTreeWidget->addItem(tr("Creating a Qt Quick Application"), diff --git a/src/plugins/welcome/communitywelcomepagewidget.cpp b/src/plugins/welcome/communitywelcomepagewidget.cpp index ae2252c839bbfd2786bbfe7f9e6a15c2cb63f9f4..517e48be0920007a36ec82e1df1eb5c57fd851fd 100644 --- a/src/plugins/welcome/communitywelcomepagewidget.cpp +++ b/src/plugins/welcome/communitywelcomepagewidget.cpp @@ -66,7 +66,6 @@ CommunityWelcomePageWidget::CommunityWelcomePageWidget(QWidget *parent) : supportSites << qMakePair(tr("<b>Qt Centre</b><br /><font color='gray'>Community based Qt support</font>"), QString(QLatin1String("http://www.qtcentre.org"))); sites << qMakePair(tr("<b>Qt Home</b><br /><font color='gray'>Qt by Nokia on the web</font>"), QString(QLatin1String("http://qt.nokia.com"))); - sites << qMakePair(tr("<b>Qt Labs</b><br /><font color='gray'>Home of the Qt developers</font>"), QString(QLatin1String("http://labs.qt.nokia.com"))); sites << qMakePair(tr("<b>Qt Git Hosting</b><br /><font color='gray'>Participate in Qt development</font>"), QString(QLatin1String("http://qt.gitorious.org"))); sites << qMakePair(tr("<b>Qt Apps</b><br /><font color='gray'>Find free Qt-based apps</font>"), QString(QLatin1String("http://www.qt-apps.org"))); diff --git a/src/plugins/welcome/communitywelcomepagewidget.ui b/src/plugins/welcome/communitywelcomepagewidget.ui index 131fb761b7b1d1215f6a8939e38fdfeb61a9aac8..99ebed14b3ef2f96290bf649ade81812669a20c2 100644 --- a/src/plugins/welcome/communitywelcomepagewidget.ui +++ b/src/plugins/welcome/communitywelcomepagewidget.ui @@ -132,7 +132,7 @@ <item> <widget class="Utils::WelcomeModeTreeWidget" name="supportSitesTreeWidget"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> diff --git a/src/plugins/welcome/welcomemode.ui b/src/plugins/welcome/welcomemode.ui index 14a1189a7ff544c43299ecd41a34038155cdb6a0..7e19c4411ca3f3d130858edf1bc37d8f32d6ba08 100644 --- a/src/plugins/welcome/welcomemode.ui +++ b/src/plugins/welcome/welcomemode.ui @@ -107,13 +107,13 @@ QToolButton:pressed, QPushButton:pressed{ <property name="minimumSize"> <size> <width>662</width> - <height>490</height> + <height>500</height> </size> </property> <property name="maximumSize"> <size> <width>662</width> - <height>490</height> + <height>500</height> </size> </property> <property name="styleSheet">