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

doc/addressbook-sdk.qdoc

@@ -471,13 +471,9 @@
 
     \snippet examples/addressbook-sdk/part3/addressbook.h slot definition
 
-    We also define two more QPushButton objects:
-
-    \snippet examples/addressbook-sdk/part3/addressbook.h members
-
-    In the \c AddressBook constructor, we extract the push buttons from the
-    \c ui object and disable them by default. This is because navigation is
-    only enabled when there is more than one contact in the address book.
+    In the \c AddressBook constructor, we setup our fields and disable them by
+    default. This is because navigation is only enabled when there is more than
+    one contact in the address book.
 
     \snippet examples/addressbook-sdk/part3/addressbook.cpp extract objects
 

doc/examples/addressbook-sdk/part3/addressbook.cpp

@@ -6,45 +6,27 @@ AddressBook::AddressBook(QWidget *parent)
 {
     ui->setupUi(this);
 
-    nameLine = new QLineEdit;
-    nameLine = ui->nameLine;
-    nameLine->setReadOnly(true);
-
-    addressText = new QTextEdit;
-    addressText = ui->addressText;
-    addressText->setReadOnly(true);
-
-    addButton = new QPushButton;
-    addButton = ui->addButton;
-
-    submitButton = new QPushButton;
-    submitButton = ui->submitButton;
-    submitButton->hide();
-
-    cancelButton = new QPushButton;
-    cancelButton = ui->cancelButton;
-    cancelButton->hide();
-
-//! [extract objects]
-    nextButton = new QPushButton;
-    nextButton = ui->nextButton;
-    nextButton->setEnabled(false);
-
-    previousButton = new QPushButton;
-    previousButton = ui->previousButton;
-    nextButton->setEnabled(false);
-//! [extract objects]
-
-    connect(addButton, SIGNAL(clicked()), this,
+    ui->nameLine->setReadOnly(true);
+    ui->addressText->setReadOnly(true);
+    ui->addButton = ui->addButton;
+    ui->submitButton->hide();
+    ui->cancelButton->hide();
+
+//! [setup fields]
+    ui->nextButton->setEnabled(false);
+    ui->previousButton->setEnabled(false);
+//! [setup fields]
+
+    connect(ui->addButton, SIGNAL(clicked()), this,
                 SLOT(addContact()));
-    connect(submitButton, SIGNAL(clicked()), this,
+    connect(ui->submitButton, SIGNAL(clicked()), this,
                 SLOT(submitContact()));
-    connect(cancelButton, SIGNAL(clicked()), this,
+    connect(ui->cancelButton, SIGNAL(clicked()), this,
                 SLOT(cancel()));
 //! [signal slot]
-    connect(nextButton, SIGNAL(clicked()), this,
+    connect(ui->nextButton, SIGNAL(clicked()), this,
                 SLOT(next()));
-    connect(previousButton, SIGNAL(clicked()), this,
+    connect(ui->previousButton, SIGNAL(clicked()), this,
                 SLOT(previous()));
 //! [signal slot]
 
@@ -58,29 +40,29 @@ AddressBook::~AddressBook()
 
 void AddressBook::addContact()
 {
-    oldName = nameLine->text();
-    oldAddress = addressText->toPlainText();
+    oldName = ui->nameLine->text();
+    oldAddress = ui->addressText->toPlainText();
 
-    nameLine->clear();
-    addressText->clear();
+    ui->nameLine->clear();
+    ui->addressText->clear();
 
-    nameLine->setReadOnly(false);
-    nameLine->setFocus(Qt::OtherFocusReason);
-    addressText->setReadOnly(false);
+    ui->nameLine->setReadOnly(false);
+    ui->nameLine->setFocus(Qt::OtherFocusReason);
+    ui->addressText->setReadOnly(false);
 
-    addButton->setEnabled(false);
+    ui->addButton->setEnabled(false);
 //! [disable navigation]
-    nextButton->setEnabled(false);
-    previousButton->setEnabled(false);
+    ui->nextButton->setEnabled(false);
+    ui->previousButton->setEnabled(false);
 //! [disable navigation]
-    submitButton->show();
-    cancelButton->show();
+    ui->submitButton->show();
+    ui->cancelButton->show();
 }
 
 void AddressBook::submitContact()
 {
-    QString name = nameLine->text();
-    QString address = addressText->toPlainText();
+    QString name = ui->nameLine->text();
+    QString address = ui->addressText->toPlainText();
 
     if (name == "" || address == "") {
         QMessageBox::information(this, tr("Empty Field"),
@@ -92,7 +74,6 @@ void AddressBook::submitContact()
         contacts.insert(name, address);
         QMessageBox::information(this, tr("Add Successful"),
             tr("\"%1\" has been added to your address book.").arg(name));
-        return;
     } else {
         QMessageBox::information(this, tr("Add Unsuccessful"),
             tr("Sorry, \"%1\" is already in your address book.").arg(name));
@@ -100,44 +81,44 @@ void AddressBook::submitContact()
     }
 
     if (contacts.isEmpty()) {
-        nameLine->clear();
-        addressText->clear();
+        ui->nameLine->clear();
+        ui->addressText->clear();
     }
 
-    nameLine->setReadOnly(true);
-    addressText->setReadOnly(true);
-    addButton->setEnabled(true);
+    ui->nameLine->setReadOnly(true);
+    ui->addressText->setReadOnly(true);
+    ui->addButton->setEnabled(true);
 
 //! [enable navigation]
     int number = contacts.size();
-    nextButton->setEnabled(number > 1);
-    previousButton->setEnabled(number > 1);
+    ui->nextButton->setEnabled(number > 1);
+    ui->previousButton->setEnabled(number > 1);
 //! [enable navigation]
-    submitButton->hide();
-    cancelButton->hide();
+    ui->submitButton->hide();
+    ui->cancelButton->hide();
 }
 
 void AddressBook::cancel()
 {
-    nameLine->setText(oldName);
-    nameLine->setReadOnly(true);
+    ui->nameLine->setText(oldName);
+    ui->nameLine->setReadOnly(true);
 
-    addressText->setText(oldAddress);
-    addressText->setReadOnly(true);
-    addButton->setEnabled(true);
+    ui->addressText->setText(oldAddress);
+    ui->addressText->setReadOnly(true);
+    ui->addButton->setEnabled(true);
 
     int number = contacts.size();
-    nextButton->setEnabled(number > 1);
-    previousButton->setEnabled(number > 1);
+    ui->nextButton->setEnabled(number > 1);
+    ui->previousButton->setEnabled(number > 1);
 
-    submitButton->hide();
-    cancelButton->hide();
+    ui->submitButton->hide();
+    ui->cancelButton->hide();
 }
 
 //! [next]
 void AddressBook::next()
 {
-    QString name = nameLine->text();
+    QString name = ui->nameLine->text();
     QMap<QString, QString>::iterator i = contacts.find(name);
 
     if (i != contacts.end())
@@ -145,20 +126,20 @@ void AddressBook::next()
     if (i == contacts.end())
         i = contacts.begin();
 
-    nameLine->setText(i.key());
-    addressText->setText(i.value());
+    ui->nameLine->setText(i.key());
+    ui->addressText->setText(i.value());
 }
 //! [next]
 
 //! [previous]
 void AddressBook::previous()
 {
-    QString name = nameLine->text();
+    QString name = ui->nameLine->text();
     QMap<QString, QString>::iterator i = contacts.find(name);
 
     if (i == contacts.end()) {
-        nameLine->clear();
-        addressText->clear();
+        ui->nameLine->clear();
+        ui->addressText->clear();
         return;
     }
 
@@ -166,8 +147,8 @@ void AddressBook::previous()
         i = contacts.end();
 
     i--;
-    nameLine->setText(i.key());
-    addressText->setText(i.value());
+    ui->nameLine->setText(i.key());
+    ui->addressText->setText(i.value());
 }
 //! [previous]
 

doc/examples/addressbook-sdk/part3/addressbook.h

@@ -2,11 +2,8 @@
 #define ADDRESSBOOK_H
 
 #include <QtGui/QWidget>
-#include <QtGui/QPushButton>
-#include <QtGui/QLineEdit>
-#include <QtGui/QTextEdit>
 #include <QtGui/QMessageBox>
-
+#include <QtCore/QMap>
 
 namespace Ui
 {
@@ -32,17 +29,6 @@ public slots:
 
 private:
     Ui::AddressBook *ui;
-
-    QPushButton *addButton;
-    QPushButton *submitButton;
-    QPushButton *cancelButton;
-//! [members]
-    QPushButton *nextButton;
-    QPushButton *previousButton;
-//! [members]
-    QLineEdit *nameLine;
-    QTextEdit *addressText;
-
     QMap<QString, QString> contacts;
     QString oldName;
     QString oldAddress;

src/app/Info.plist

@@ -22,7 +22,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>CFBundleTypeIconFile</key>
-			<string>profile.icns</string>
+			<string>prifile.icns</string>
 			<key>CFBundleTypeExtensions</key>
 			<array>
 				<string>pri</string>

src/libs/utils/styledbar.cpp

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+**
+**************************************************************************/
+
 #include "styledbar.h"
 
 #include "stylehelper.h"

src/libs/utils/styledbar.h

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+**
+**************************************************************************/
+
 #ifndef STYLEDBAR_H
 #define STYLEDBAR_H
 

src/plugins/projectexplorer/dependenciespanel.cpp

@@ -36,6 +36,9 @@
 #include <QtCore/QVector>
 #include <QtCore/QDebug>
 #include <QtCore/QAbstractListModel>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QTreeView>
+#include <QtGui/QSpacerItem>
 #include <QtGui/QHeaderView>
 #include <QtGui/QMessageBox>
 #include <QtGui/QPushButton>

src/plugins/projectexplorer/dependenciespanel.h

@@ -31,7 +31,6 @@
 #define DEPENDENCIESDIALOG_H
 
 #include "iprojectproperties.h"
-#include "ui_dependenciespanel.h"
 
 #include <QtGui/QWidget>
 

src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+**
+**************************************************************************/
+
 #include "gccetoolchain.h"
 #include "qt4project.h"
 

src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+**
+**************************************************************************/
+
 #ifndef GCCETOOLCHAIN_H
 #define GCCETOOLCHAIN_H
 

src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+**
+**************************************************************************/
+
 #include "s60devicerunconfiguration.h"
 
 #include "qt4project.h"

src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+**
+**************************************************************************/
+
 #ifndef S60DEVICERUNCONFIGURATION_H
 #define S60DEVICERUNCONFIGURATION_H
 

src/plugins/qt4projectmanager/qt-s60/s60devices.cpp

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+**
+**************************************************************************/
+
 #include "s60devices.h"
 
 #include <QtCore/QSettings>

src/plugins/qt4projectmanager/qt-s60/s60devices.h

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+**
+**************************************************************************/
+
 #ifndef S60DEVICES_H
 #define S60DEVICES_H
 

src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+**
+**************************************************************************/
+
 #include "s60devicespreferencepane.h"
 #include "ui_s60devicespreferencepane.h"
 

src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.h

+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage