From 565b73b5a544014487807683c1db34b78ae43ed5 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Tue, 2 Jun 2009 15:19:21 +0200 Subject: [PATCH 01/25] Fixes: Doc - more of the tutorial - explaining why we need a main layout for the top-level widget. RevBy: Daniel Molkentin --- doc/addressbook-sdk.qdoc | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc index eed7f573f32..bff44eedded 100644 --- a/doc/addressbook-sdk.qdoc +++ b/doc/addressbook-sdk.qdoc @@ -136,6 +136,7 @@ Now that we have all the files we need, let's move on to designing the user interface. + \section1 Placing Widgets on the Form In the \gui{Project Sidebar}, double-click on the \c{addressbook.ui} file. @@ -153,14 +154,21 @@ earlier. We use a QGridLayout to position our labels and input fields in a structured manner. QGridLayout divides the available space into a grid and places widgets in the cells we specify with row and column numbers. The - diagram below shows the layout cells and the position of our widgets. + diagram below shows the layout cells and the position of our widgets. Place + your widgets accordingly and save the form by choosing + \gui{File | Save} or using the \key{Ctrl+S} shortcut. \image addressbook-tutorial-part1-labeled-screenshot.png - Place your widgets accordingly and save the form by choosing - \gui{File | Save} or using the \key{Ctrl+S} shortcut. - - A common + A common mistake when designing user interfaces with \QD is overlooking the + top level widget's layout. Unlike sub-layouts, which \QD displays with a + red border, top level layouts have no graphical representation. Layouts are + necessary for top level widgets, in this case QWidget, to ensure that when + the window is resized, the widgets on the form will resize accordingly. You + can try this out by pressing \key{Ctrl+R} now. To correct it, simply click + anywhere on the form and select \gui{Lay out Horizontally} or + \gui{Lay out Vertically}. The output will be the same. Now your widgets + will resize correctly. \section1 The AddressBook Class @@ -280,7 +288,9 @@ ## image Select all the objects on the form (use \key{Ctrl+A}) and lay them out in a - grid. + grid. Lastly, set the top level widget's layout by right-clicking anywhere + on the widget and selecting \gui{Lay out Horizontally} or + \gui{Lay out Vertically}. From de8dcb7b23b83c650a7aef78dfef62e980883e9e Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Tue, 2 Jun 2009 15:21:20 +0200 Subject: [PATCH 02/25] Fixes: Doc - remove trailing whitespace Reviewed-By: TrustMe --- doc/addressbook-sdk.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc index bff44eedded..c60ad27ee06 100644 --- a/doc/addressbook-sdk.qdoc +++ b/doc/addressbook-sdk.qdoc @@ -136,7 +136,7 @@ Now that we have all the files we need, let's move on to designing the user interface. - + \section1 Placing Widgets on the Form In the \gui{Project Sidebar}, double-click on the \c{addressbook.ui} file. From 0b90329427742da68d33a403afc62d40932f4702 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Tue, 2 Jun 2009 17:42:27 +0200 Subject: [PATCH 03/25] Fixes: Doc - more of the tutorial RevBy: TrustMe --- doc/addressbook-sdk.qdoc | 29 +++- .../addressbook-sdk/part2/addressbook.cpp | 23 ++- .../addressbook-sdk/part2/addressbook.h | 24 +++ .../addressbook-sdk/part2/addressbook.ui | 140 +++++++++--------- 4 files changed, 140 insertions(+), 76 deletions(-) diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc index c60ad27ee06..6aeff092a6d 100644 --- a/doc/addressbook-sdk.qdoc +++ b/doc/addressbook-sdk.qdoc @@ -269,7 +269,6 @@ \section1 Placing Widgets on the Form - Now that we have the labels and input fields set up, we add push buttons to complete the process of adding a contact. So, we begin by breaking the existing layouts. Then, we add three push buttons. Double-click on each of @@ -292,6 +291,34 @@ on the widget and selecting \gui{Lay out Horizontally} or \gui{Lay out Vertically}. + The final design of the form is shown in the screenshot below: + ## image + + + \section1 The AddressBook Class + + To ensure that the Address Book reacts to user interaction, we need to + write slots for each push button that we added earlier. A slot is a + function that responds to a particular signal. We will discuss this + concept in further detail below. However, for an overview of Qt's signals + and slots concept, you can refer to the \l{Signals and Slots} document. + + In the \l{examples/addressbook-sdk/part2/addressbook.h}{\c addressbook.h} + file, we add the following code: + + \snippet examples/addressbook-sdk/part2/addressbook.h slot definition + + Next, we have to provide private members for the \c AddressBook class so + that we can access these members freely throughout the application. + + \note The names, e.g., \c addButton etc., correspond to the name of the + actual object. You can modify them by double-clicking on their names within + \QD's \gui{Object Inspector}. + + We need a container to store our address book contacts, so that we can + traverse and display them. A QMap object, \c contacts, is used for this + purpose as it holds a key-value pair: the contact's name as the \e key, and + the contact's address as the \e value. */ diff --git a/doc/examples/addressbook-sdk/part2/addressbook.cpp b/doc/examples/addressbook-sdk/part2/addressbook.cpp index 38e9404f31a..353c65a70e0 100644 --- a/doc/examples/addressbook-sdk/part2/addressbook.cpp +++ b/doc/examples/addressbook-sdk/part2/addressbook.cpp @@ -1,4 +1,3 @@ -//! [class implementation] #include "addressbook.h" #include "ui_addressbook.h" @@ -6,10 +5,30 @@ AddressBook::AddressBook(QWidget *parent) : QWidget(parent), ui(new Ui::AddressBookClass) { ui->setupUi(this); + + addButton = new QPushButton(); + addButton = ui->addButton; + + submitButton = new QPushButton(); + submitButton = ui->submitButton; + + cancelButton = new QPushButton(); + cancelButton = ui->cancelButton; } AddressBook::~AddressBook() { delete ui; } -//! [class implementation] + +void AddressBook::addContact() +{ +} + +void AddressBook::submitContact() +{ +} + +void AddressBook::cancel() +{ +} diff --git a/doc/examples/addressbook-sdk/part2/addressbook.h b/doc/examples/addressbook-sdk/part2/addressbook.h index c5937d435b8..3021d5b9b09 100644 --- a/doc/examples/addressbook-sdk/part2/addressbook.h +++ b/doc/examples/addressbook-sdk/part2/addressbook.h @@ -3,6 +3,9 @@ #define ADDRESSBOOK_H #include +#include +#include +#include namespace Ui { @@ -17,8 +20,29 @@ public: AddressBook(QWidget *parent = 0); ~AddressBook(); +//! [slot definition] +public slots: + void addContact(); + void submitContact(); + void cancel(); +//! [slot definition] + private: Ui::AddressBookClass *ui; + +//! [members1] + QPushButton *addButton; + QPushButton *submitButton; + QPushButton *cancelButton; + QLineEdit *nameLine; + QTextEdit *addressText; +//! [members1] + +//! [members2] + QMap contacts; + QString oldName; + QString oldAddress; +//! [members2] }; #endif // ADDRESSBOOK_H diff --git a/doc/examples/addressbook-sdk/part2/addressbook.ui b/doc/examples/addressbook-sdk/part2/addressbook.ui index c3683933014..1e5bf5ed22c 100644 --- a/doc/examples/addressbook-sdk/part2/addressbook.ui +++ b/doc/examples/addressbook-sdk/part2/addressbook.ui @@ -13,79 +13,73 @@ AddressBook - - - - 10 - 10 - 413 - 225 - - - - - - - Name: - - - - - - - - - - Address: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - - - - - Add - - - - - - - Submit - - - - - - - Cancel - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - + + + + + + + Name: + + + + + + + + + + Address: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + + + + + Add + + + + + + + Submit + + + + + + + Cancel + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + From c9a00bff362a976560bf6803498ed709444a0c33 Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Wed, 3 Jun 2009 10:50:04 +0200 Subject: [PATCH 04/25] Fixes: Doc - more of Part2, hoping to finish it today RevBy: TrustMe --- doc/addressbook-sdk.qdoc | 45 ++++++++++++++++--- .../addressbook-sdk/part2/addressbook.cpp | 29 ++++++++++-- .../addressbook-sdk/part2/addressbook.ui | 8 ++-- 3 files changed, 69 insertions(+), 13 deletions(-) diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc index 6aeff092a6d..74e5807901e 100644 --- a/doc/addressbook-sdk.qdoc +++ b/doc/addressbook-sdk.qdoc @@ -269,12 +269,13 @@ \section1 Placing Widgets on the Form - Now that we have the labels and input fields set up, we add push buttons to - complete the process of adding a contact. So, we begin by breaking the - existing layouts. Then, we add three push buttons. Double-click on each of - them to set their text to "Add", "Submit", and "Cancel". We now require a - vertical spacer to ensure that the push buttons will be laid out neatly; - drag one from the \gui{Widget Box}. + We shall continue with the form we had from the last chapter; we have the + labels and input fields set up, but we need to add push buttons to complete + the process of adding a contact. So, we begin by breaking the existing + layouts. Then, we add three push buttons. Double-click on each of them to + set their text to "Add", "Submit", and "Cancel". We now require a vertical + spacer to ensure that the push buttons will be laid out neatly; drag one + from the \gui{Widget Box}. Next, lay out these three push buttons and the spacer vertically, by selecting all three of them (using the \key{Ctrl + click}) and choosing @@ -312,6 +313,8 @@ Next, we have to provide private members for the \c AddressBook class so that we can access these members freely throughout the application. + \snippet examples/addressbook-sdk/part2/addressbook.h members1 + \note The names, e.g., \c addButton etc., correspond to the name of the actual object. You can modify them by double-clicking on their names within \QD's \gui{Object Inspector}. @@ -321,4 +324,34 @@ purpose as it holds a key-value pair: the contact's name as the \e key, and the contact's address as the \e value. + \snippet examples/addressbook-sdk/part2/addressbook.h members2 + + We also declare two private QString objects, \c oldName and \c oldAddress. + These objects are needed to hold the name and address of hte contact that + was last displayed, before the user clicked \gui Add. So, when the user + clicks \gui Cancel, we can revert to displaying the details of the last + contact. + + Let's move on to implementing the slots we defined earlier. Within the + constructor of \c AddressBook, we extract the widgets from the form using + the \c ui object by pointing our private members to them. + + \snippet examples/addressbook-sdk/part2/addressbook.cpp extract objects + + Then we set \c nameLine and \c addressText to read-only, so that we can + only display but not edit existing contact details. We also hide + \c submitButton and \c cancelButton as they will only be be displayed + when the user clicks \gui Add, and this is handled by the \c addContact() + function discussed below. + + \snippet examples/addressbook-sdk/part2/addressbook.cpp signal slot + + We connect the push buttons' \l{QAbstractButton::clicked()}{clicked()} + signal to their respective slots. The figure below illustrates this. + + #image + + \section2 The \c{addContact()} Function + + */ diff --git a/doc/examples/addressbook-sdk/part2/addressbook.cpp b/doc/examples/addressbook-sdk/part2/addressbook.cpp index 353c65a70e0..f4a5ea50ec4 100644 --- a/doc/examples/addressbook-sdk/part2/addressbook.cpp +++ b/doc/examples/addressbook-sdk/part2/addressbook.cpp @@ -6,14 +6,37 @@ AddressBook::AddressBook(QWidget *parent) { ui->setupUi(this); - addButton = new QPushButton(); + //! [extract objects] + 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 = new QPushButton; submitButton = ui->submitButton; + submitButton->hide(); - cancelButton = new QPushButton(); + cancelButton = new QPushButton; cancelButton = ui->cancelButton; + cancelButton->hide(); + //! [extract objects] + + //! [signal slot] + connect(addButton, SIGNAL(clicked()), this, + SLOT(addContact())); + connect(submitButton, SIGNAL(clicked()), this, + SLOT(submitContact())); + connect(cancelButton, SIGNAL(clicked()), this, + SLOT(cancel())); + //! [signal slot] + + setWindowTitle(tr("Simple Address Book")); } AddressBook::~AddressBook() diff --git a/doc/examples/addressbook-sdk/part2/addressbook.ui b/doc/examples/addressbook-sdk/part2/addressbook.ui index 1e5bf5ed22c..e36ec38b318 100644 --- a/doc/examples/addressbook-sdk/part2/addressbook.ui +++ b/doc/examples/addressbook-sdk/part2/addressbook.ui @@ -17,17 +17,17 @@ - + Name: - + - + Address: @@ -37,7 +37,7 @@ - + From e94cefc67c18850915cd999511442471d10d355f Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Wed, 3 Jun 2009 11:11:43 +0200 Subject: [PATCH 05/25] Fixes: Doc - more of the tutorial, part 2 RevBy: TrustMe --- doc/addressbook-sdk.qdoc | 14 ++++++++++++-- .../addressbook-sdk/part2/addressbook.cpp | 17 +++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc index 74e5807901e..3d97237e570 100644 --- a/doc/addressbook-sdk.qdoc +++ b/doc/addressbook-sdk.qdoc @@ -346,12 +346,22 @@ \snippet examples/addressbook-sdk/part2/addressbook.cpp signal slot - We connect the push buttons' \l{QAbstractButton::clicked()}{clicked()} - signal to their respective slots. The figure below illustrates this. + We connect the push buttons' \l{QAbstractButton::}{clicked()} signal to + their respective slots. The figure below illustrates this. #image + Finally, we set the window title to "Simple Address Book" using the + \l{QWidget::}{setWindowTitle()} function. + + \snippet examples/addressbook-sdk/part2/addressbook.cpp window title + \section2 The \c{addContact()} Function + In this function, we begin by storing the last displayed contact details + in \c oldName and \c oldAddress. Then we clear these input fields and turn + off the read-only mode. The focus is set on \c nameLine and we display + \c submitButton and \c cancelButton; but we disable \c addButton. + \snippet examples/addressbook-sdk/part2/addressbook.cpp addContact */ diff --git a/doc/examples/addressbook-sdk/part2/addressbook.cpp b/doc/examples/addressbook-sdk/part2/addressbook.cpp index f4a5ea50ec4..1406c3ca72b 100644 --- a/doc/examples/addressbook-sdk/part2/addressbook.cpp +++ b/doc/examples/addressbook-sdk/part2/addressbook.cpp @@ -36,7 +36,9 @@ AddressBook::AddressBook(QWidget *parent) SLOT(cancel())); //! [signal slot] + //! [window title] setWindowTitle(tr("Simple Address Book")); + //! [window title] } AddressBook::~AddressBook() @@ -44,9 +46,24 @@ AddressBook::~AddressBook() delete ui; } +//! [addContact] void AddressBook::addContact() { + oldName = nameLine->text(); + oldAddress = addressTExt->toPlainText(); + + nameLine->clear(); + addressText->clear(); + + nameLine->setReadOnly(false); + nameLine->setFocus(Qt::OtherFocusReason); + addressText->setReadOnly(false); + + addButton->setEnabled(false); + submitButton->show(); + cancelButton->show(); } +//! [addContact] void AddressBook::submitContact() { From 76f57c8678823bd1a39871733ddfcb18c3d3a1fe Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 2 Jun 2009 15:08:23 +0200 Subject: [PATCH 06/25] fakevim: fix behaviour of 'r' at end of line --- src/plugins/fakevim/fakevimhandler.cpp | 13 +++++++------ tests/auto/fakevim/main.cpp | 20 ++++++++++++++++++-- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index fb3c3b15c49..ceda3253347 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -957,19 +957,20 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified, .arg(QChar(m_semicolonType)) .arg(QChar(m_semicolonKey))); } else if (m_submode == ReplaceSubMode) { - if (count() < rightDist() && text.size() == 1 + if (count() <= (rightDist() + atEndOfLine()) && text.size() == 1 && (text.at(0).isPrint() || text.at(0).isSpace())) { + if (atEndOfLine()) + moveLeft(); setAnchor(); moveRight(count()); - removeSelectedText(); + QString rem = removeSelectedText(); m_tc.insertText(QString(count(), text.at(0))); m_moveType = MoveExclusive; - m_submode = NoSubMode; setDotCommand("%1r" + text, count()); - finishMovement(); - } else { - m_submode = NoSubMode; } + setTargetColumn(); + m_submode = NoSubMode; + finishMovement(); } else if (m_subsubmode == MarkSubSubMode) { m_marks[key] = m_tc.position(); m_subsubmode = NoSubSubMode; diff --git a/tests/auto/fakevim/main.cpp b/tests/auto/fakevim/main.cpp index 9e931526f92..66002c9380c 100644 --- a/tests/auto/fakevim/main.cpp +++ b/tests/auto/fakevim/main.cpp @@ -63,6 +63,7 @@ private slots: void command_e(); void command_i(); void command_left(); + void command_r(); void command_right(); void command_up(); void command_w(); @@ -325,12 +326,12 @@ void tst_FakeVim::command_i() check("ixxx" + escape, "xx@x" + lines); check("u", "@" + lines); -return; // combine insertions check("ia" + escape, "@a" + lines); check("ibx" + escape, "b@xa" + lines); check("icyy" + escape, "bcy@yxa" + lines); +return; // FIXME check("u", "b@xa" + lines); check("u", "@a" + lines); // undo broken checkEx("redo", "b@xa" + lines); @@ -344,11 +345,26 @@ void tst_FakeVim::command_left() move("4j", "@int main"); move("h", "@int main"); // no move over left border move("$", "argv[])@"); - move("h", "argv[]@)"); + //move("h", "argv[]@)"); + check("h", lmid(0, 4) + "\nint main(int argc, char *argv[]@)\n" + lmid(5)); move("3h", "arg@v[])"); move("50h", "@int main"); } +void tst_FakeVim::command_r() +{ + setup(); + move("4j", "@int main"); + move("$", "int main(int argc, char *argv[])@"); + check("rx", lmid(0, 4) + "\nint main(int argc, char *argv[]x@\n" + lmid(5)); + check("2h", lmid(0, 4) + "\nint main(int argc, char *argv[@]x\n" + lmid(5)); + check("4ra", lmid(0, 4) + "\nint main(int argc, char *argv[@]x\n" + lmid(5)); +return; // FIXME + check("3rb", lmid(0, 4) + "\nint main(int argc, char *argv[bb@b\n" + lmid(5)); + check("2rc", lmid(0, 4) + "\nint main(int argc, char *argv[bb@b\n" + lmid(5)); + check("h2rc",lmid(0, 4) + "\nint main(int argc, char *argv[bc@c\n" + lmid(5)); +} + void tst_FakeVim::command_right() { setup(); From 4133107a0d4f42949f8f89a461d47581af62e8e4 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 2 Jun 2009 15:38:08 +0200 Subject: [PATCH 07/25] fakevim: remove old undo hack as QPlainTextEdit's own undo works well now. --- src/plugins/fakevim/fakevimhandler.cpp | 21 --------------------- tests/auto/fakevim/main.cpp | 8 +++++++- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index ceda3253347..c233a74ee23 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -212,8 +212,6 @@ enum EventResult EventPassedToCore }; -class UndoBreaker; - class FakeVimHandler::Private { public: @@ -229,7 +227,6 @@ public: void restoreWidget(); friend class FakeVimHandler; - friend class UndoBreaker; static int shift(int key) { return key + 32; } static int control(int key) { return key + 256; } @@ -354,7 +351,6 @@ public: void undo(); void redo(); QMap m_undoCursorPosition; // revision -> position - bool m_needMoreUndo; // extra data for '.' void replay(const QString &text, int count); @@ -2412,10 +2408,7 @@ void FakeVimHandler::Private::undo() { int current = m_tc.document()->revision(); m_tc.endEditBlock(); - m_needMoreUndo = false; EDITOR(undo()); - if (m_needMoreUndo) - EDITOR(undo()); m_tc.beginEditBlock(); int rev = m_tc.document()->revision(); if (current == rev) @@ -2430,10 +2423,7 @@ void FakeVimHandler::Private::redo() { int current = m_tc.document()->revision(); m_tc.endEditBlock(); - m_needMoreUndo = false; EDITOR(redo()); - if (m_needMoreUndo) - EDITOR(redo()); m_tc.beginEditBlock(); int rev = m_tc.document()->revision(); if (rev == current) @@ -2487,20 +2477,9 @@ void FakeVimHandler::Private::recordJump() UNDO_DEBUG("jumps: " << m_jumpListUndo); } -class UndoBreaker : public QAbstractUndoItem -{ -public: - UndoBreaker(FakeVimHandler::Private *doc) : m_doc(doc) {} - void undo() { m_doc->m_needMoreUndo = true; } - void redo() { m_doc->m_needMoreUndo = true; } -private: - FakeVimHandler::Private *m_doc; -}; - void FakeVimHandler::Private::recordNewUndo() { m_tc.endEditBlock(); - m_tc.document()->appendUndoItem(new UndoBreaker(this)); m_tc.beginEditBlock(); } diff --git a/tests/auto/fakevim/main.cpp b/tests/auto/fakevim/main.cpp index 66002c9380c..ad8c1f60381 100644 --- a/tests/auto/fakevim/main.cpp +++ b/tests/auto/fakevim/main.cpp @@ -328,12 +328,18 @@ void tst_FakeVim::command_i() // combine insertions + check("i1" + escape, "@1" + lines); + check("i2" + escape, "@21" + lines); + check("i3" + escape, "@321" + lines); + check("u", "@21" + lines); + check("u", "@1" + lines); + check("u", "@" + lines); check("ia" + escape, "@a" + lines); check("ibx" + escape, "b@xa" + lines); check("icyy" + escape, "bcy@yxa" + lines); -return; // FIXME check("u", "b@xa" + lines); check("u", "@a" + lines); // undo broken +return; // FIXME checkEx("redo", "b@xa" + lines); check("u", "@a" + lines); check("u", "@" + lines); From 27609c4f00f7a06ea49d2704a181e44d9dc78532 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 2 Jun 2009 15:44:03 +0200 Subject: [PATCH 08/25] debugger: remove some debug output, also make dumper input more readable in the log. --- src/plugins/debugger/gdb/gdbengine.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 5d587788485..b0a62981b5a 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -2779,7 +2779,6 @@ static void setWatchDataEditValue(WatchData &data, const GdbMi &mi) static void setWatchDataValueToolTip(WatchData &data, const GdbMi &mi, int encoding = 0) { - qDebug() << "TOOLTIP: " << mi.data().size() << "ENC:" << encoding; if (mi.isValid()) data.setValueToolTip(decodeData(mi.data(), encoding)); } @@ -3208,6 +3207,9 @@ void GdbEngine::sendWatchParameters(const QByteArray ¶ms0) } encoded[encoded.size() - 1] = '}'; + params.replace('\0','!'); + emit gdbInputAvailable(QString(), QString::fromUtf8(params)); + postCommand(_(encoded)); } From 311ca7a074733ad0f14c79bd903a79b3c81c161f Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 2 Jun 2009 16:43:09 +0200 Subject: [PATCH 09/25] fakevim: more undo work --- src/plugins/fakevim/fakevimhandler.cpp | 52 +++++++++----------------- tests/auto/fakevim/main.cpp | 9 ++--- 2 files changed, 22 insertions(+), 39 deletions(-) diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index c233a74ee23..7f28665f491 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -86,7 +86,7 @@ //#define DEBUG_UNDO 1 #if DEBUG_UNDO -# define UNDO_DEBUG(s) qDebug() << s +# define UNDO_DEBUG(s) qDebug() << << m_tc.document()->revision() << s #else # define UNDO_DEBUG(s) #endif @@ -172,26 +172,6 @@ enum MoveType MoveLineWise, }; -struct EditOperation -{ - EditOperation() : position(-1), itemCount(0) {} - int position; - int itemCount; // used to combine several operations - QString from; - QString to; -}; - -QDebug &operator<<(QDebug &ts, const EditOperation &op) -{ - if (op.itemCount > 0) { - ts << "\n EDIT BLOCK WITH " << op.itemCount << " ITEMS"; - } else { - ts << "\n EDIT AT " << op.position - << " FROM " << op.from << " TO " << op.to; - } - return ts; -} - QDebug &operator<<(QDebug &ts, const QList &sels) { foreach (QTextEdit::ExtraSelection sel, sels) @@ -307,6 +287,9 @@ public: QWidget *editor() const; QChar characterAtCursor() const { return m_tc.document()->characterAt(m_tc.position()); } + void beginEditBlock() { UNDO_DEBUG("BEGIN EDIT BLOCK"); m_tc.beginEditBlock(); } + void endEditBlock() { UNDO_DEBUG("END EDIT BLOCK"); m_tc.endEditBlock(); } + void joinPreviousEditBlock() { UNDO_DEBUG("JOIN EDIT BLOCK"); m_tc.joinPreviousEditBlock(); } public: QTextEdit *m_textedit; @@ -515,12 +498,12 @@ EventResult FakeVimHandler::Private::handleEvent(QKeyEvent *ev) } m_undoCursorPosition[m_tc.document()->revision()] = m_tc.position(); - if (m_mode == InsertMode) - m_tc.joinPreviousEditBlock(); - else - m_tc.beginEditBlock(); + //if (m_mode == InsertMode) + // joinPreviousEditBlock(); + //else + // beginEditBlock(); EventResult result = handleKey(key, um, ev->text()); - m_tc.endEditBlock(); + //endEditBlock(); // We fake vi-style end-of-line behaviour m_fakeEnd = (atEndOfLine() && m_mode == CommandMode); @@ -1908,7 +1891,7 @@ void FakeVimHandler::Private::handleExCommand(const QString &cmd0) if (flags.contains('i')) pattern.setCaseSensitivity(Qt::CaseInsensitive); const bool global = flags.contains('g'); - m_tc.beginEditBlock(); + beginEditBlock(); for (int line = beginLine; line <= endLine; ++line) { const int start = firstPositionInLine(line); const int end = lastPositionInLine(line); @@ -1934,7 +1917,7 @@ void FakeVimHandler::Private::handleExCommand(const QString &cmd0) break; } } - m_tc.endEditBlock(); + endEditBlock(); enterCommandMode(); } else if (reSet.indexIn(cmd) != -1) { // :set showBlackMessage(QString()); @@ -2407,9 +2390,9 @@ QWidget *FakeVimHandler::Private::editor() const void FakeVimHandler::Private::undo() { int current = m_tc.document()->revision(); - m_tc.endEditBlock(); + //endEditBlock(); EDITOR(undo()); - m_tc.beginEditBlock(); + //beginEditBlock(); int rev = m_tc.document()->revision(); if (current == rev) showBlackMessage(tr("Already at oldest change")); @@ -2422,9 +2405,9 @@ void FakeVimHandler::Private::undo() void FakeVimHandler::Private::redo() { int current = m_tc.document()->revision(); - m_tc.endEditBlock(); + //endEditBlock(); EDITOR(redo()); - m_tc.beginEditBlock(); + //beginEditBlock(); int rev = m_tc.document()->revision(); if (rev == current) showBlackMessage(tr("Already at newest change")); @@ -2479,8 +2462,9 @@ void FakeVimHandler::Private::recordJump() void FakeVimHandler::Private::recordNewUndo() { - m_tc.endEditBlock(); - m_tc.beginEditBlock(); + //endEditBlock(); + UNDO_DEBUG("---- BREAK ----"); + //beginEditBlock(); } void FakeVimHandler::Private::insertAutomaticIndentation(bool goingDown) diff --git a/tests/auto/fakevim/main.cpp b/tests/auto/fakevim/main.cpp index ad8c1f60381..ddc91e3a6a0 100644 --- a/tests/auto/fakevim/main.cpp +++ b/tests/auto/fakevim/main.cpp @@ -326,7 +326,6 @@ void tst_FakeVim::command_i() check("ixxx" + escape, "xx@x" + lines); check("u", "@" + lines); - // combine insertions check("i1" + escape, "@1" + lines); check("i2" + escape, "@21" + lines); @@ -338,10 +337,10 @@ void tst_FakeVim::command_i() check("ibx" + escape, "b@xa" + lines); check("icyy" + escape, "bcy@yxa" + lines); check("u", "b@xa" + lines); - check("u", "@a" + lines); // undo broken -return; // FIXME - checkEx("redo", "b@xa" + lines); - check("u", "@a" + lines); + check("u", "@a" + lines); +// FIXME undo broken +// checkEx("redo", "b@xa" + lines); +// check("u", "@a" + lines); check("u", "@" + lines); } From d7af85a09755a2a6852052b8621448ab6114ea0a Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 3 Jun 2009 12:46:55 +0200 Subject: [PATCH 10/25] debugger: implement a dumper for QAbstractItemModel This also squashes a namespace related bug introduced by the watchutils refactoring. --- share/qtcreator/gdbmacros/gdbmacros.cpp | 110 +++++++++++++++++- src/plugins/debugger/debuggeroutputwindow.cpp | 4 +- src/plugins/debugger/gdb/gdbengine.cpp | 5 +- src/plugins/debugger/watchutils.cpp | 18 ++- src/plugins/debugger/watchutils.h | 1 + tests/manual/gdbdebugger/simple/app.cpp | 17 +++ 6 files changed, 143 insertions(+), 12 deletions(-) diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp index 5f75cc8997e..1bf767002b0 100644 --- a/share/qtcreator/gdbmacros/gdbmacros.cpp +++ b/share/qtcreator/gdbmacros/gdbmacros.cpp @@ -851,6 +851,102 @@ static void qDumpInnerValueOrPointer(QDumper &d, ////////////////////////////////////////////////////////////////////////////// +struct ModelIndex { int r; int c; void *p; void *m; }; + +static void qDumpQAbstractItem(QDumper &d) +{ + ModelIndex mm; + mm.r = mm.c = 0; + mm.p = mm.m = 0; + sscanf(d.templateParameters[0], "%d,%d,%p,%p", &mm.r, &mm.c, &mm.p, &mm.m); + const QModelIndex &mi(*reinterpret_cast(&mm)); + const QAbstractItemModel *m = mi.model(); + const int rowCount = m->rowCount(mi); + if (rowCount < 0) + return; + const int columnCount = m->columnCount(mi); + if (columnCount < 0) + return; + P(d, "type", NS"QAbstractItem"); + P(d, "addr", "$" << mm.r << "," << mm.c << "," << mm.p << "," << mm.m); + //P(d, "value", "(" << rowCount << "," << columnCount << ")"); + P(d, "value", m->data(mi, Qt::DisplayRole).toString()); + P(d, "valueencoded", "2"); + P(d, "numchild", "1"); + if (d.dumpChildren) { + d << ",children=["; + for (int row = 0; row < rowCount; ++row) { + for (int column = 0; column < columnCount; ++column) { + QModelIndex child = m->index(row, column, mi); + d.beginHash(); + P(d, "name", "[" << row << "," << column << "]"); + //P(d, "numchild", (m->hasChildren(child) ? "1" : "0")); + P(d, "numchild", "1"); + P(d, "addr", "$" << child.row() << "," << child.column() << "," + << child.internalPointer() << "," << child.model()); + P(d, "type", NS"QAbstractItem"); + P(d, "value", m->data(mi, Qt::DisplayRole).toString()); + P(d, "valueencoded", "2"); + d.endHash(); + } + } + d.beginHash(); + P(d, "name", "DisplayRole"); + P(d, "numchild", 0); + P(d, "value", m->data(mi, Qt::DisplayRole).toString()); + P(d, "valueencoded", 2); + P(d, "type", NS"QString"); + d.endHash(); + d << "]"; + } + d.disarm(); +} + +static void qDumpQAbstractItemModel(QDumper &d) +{ + const QAbstractItemModel &m = *reinterpret_cast(d.data); + + const int rowCount = m.rowCount(); + if (rowCount < 0) + return; + const int columnCount = m.columnCount(); + if (columnCount < 0) + return; + + P(d, "type", NS"QAbstractItemModel"); + P(d, "value", "(" << rowCount << "," << columnCount << ")"); + P(d, "numchild", "1"); + if (d.dumpChildren) { + d << ",children=["; + d.beginHash(); + P(d, "numchild", "1"); + P(d, "name", NS"QObject"); + P(d, "addr", d.data); + P(d, "value", m.objectName()); + P(d, "valueencoded", "2"); + P(d, "type", NS"QObject"); + P(d, "displayedtype", m.metaObject()->className()); + d.endHash(); + for (int row = 0; row < rowCount; ++row) { + for (int column = 0; column < columnCount; ++column) { + QModelIndex mi = m.index(row, column); + d.beginHash(); + P(d, "name", "[" << row << "," << column << "]"); + P(d, "value", m.data(mi, Qt::DisplayRole).toString()); + P(d, "valueencoded", "2"); + //P(d, "numchild", (m.hasChildren(mi) ? "1" : "0")); + P(d, "numchild", "1"); + P(d, "addr", "$" << mi.row() << "," << mi.column() << "," + << mi.internalPointer() << "," << mi.model()); + P(d, "type", NS"QAbstractItem"); + d.endHash(); + } + } + d << "]"; + } + d.disarm(); +} + static void qDumpQByteArray(QDumper &d) { const QByteArray &ba = *reinterpret_cast(d.data); @@ -1210,7 +1306,7 @@ static void qDumpQImage(QDumper &d) if (d.dumpChildren) { d << ",children=["; d.beginHash(); - P(d, "name", "key"); + P(d, "name", "data"); P(d, "type", NS "QImageData"); P(d, "addr", d.data); d.endHash(); @@ -2533,7 +2629,8 @@ static void handleProtocolVersion2and3(QDumper & d) d.setupTemplateParameters(); P(d, "iname", d.iname); - P(d, "addr", d.data); + if (d.data) + P(d, "addr", d.data); #ifdef QT_NO_QDATASTREAM if (d.protocolVersion == 3) { @@ -2555,6 +2652,12 @@ static void handleProtocolVersion2and3(QDumper & d) if (isEqual(type, "map")) qDumpStdMap(d); break; + case 'A': + if (isEqual(type, "QAbstractItemModel")) + qDumpQAbstractItemModel(d); + else if (isEqual(type, "QAbstractItem")) + qDumpQAbstractItem(d); + break; case 'B': if (isEqual(type, "QByteArray")) qDumpQByteArray(d); @@ -2715,6 +2818,8 @@ void *qDumpObjectData440( // They are mentioned here nevertheless. For types that are not listed // here, dumpers won't be used. d << "dumpers=[" + "\""NS"QAbstractItem\"," + "\""NS"QAbstractItemModel\"," "\""NS"QByteArray\"," "\""NS"QDateTime\"," "\""NS"QDir\"," @@ -2810,7 +2915,6 @@ void *qDumpObjectData440( d.iname = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer; d.exp = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer; d.innertype = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer; - d.iname = inbuffer; while (*inbuffer) ++inbuffer; ++inbuffer; handleProtocolVersion2and3(d); } diff --git a/src/plugins/debugger/debuggeroutputwindow.cpp b/src/plugins/debugger/debuggeroutputwindow.cpp index d50536e7ca5..9c51a5300c7 100644 --- a/src/plugins/debugger/debuggeroutputwindow.cpp +++ b/src/plugins/debugger/debuggeroutputwindow.cpp @@ -252,8 +252,8 @@ void DebuggerOutputWindow::showOutput(const QString &prefix, const QString &outp foreach (QString line, output.split("\n")) { // FIXME: QTextEdit asserts on really long lines... const int n = 3000; - //if (line.size() > n) - // line = line.left(n) + " [...] "; + if (line.size() > n) + line = line.left(n) + " [...] "; m_combinedText->appendPlainText(prefix + line); } QTextCursor cursor = m_combinedText->textCursor(); diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index b0a62981b5a..770586af681 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -2813,7 +2813,7 @@ static void setWatchDataAddress(WatchData &data, const GdbMi &mi) { if (mi.isValid()) { data.addr = _(mi.data()); - if (data.exp.isEmpty()) + if (data.exp.isEmpty() && !data.addr.startsWith(_("$"))) data.exp = _("(*(") + gdbQuoteTypes(data.type) + _("*)") + data.addr + _c(')'); } } @@ -2885,7 +2885,6 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren) return; } WatchData data = data0; - QTC_ASSERT(!data.exp.isEmpty(), return); QByteArray params; QStringList extraArgs; @@ -2900,6 +2899,8 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren) QString addr; if (data.addr.startsWith(__("0x"))) addr = _("(void*)") + data.addr; + else if (data.exp.isEmpty()) // happens e.g. for QAbstractItem + addr = _("0"); else addr = _("&(") + data.exp + _c(')'); diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp index f074ee2ddc1..887d0c7fa89 100644 --- a/src/plugins/debugger/watchutils.cpp +++ b/src/plugins/debugger/watchutils.cpp @@ -658,6 +658,7 @@ QtDumperHelper::Type QtDumperHelper::specialType(QString s) if (s.startsWith(QLatin1String("std::"))) return stdType(s.mid(5)); // Strip namespace + // FIXME: that's not a good idea as it makes all namespaces equal. const int namespaceIndex = s.lastIndexOf(QLatin1String("::")); if (namespaceIndex == -1) { // None ... check for std.. @@ -665,7 +666,7 @@ QtDumperHelper::Type QtDumperHelper::specialType(QString s) if (sType != UnknownType) return sType; } else { - s.remove(namespaceIndex + 2); + s = s.mid(namespaceIndex + 2); } if (s == QLatin1String("QObject")) return QObjectType; @@ -677,6 +678,8 @@ QtDumperHelper::Type QtDumperHelper::specialType(QString s) return QObjectSignalType; if (s == QLatin1String("QVector")) return QVectorType; + if (s == QLatin1String("QAbstractItem")) + return QAbstractItemType; if (s == QLatin1String("QMap")) return QMapType; if (s == QLatin1String("QMultiMap")) @@ -689,6 +692,7 @@ QtDumperHelper::Type QtDumperHelper::specialType(QString s) bool QtDumperHelper::needsExpressionSyntax(Type t) { switch (t) { + case QAbstractItemType: case QObjectSlotType: case QObjectSignalType: case QMapType: @@ -1058,6 +1062,7 @@ void QtDumperHelper::addSize(const QString &name, int size) break; } if (name == QLatin1String("std::wstring")) { + // FIXME: check space between > > below? m_sizeCache.insert(QLatin1String("std::basic_string,std::allocator >"), size); break; } @@ -1078,7 +1083,7 @@ QtDumperHelper::TypeData QtDumperHelper::typeData(const QString &typeName) const const Type st = simpleType(typeName); if (st != UnknownType) { td.isTemplate = false; - td.type =st; + td.type = st; return td; } // Try template @@ -1129,6 +1134,8 @@ void QtDumperHelper::evaluationParameters(const WatchData &data, if (outertype == m_qtNamespace + QLatin1String("QWidget")) outertype = m_qtNamespace + QLatin1String("QObject"); + QString inner = td.inner; + extraArgs.clear(); if (!inners.empty()) { @@ -1147,6 +1154,9 @@ void QtDumperHelper::evaluationParameters(const WatchData &data, // in rare cases we need more or less: switch (td.type) { + case QAbstractItemType: + inner = data.addr.mid(1); + break; case QObjectType: case QWidgetType: if (debugger == GdbDebugger) { @@ -1258,9 +1268,7 @@ void QtDumperHelper::evaluationParameters(const WatchData &data, inBuffer->append('\0'); inBuffer->append(data.exp.toUtf8()); inBuffer->append('\0'); - inBuffer->append(td.inner.toUtf8()); - inBuffer->append('\0'); - inBuffer->append(data.iname.toUtf8()); + inBuffer->append(inner.toUtf8()); inBuffer->append('\0'); if (debug) diff --git a/src/plugins/debugger/watchutils.h b/src/plugins/debugger/watchutils.h index e87b3cd8221..2b8ef865baf 100644 --- a/src/plugins/debugger/watchutils.h +++ b/src/plugins/debugger/watchutils.h @@ -145,6 +145,7 @@ public: UnknownType, SupportedType, // A type that requires no special handling by the dumper // Below types require special handling + QAbstractItemType, QObjectType, QWidgetType, QObjectSlotType, QObjectSignalType, QVectorType, QMapType, QMultiMapType, QMapNodeType, StdVectorType, StdDequeType, StdSetType, StdMapType, StdStackType, diff --git a/tests/manual/gdbdebugger/simple/app.cpp b/tests/manual/gdbdebugger/simple/app.cpp index de12a5474c7..349055c3b2a 100644 --- a/tests/manual/gdbdebugger/simple/app.cpp +++ b/tests/manual/gdbdebugger/simple/app.cpp @@ -48,6 +48,7 @@ #include #include #include +#include #include @@ -787,6 +788,21 @@ void testStdVector() vec.push_back(false); } +void testQStandardItemModel() +{ + QStandardItemModel m; + QStandardItem *i1, *i2, *i11; + m.appendRow(QList() + << (i1 = new QStandardItem("1")) << (new QStandardItem("a"))); + m.appendRow(QList() + << (i2 = new QStandardItem("2")) << (new QStandardItem("b"))); + i1->appendRow(QList() + << (i11 = new QStandardItem("11")) << (new QStandardItem("aa"))); + int i = 1; + ++i; + ++i; +} + void testQString() { QString str = "Hello "; @@ -1090,6 +1106,7 @@ int main(int argc, char *argv[]) QStringList list; list << "aaa" << "bbb" << "cc"; + testQStandardItemModel(); testQImage(); testNoArgumentName(1, 2, 3); testIO(); From 63a0225ea989fb607821a1747eba0f9f526703b9 Mon Sep 17 00:00:00 2001 From: dt Date: Wed, 3 Jun 2009 13:53:45 +0200 Subject: [PATCH 11/25] Fix some insignificant memory leaks. Reviewed-By: hjk --- src/plugins/coreplugin/welcomemode.cpp | 1 + src/plugins/debugger/debuggeractions.h | 3 +-- src/plugins/debugger/debuggerplugin.cpp | 1 + src/plugins/fakevim/fakevimactions.h | 3 +-- src/plugins/fakevim/fakevimplugin.cpp | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp index 4234b600d38..e39d64d3616 100644 --- a/src/plugins/coreplugin/welcomemode.cpp +++ b/src/plugins/coreplugin/welcomemode.cpp @@ -206,6 +206,7 @@ WelcomeMode::~WelcomeMode() { QSettings *settings = ICore::instance()->settings(); settings->setValue("General/WelcomeTab", m_d->btnGrp->checkedId()); + delete m_d->m_widget; delete m_d; } diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h index b65981957bf..c6a11a26d62 100644 --- a/src/plugins/debugger/debuggeractions.h +++ b/src/plugins/debugger/debuggeractions.h @@ -43,11 +43,10 @@ namespace Internal { class DebuggerSettings : public QObject { Q_OBJECT - public: DebuggerSettings(QObject *parent = 0); ~DebuggerSettings(); - + void insertItem(int code, Core::Utils::SavedAction *item); Core::Utils::SavedAction *item(int code) const; diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 4c09fe9d1d0..d252b2482da 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -418,6 +418,7 @@ void DebuggerPlugin::shutdown() m_manager->shutdown(); writeSettings(); + delete DebuggerSettings::instance(); //qDebug() << "DebuggerPlugin::~DebuggerPlugin"; removeObject(m_debugMode); diff --git a/src/plugins/fakevim/fakevimactions.h b/src/plugins/fakevim/fakevimactions.h index 45b3f9fb059..43ec20ed7a0 100644 --- a/src/plugins/fakevim/fakevimactions.h +++ b/src/plugins/fakevim/fakevimactions.h @@ -66,7 +66,6 @@ class FakeVimSettings : public QObject public: FakeVimSettings(); ~FakeVimSettings(); - void insertItem(int code, Core::Utils::SavedAction *item, const QString &longname = QString(), const QString &shortname = QString()); @@ -77,7 +76,7 @@ public: void readSettings(QSettings *settings); void writeSettings(QSettings *settings); -public: +private: QHash m_items; QHash m_nameToCode; QHash m_codeToName; diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 50bdb9dd9d8..1910b4905b9 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -280,6 +280,7 @@ void FakeVimPluginPrivate::shutdown() delete m_fakeVimOptionsPage; m_fakeVimOptionsPage = 0; theFakeVimSettings()->writeSettings(Core::ICore::instance()->settings()); + delete theFakeVimSettings(); } bool FakeVimPluginPrivate::initialize() From 2d84ccf5288f600d12b8f50e53108f40f37d056e Mon Sep 17 00:00:00 2001 From: Trenton Schulz Date: Wed, 3 Jun 2009 16:24:40 +0200 Subject: [PATCH 12/25] Use Qt::WA_LayoutUsesWidgetRect here for proper spacing. It's not the Mac's fault! --- src/plugins/coreplugin/welcomemode.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp index e39d64d3616..74a8def7b07 100644 --- a/src/plugins/coreplugin/welcomemode.cpp +++ b/src/plugins/coreplugin/welcomemode.cpp @@ -136,6 +136,8 @@ WelcomeMode::WelcomeMode() : m_d->ui.sitesTreeWidget->viewport()->setAutoFillBackground(false); m_d->ui.tutorialTreeWidget->viewport()->setAutoFillBackground(false); m_d->ui.didYouKnowTextBrowser->viewport()->setAutoFillBackground(false); + m_d->ui.helpUsLabel->setAttribute(Qt::WA_LayoutUsesWidgetRect); + m_d->ui.feedbackButton->setAttribute(Qt::WA_LayoutUsesWidgetRect); l->addWidget(m_d->m_welcomePage); updateWelcomePage(WelcomePageData()); From dddb965f83d4a2f69920618e79596a0d14e7df8c Mon Sep 17 00:00:00 2001 From: con Date: Wed, 3 Jun 2009 15:31:30 +0200 Subject: [PATCH 13/25] Locator text was no longer selected when using shortcut. Reviewed-by: dt --- src/plugins/quickopen/quickopentoolwindow.cpp | 11 ++--------- src/plugins/quickopen/quickopentoolwindow.h | 1 - 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/plugins/quickopen/quickopentoolwindow.cpp b/src/plugins/quickopen/quickopentoolwindow.cpp index 139559bee34..f6d9ae1a903 100644 --- a/src/plugins/quickopen/quickopentoolwindow.cpp +++ b/src/plugins/quickopen/quickopentoolwindow.cpp @@ -345,6 +345,8 @@ bool QuickOpenToolWindow::eventFilter(QObject *obj, QEvent *event) } else if (obj == m_fileLineEdit && event->type() == QEvent::FocusOut) { m_completionList->hide(); } else if (obj == m_fileLineEdit && event->type() == QEvent::FocusIn) { + if (static_cast(event)->reason() != Qt::MouseFocusReason) + m_fileLineEdit->selectAll(); updateCompletionList(m_fileLineEdit->typedText()); showCompletionList(); } else if (obj == this && event->type() == QEvent::ShortcutOverride) { @@ -470,15 +472,6 @@ void QuickOpenToolWindow::filterSelected() m_fileLineEdit->setFocus(); } -void QuickOpenToolWindow::focusInEvent(QFocusEvent *e) -{ - m_fileLineEdit->setFocus(e->reason()); - if (e->reason() != Qt::MouseFocusReason) { - m_fileLineEdit->selectAll(); - } - QWidget::focusInEvent(e); -} - void QuickOpenToolWindow::showEvent(QShowEvent *event) { QWidget::showEvent(event); diff --git a/src/plugins/quickopen/quickopentoolwindow.h b/src/plugins/quickopen/quickopentoolwindow.h index aa898fd5eea..50b5b920f06 100644 --- a/src/plugins/quickopen/quickopentoolwindow.h +++ b/src/plugins/quickopen/quickopentoolwindow.h @@ -76,7 +76,6 @@ private: bool eventFilter(QObject *obj, QEvent *event); void showEvent(QShowEvent *e); - void focusInEvent(QFocusEvent *e); bool isShowingTypeHereMessage() const; void showCompletionList(); From eca3b98c56afc1e86f3ffc4e378e3cb16cdb6405 Mon Sep 17 00:00:00 2001 From: mae Date: Wed, 3 Jun 2009 17:19:26 +0200 Subject: [PATCH 14/25] Use editor manager standard closing facilities for session switching --- src/plugins/projectexplorer/session.cpp | 43 +++---------------------- src/plugins/projectexplorer/session.h | 2 -- 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index 79ba761d1cb..c4a11d07e75 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -112,7 +112,7 @@ private: } // namespace ProjectExplorer using namespace ProjectExplorer; -using Internal::SessionFile; +using namespace ProjectExplorer::Internal; void SessionFile::sessionLoadingProgress() @@ -215,7 +215,6 @@ bool SessionFile::load(const QString &fileName) qWarning() << "Could not find startup project" << startupProjectPath; } - const QVariant &editorsettings = reader.restoreValue(QLatin1String("EditorSettings")); if (editorsettings.isValid()) { connect(m_core->editorManager(), SIGNAL(editorOpened(Core::IEditor *)), @@ -272,6 +271,7 @@ bool SessionFile::save(const QString &fileName) } writer.saveValue(QLatin1String("ProjectDependencies"), QVariant(depMap)); + writer.saveValue(QLatin1String("OpenEditors"), m_core->editorManager()->openedEditors().count()); writer.saveValue(QLatin1String("EditorSettings"), @@ -694,28 +694,16 @@ bool SessionManager::clear() if (debug) qDebug() << "SessionManager - clearing session ..."; - bool cancelled; - QList notClosed = requestCloseOfAllFiles(&cancelled); - - bool success = !cancelled; + bool success = m_core->editorManager()->closeAllEditors(); if (success) { if (debug) qDebug() << "SessionManager - Removing projects ..."; - QList toClose; - foreach (Project *pro, projects()) { - if (!notClosed.contains(pro)) - toClose << pro; - } - setStartupProject(0); - removeProjects(toClose); + removeProjects(projects()); } - if (!notClosed.isEmpty()) - success = false; - if (debug) qDebug() << "SessionManager - clearing session result is " << success; @@ -883,29 +871,6 @@ void SessionManager::setEditorCodec(Core::IEditor *editor, const QString &fileNa textEditor->setTextCodec(project->editorConfiguration()->defaultTextCodec()); } -QList SessionManager::requestCloseOfAllFiles(bool *cancelled) -{ - *cancelled = false; - QList filesToClose; - foreach (Project *pro, projects()) - filesToClose << pro->file(); - foreach (Core::IEditor *editor, m_core->editorManager()->openedEditors()) - filesToClose << editor->file(); - QList notClosed; - if (!filesToClose.isEmpty()) - notClosed = m_core->fileManager()->saveModifiedFiles(filesToClose, cancelled); - // close editors here by hand - if (!*cancelled) { - QList editorsToClose; - foreach (Core::IEditor *editor, m_core->editorManager()->openedEditors()) - if (!notClosed.contains(editor->file())) - editorsToClose << editor; - m_core->editorManager()->closeEditors(editorsToClose, false); - // project files are closed/removed later (in this::clear) - } - return Core::Utils::qwConvertList(notClosed); -} - Core::IFile *SessionManager::file() const { return m_file; diff --git a/src/plugins/projectexplorer/session.h b/src/plugins/projectexplorer/session.h index b2131595219..c0099b591f9 100644 --- a/src/plugins/projectexplorer/session.h +++ b/src/plugins/projectexplorer/session.h @@ -180,8 +180,6 @@ private: QStringList dependenciesOrder() const; Project *defaultStartupProject() const; - QList requestCloseOfAllFiles(bool *cancelled); - void updateName(const QString &session); Core::ICore *m_core; From 0656abe04839aa898902e8054f4e64807af1068b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Wed, 3 Jun 2009 13:11:48 +0200 Subject: [PATCH 15/25] Updated version of Qt libs to patch on Linux --- src/tools/qpatch/files-to-patch-linux | 38 +++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/tools/qpatch/files-to-patch-linux b/src/tools/qpatch/files-to-patch-linux index da166075843..4c7b5fd6349 100644 --- a/src/tools/qpatch/files-to-patch-linux +++ b/src/tools/qpatch/files-to-patch-linux @@ -235,26 +235,26 @@ examples/xml/xmlstreamlint/xmlstreamlint examples/xmlpatterns/filetree/filetree examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel examples/xmlpatterns/recipes/recipes -lib/libQt3Support.so.4.5.1 -lib/libQtAssistantClient.so.4.5.1 -lib/libQtCLucene.so.4.5.1 -lib/libQtCore.so.4.5.1 -lib/libQtDBus.so.4.5.1 -lib/libQtDesigner.so.4.5.1 -lib/libQtDesignerComponents.so.4.5.1 -lib/libQtGui.so.4.5.1 -lib/libQtHelp.so.4.5.1 -lib/libQtNetwork.so.4.5.1 -lib/libQtOpenGL.so.4.5.1 -lib/libQtScript.so.4.5.1 -lib/libQtScriptTools.so.4.5.1 -lib/libQtSql.so.4.5.1 -lib/libQtSvg.so.4.5.1 -lib/libQtTest.so.4.5.1 +lib/libQt3Support.so.4.5.2 +lib/libQtAssistantClient.so.4.5.2 +lib/libQtCLucene.so.4.5.2 +lib/libQtCore.so.4.5.2 +lib/libQtDBus.so.4.5.2 +lib/libQtDesigner.so.4.5.2 +lib/libQtDesignerComponents.so.4.5.2 +lib/libQtGui.so.4.5.2 +lib/libQtHelp.so.4.5.2 +lib/libQtNetwork.so.4.5.2 +lib/libQtOpenGL.so.4.5.2 +lib/libQtScript.so.4.5.2 +lib/libQtScriptTools.so.4.5.2 +lib/libQtSql.so.4.5.2 +lib/libQtSvg.so.4.5.2 +lib/libQtTest.so.4.5.2 lib/libQtUiTools.a -lib/libQtWebKit.so.4.5.1 -lib/libQtXml.so.4.5.1 -lib/libQtXmlPatterns.so.4.5.1 +lib/libQtWebKit.so.4.5.2 +lib/libQtXml.so.4.5.2 +lib/libQtXmlPatterns.so.4.5.2 plugins/accessible/libqtaccessiblecompatwidgets.so plugins/accessible/libqtaccessiblewidgets.so plugins/codecs/libqcncodecs.so From 4505d92be54a78dc2ca349e47ebee5b0199a65d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Wed, 3 Jun 2009 17:29:50 +0200 Subject: [PATCH 16/25] Fixed compile error with gcc 3.3 sorry, unimplemented: `method_call_expr' not supported by dump_expr --- src/plugins/quickopen/quickopenplugin.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/quickopen/quickopenplugin.cpp b/src/plugins/quickopen/quickopenplugin.cpp index ae64e8dfe51..9402d6ad127 100644 --- a/src/plugins/quickopen/quickopenplugin.cpp +++ b/src/plugins/quickopen/quickopenplugin.cpp @@ -162,7 +162,8 @@ static void loadSettingsHelper(QuickOpenPlugin *p, S *settings) } settings->beginGroup("CustomFilters"); QList customFilters; - foreach (const QString &key, settings->childKeys()) { + const QStringList keys = settings->childKeys(); + foreach (const QString &key, keys) { IQuickOpenFilter *filter = new DirectoryFilter; filter->restoreState(settings->value(key).toByteArray()); p->m_filters.append(filter); From 240a6ec55cb7467af712bdade804a79d7a21ba48 Mon Sep 17 00:00:00 2001 From: con Date: Wed, 3 Jun 2009 17:39:08 +0200 Subject: [PATCH 17/25] Fixes locator's show method in case the filter already has focus. Was making the "f" filter unusable, because the popup was hidden when selecting a directory. Reviewed-by: dt --- src/plugins/quickopen/quickopentoolwindow.cpp | 15 +++++++++------ src/plugins/quickopen/quickopentoolwindow.h | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/plugins/quickopen/quickopentoolwindow.cpp b/src/plugins/quickopen/quickopentoolwindow.cpp index f6d9ae1a903..9d7ada56be4 100644 --- a/src/plugins/quickopen/quickopentoolwindow.cpp +++ b/src/plugins/quickopen/quickopentoolwindow.cpp @@ -296,7 +296,7 @@ QuickOpenToolWindow::QuickOpenToolWindow(QuickOpenPlugin *qop) : connect(m_refreshAction, SIGNAL(triggered()), m_quickOpenPlugin, SLOT(refresh())); connect(m_configureAction, SIGNAL(triggered()), this, SLOT(showConfigureDialog())); connect(m_fileLineEdit, SIGNAL(textEdited(const QString&)), - this, SLOT(textEdited(const QString&))); + this, SLOT(showPopup())); connect(m_completionList, SIGNAL(activated(QModelIndex)), this, SLOT(acceptCurrentEntry())); } @@ -347,8 +347,7 @@ bool QuickOpenToolWindow::eventFilter(QObject *obj, QEvent *event) } else if (obj == m_fileLineEdit && event->type() == QEvent::FocusIn) { if (static_cast(event)->reason() != Qt::MouseFocusReason) m_fileLineEdit->selectAll(); - updateCompletionList(m_fileLineEdit->typedText()); - showCompletionList(); + showPopup(); } else if (obj == this && event->type() == QEvent::ShortcutOverride) { QKeyEvent *ke = static_cast(event); if (ke->key() == Qt::Key_Escape && !ke->modifiers()) { @@ -369,9 +368,9 @@ void QuickOpenToolWindow::showCompletionList() m_completionList->show(); } -void QuickOpenToolWindow::textEdited(const QString &text) +void QuickOpenToolWindow::showPopup() { - updateCompletionList(text); + updateCompletionList(m_fileLineEdit->typedText()); showCompletionList(); } @@ -440,7 +439,11 @@ void QuickOpenToolWindow::show(const QString &text, int selectionStart, int sele { m_fileLineEdit->hideHintText(); m_fileLineEdit->setText(text); - setFocus(); + if (!m_fileLineEdit->hasFocus()) + m_fileLineEdit->setFocus(); + else + showPopup(); + if (selectionStart >= 0) m_fileLineEdit->setSelection(selectionStart, selectionLength); else diff --git a/src/plugins/quickopen/quickopentoolwindow.h b/src/plugins/quickopen/quickopentoolwindow.h index 50b5b920f06..2a8dc03a9ed 100644 --- a/src/plugins/quickopen/quickopentoolwindow.h +++ b/src/plugins/quickopen/quickopentoolwindow.h @@ -67,7 +67,7 @@ public: void show(const QString &text, int selectionStart = -1, int selectionLength = 0); private slots: - void textEdited(const QString &text); + void showPopup(); void acceptCurrentEntry(); void filterSelected(); void showConfigureDialog(); From 93571f7d42a81a8236ceac1f745ef277f194f1ca Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 3 Jun 2009 19:04:10 +0200 Subject: [PATCH 18/25] assign right variable --- src/shared/proparser/profileevaluator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index d756b6430bd..2c40fc9e866 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -1306,7 +1306,7 @@ QStringList ProFileEvaluator::Private::evaluateFunction( if (m_valuemapStack.count() >= 100) { q->errorMessage(format("ran into infinite recursion (depth > 100).")); - ok = false; + oki = false; } else { State sts = m_sts; m_valuemapStack.push(m_valuemap); From e083ad2920d6e5695f309fe5b4b7c7d1b3060d61 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 3 Jun 2009 19:04:43 +0200 Subject: [PATCH 19/25] expand arguments to s// operator --- src/shared/proparser/profileevaluator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index 2c40fc9e866..0a352e2b0b2 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -893,7 +893,7 @@ void ProFileEvaluator::Private::visitProValue(ProValue *value) { // DEFINES ~= s/a/b/?[gqi] - // FIXME: qmake variable-expands val first. + doVariableReplace(&val); if (val.length() < 4 || val[0] != QLatin1Char('s')) { q->logMessage(format("the ~= operator can handle only the s/// function.")); break; From 3df7a2c301379e98b0e96664a9180a8f8d666f0b Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Wed, 3 Jun 2009 20:19:47 +0200 Subject: [PATCH 20/25] Fixes: Fix overlapping alpha values in expander area Details: There are platform differences when drawing overlapping alpha rects here. The workaround was to simply avoid using alpha values for now. --- src/plugins/texteditor/basetexteditor.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index b6b7408f16c..44ab1dab1fe 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -2257,13 +2257,17 @@ static void drawRectBox(QPainter *painter, const QRect &rect, bool start, bool e { painter->save(); painter->setRenderHint(QPainter::Antialiasing, false); - QColor c = pal.highlight().color(); - c.setAlpha(40); + + QRgb b = pal.base().color().rgb(); + QRgb h = pal.highlight().color().rgb(); + QColor c = QColor((qRed(b)*2+qRed(h))/3, + (qGreen(b)*2+qGreen(h))/3, + (qBlue(b)*2+qBlue(h))/3); + QLinearGradient grad(rect.topLeft(), rect.topRight()); - grad.setColorAt(0, c.darker(130)); + grad.setColorAt(0, c.lighter(110)); grad.setColorAt(1, c.lighter(160)); - QColor outline = c.darker(110); - outline.setAlpha(100); + QColor outline = c; QRect r = rect; painter->fillRect(rect, grad); From d2a8449bea58275723e769cd41c085468cb56295 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 3 Jun 2009 20:45:49 +0200 Subject: [PATCH 21/25] ifdef Q_?S_* cleanup - clear up some Q_OS_LINUX vs. Q_OS_UNIX - clear up Q_WS_* vs. Q_OS_* (relatively theoretical exercise) - use proper #if-#else cascades instead of free-standing #ifs --- src/app/main.cpp | 6 +- src/libs/utils/abstractprocess.h | 2 +- src/libs/utils/pathchooser.cpp | 5 +- src/plugins/bookmarks/bookmarksplugin.cpp | 6 +- .../actionmanager/actionmanager.cpp | 2 +- .../editormanager/editormanager.cpp | 10 +-- src/plugins/coreplugin/fancyactionbar.cpp | 2 +- src/plugins/coreplugin/fileiconprovider.cpp | 4 +- src/plugins/coreplugin/mainwindow.cpp | 22 +++---- src/plugins/coreplugin/mainwindow.h | 2 +- src/plugins/coreplugin/modemanager.cpp | 2 +- src/plugins/coreplugin/navigationwidget.cpp | 2 +- src/plugins/coreplugin/outputpane.cpp | 6 +- src/plugins/coreplugin/stylehelper.cpp | 2 +- src/plugins/cpaster/cpasterplugin.cpp | 4 +- src/plugins/cpptools/cppcodecompletion.cpp | 2 +- src/plugins/debugger/debuggerplugin.cpp | 4 +- src/plugins/debugger/gdb/gdbengine.cpp | 62 ++++++++----------- src/plugins/debugger/stackwindow.cpp | 2 +- src/plugins/find/findtoolbar.cpp | 4 +- src/plugins/git/gitplugin.cpp | 18 +++--- src/plugins/help/centralwidget.cpp | 8 +-- src/plugins/help/helpplugin.cpp | 4 +- .../projectexplorer/debugginghelper.cpp | 3 +- .../projectexplorer/projecttreewidget.cpp | 2 +- src/plugins/qt4projectmanager/qmakestep.cpp | 2 +- .../qt4projectmanager/qtversionmanager.cpp | 3 +- src/plugins/subversion/subversionplugin.cpp | 6 +- src/plugins/texteditor/basetexteditor.cpp | 2 +- src/plugins/texteditor/completionwidget.cpp | 2 +- src/plugins/texteditor/fontsettings.cpp | 2 +- .../texteditor/texteditoractionhandler.cpp | 4 +- src/plugins/texteditor/texteditorplugin.cpp | 2 +- src/shared/help/bookmarkmanager.cpp | 13 ++-- src/shared/help/indexwindow.cpp | 2 +- src/shared/proparser/profileevaluator.cpp | 2 +- src/shared/qtlockedfile/qtlockedfile.h | 2 +- 37 files changed, 110 insertions(+), 118 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index e1800de1f11..5199c7c7e64 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -46,7 +46,7 @@ #include #include -#ifdef Q_OS_DARWIN +#ifdef Q_OS_MAC # include #endif @@ -71,7 +71,7 @@ static const char *CLIENT_OPTION = "-client"; typedef QList PluginSpecSet; // Helpers for displaying messages. Note that there is no console on Windows. -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN // Format as 
 HTML
 static inline void toHtml(QString &t)
 {
@@ -204,7 +204,7 @@ static inline QStringList getPluginPaths()
 
 int main(int argc, char **argv)
 {
-#ifdef Q_OS_DARWIN
+#ifdef Q_OS_MAC
     // increase the number of file that can be opened in Qt Creator.
     struct rlimit rl;
     getrlimit(RLIMIT_NOFILE, &rl);
diff --git a/src/libs/utils/abstractprocess.h b/src/libs/utils/abstractprocess.h
index b7edcd889ec..db24b0ca4e5 100644
--- a/src/libs/utils/abstractprocess.h
+++ b/src/libs/utils/abstractprocess.h
@@ -59,7 +59,7 @@ public:
 //signals:
     virtual void processError(const QString &error) = 0;
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     // Add PATH and SystemRoot environment variables in case they are missing
     static QStringList fixWinEnvironment(const QStringList &env);
     // Quote a Windows command line correctly for the "CreateProcess" API
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index efc49881c98..be494fb5aff 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -44,11 +44,10 @@
 #include 
 #include 
 
-#ifdef Q_OS_MAC
 /*static*/ const char * const Core::Utils::PathChooser::browseButtonLabel =
+#ifdef Q_WS_MAC
                    QT_TRANSLATE_NOOP("Core::Utils::PathChooser", "Choose...");
 #else
-/*static*/ const char * const Core::Utils::PathChooser::browseButtonLabel =
                    QT_TRANSLATE_NOOP("Core::Utils::PathChooser", "Browse...");
 #endif
 
@@ -128,7 +127,7 @@ PathChooser::~PathChooser()
 
 void PathChooser::addButton(const QString &text, QObject *receiver, const char *slotFunc)
 {
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     QPushButton *button = new QPushButton;
 #else
     QToolButton *button = new QToolButton;
diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp
index 3d5cdf2bda8..ab1d5239c2c 100644
--- a/src/plugins/bookmarks/bookmarksplugin.cpp
+++ b/src/plugins/bookmarks/bookmarksplugin.cpp
@@ -86,7 +86,7 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *)
     m_toggleAction = new QAction(tr("Toggle Bookmark"), this);
     Core::Command *cmd =
         am->registerAction(m_toggleAction, BOOKMARKS_TOGGLE_ACTION, textcontext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+M")));
 #else
     cmd->setDefaultKeySequence(QKeySequence(tr("Meta+M")));
@@ -116,7 +116,7 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *)
     //Previous
     m_prevAction = new QAction(tr("Previous Bookmark"), this);
     cmd = am->registerAction(m_prevAction, BOOKMARKS_PREV_ACTION, globalcontext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+,")));
 #else
     cmd->setDefaultKeySequence(QKeySequence(tr("Meta+,")));
@@ -126,7 +126,7 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *)
     //Next
     m_nextAction = new QAction(tr("Next Bookmark"), this);
     cmd = am->registerAction(m_nextAction, BOOKMARKS_NEXT_ACTION, globalcontext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+.")));
 #else
     cmd->setDefaultKeySequence(QKeySequence(tr("Meta+.")));
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index 608956623e1..304f7cf12f2 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -361,7 +361,7 @@ Command *ActionManagerPrivate::registerOverridableAction(QAction *action, const
         baseAction->setEnabled(false);
         baseAction->setObjectName(id);
         baseAction->setParent(m_mainWnd);
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
         baseAction->setIconVisibleInMenu(false);
 #endif
         a->setAction(baseAction);
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index e4edc05d2be..364098b63bb 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -344,7 +344,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
 
     m_d->m_splitAction = new QAction(tr("Split"), this);
     cmd = am->registerAction(m_d->m_splitAction, Constants::SPLIT, editManagerContext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,2")));
 #endif
     mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
@@ -352,7 +352,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
 
     m_d->m_splitSideBySideAction = new QAction(tr("Split Side by Side"), this);
     cmd = am->registerAction(m_d->m_splitSideBySideAction, Constants::SPLIT_SIDE_BY_SIDE, editManagerContext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,3")));
 #endif
     mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
@@ -360,7 +360,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
 
     m_d->m_removeCurrentSplitAction = new QAction(tr("Remove Current Split"), this);
     cmd = am->registerAction(m_d->m_removeCurrentSplitAction, Constants::REMOVE_CURRENT_SPLIT, editManagerContext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,0")));
 #endif
     mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
@@ -368,7 +368,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
 
     m_d->m_removeAllSplitsAction = new QAction(tr("Remove All Splits"), this);
     cmd = am->registerAction(m_d->m_removeAllSplitsAction, Constants::REMOVE_ALL_SPLITS, editManagerContext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,1")));
 #endif
     mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
@@ -376,7 +376,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
 
     m_d->m_gotoOtherSplitAction = new QAction(tr("Goto Other Split"), this);
     cmd = am->registerAction(m_d->m_gotoOtherSplitAction, Constants::GOTO_OTHER_SPLIT, editManagerContext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+E,o")));
 #endif
     mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
index b14491ae726..318cf82ff3a 100644
--- a/src/plugins/coreplugin/fancyactionbar.cpp
+++ b/src/plugins/coreplugin/fancyactionbar.cpp
@@ -85,7 +85,7 @@ void FancyToolButton::paintEvent(QPaintEvent *event)
     QPainter p(this);
     p.drawPicture(0, 0, m_buttonElements.value(svgIdButtonBase));
     p.drawPicture(0, 0, m_buttonElements.value(isDown() ? svgIdButtonPressedBase : svgIdButtonNormalBase));
-#ifndef Q_WS_MAC // Mac UI's dont usually do hover
+#ifndef Q_WS_MAC // Mac UIs usually don't hover
     if (underMouse() && isEnabled())
         p.drawPicture(0, 0, m_buttonElements.value(svgIdButtonHoverOverlay));
 #endif
diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp
index b5926a951eb..34a58d57440 100644
--- a/src/plugins/coreplugin/fileiconprovider.cpp
+++ b/src/plugins/coreplugin/fileiconprovider.cpp
@@ -70,7 +70,7 @@ QIcon FileIconProvider::icon(const QFileInfo &fileInfo)
 
         // Disabled since for now we'll make sure that all icons fit with our
         // own custom icons by returning an empty one if we don't know it.
-#ifdef Q_OS_WIN
+#ifdef Q_WS_WIN
         // This is incorrect if the OS does not always return the same icon for the
         // same suffix (Mac OS X), but should speed up the retrieval a lot ...
         icon = m_systemIconProvider.icon(fileInfo);
@@ -123,7 +123,7 @@ void FileIconProvider::registerIconOverlayForSuffix(const QIcon &icon, const QSt
 QIcon FileIconProvider::iconForSuffix(const QString &suffix) const
 {
     QIcon icon;
-#ifndef Q_OS_WIN // On windows we use the file system icons
+#ifndef Q_WS_WIN // On windows we use the file system icons
     if (suffix.isEmpty())
         return icon;
 
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 07ff1132942..3520bd0cd88 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -144,7 +144,7 @@ MainWindow::MainWindow() :
     m_optionsAction(0),
     m_toggleSideBarAction(0),
     m_toggleFullScreenAction(0),
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     m_minimizeAction(0),
     m_zoomAction(0),
 #endif
@@ -153,7 +153,7 @@ MainWindow::MainWindow() :
     OutputPaneManager::create();
 
     setWindowTitle(tr("Qt Creator"));
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     qApp->setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png"));
 #endif
     QCoreApplication::setApplicationName(QLatin1String("QtCreator"));
@@ -597,7 +597,7 @@ void MainWindow::registerDefaultActions()
     // Save As Action
     tmpaction = new QAction(tr("Save &As..."), this);
     cmd = am->registerAction(tmpaction, Constants::SAVEAS, m_globalContext);
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+S")));
 #endif
     cmd->setAttribute(Command::CA_UpdateText);
@@ -607,7 +607,7 @@ void MainWindow::registerDefaultActions()
     // SaveAll Action
     m_saveAllAction = new QAction(tr("Save A&ll"), this);
     cmd = am->registerAction(m_saveAllAction, Constants::SAVEALL, m_globalContext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+S")));
 #endif
     mfile->addAction(cmd, Constants::G_FILE_SAVE);
@@ -681,13 +681,13 @@ void MainWindow::registerDefaultActions()
     // Options Action
     m_optionsAction = new QAction(tr("&Options..."), this);
     cmd = am->registerAction(m_optionsAction, Constants::OPTIONS, m_globalContext);
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     cmd->setDefaultKeySequence(QKeySequence("Ctrl+,"));
 #endif
     mtools->addAction(cmd, Constants::G_DEFAULT_THREE);
     connect(m_optionsAction, SIGNAL(triggered()), this, SLOT(showOptionsDialog()));
 
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     // Minimize Action
     m_minimizeAction = new QAction(tr("Minimize"), this);
     cmd = am->registerAction(m_minimizeAction, Constants::MINIMIZE_WINDOW, m_globalContext);
@@ -711,7 +711,7 @@ void MainWindow::registerDefaultActions()
                                         tr("Show Sidebar"), this);
     m_toggleSideBarAction->setCheckable(true);
     cmd = am->registerAction(m_toggleSideBarAction, Constants::TOGGLE_SIDEBAR, m_globalContext);
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     cmd->setDefaultKeySequence(QKeySequence("Ctrl+0"));
 #else
     cmd->setDefaultKeySequence(QKeySequence("Alt+0"));
@@ -721,7 +721,7 @@ void MainWindow::registerDefaultActions()
     mwindow->addAction(cmd, Constants::G_WINDOW_PANES);
     m_toggleSideBarAction->setEnabled(false);
 
-#if !defined(Q_OS_MAC)
+#ifndef Q_WS_MAC
     // Full Screen Action
     m_toggleFullScreenAction = new QAction(tr("Full Screen"), this);
     m_toggleFullScreenAction->setCheckable(true);
@@ -732,7 +732,7 @@ void MainWindow::registerDefaultActions()
 #endif
 
     // About IDE Action
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     tmpaction = new QAction(tr("About &Qt Creator"), this); // it's convention not to add dots to the about menu
 #else
     tmpaction = new QAction(tr("About &Qt Creator..."), this);
@@ -746,7 +746,7 @@ void MainWindow::registerDefaultActions()
     cmd = am->registerAction(tmpaction, Constants::ABOUT_PLUGINS, m_globalContext);
     mhelp->addAction(cmd, Constants::G_HELP_ABOUT);
     tmpaction->setEnabled(true);
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     cmd->action()->setMenuRole(QAction::ApplicationSpecificRole);
 #endif
     connect(tmpaction, SIGNAL(triggered()), this,  SLOT(aboutPlugins()));
@@ -1022,7 +1022,7 @@ void MainWindow::changeEvent(QEvent *e)
             emit windowActivated();
         }
     } else if (e->type() == QEvent::WindowStateChange) {
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
         bool minimized = isMinimized();
         if (debugMainWindow)
             qDebug() << "main window state changed to minimized=" << minimized;
diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h
index 7886d7795d1..997a0c26d9e 100644
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/src/plugins/coreplugin/mainwindow.h
@@ -208,7 +208,7 @@ private:
     QAction *m_optionsAction;
     QAction *m_toggleSideBarAction;
     QAction *m_toggleFullScreenAction;
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     QAction *m_minimizeAction;
     QAction *m_zoomAction;
 #endif
diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp
index f54a9378a6b..d514aa0022d 100644
--- a/src/plugins/coreplugin/modemanager.cpp
+++ b/src/plugins/coreplugin/modemanager.cpp
@@ -147,7 +147,7 @@ void ModeManager::objectAdded(QObject *obj)
     m_modeShortcuts.insert(index, cmd);
     connect(cmd, SIGNAL(keySequenceChanged()), this, SLOT(updateModeToolTip()));
     for (int i = 0; i < m_modeShortcuts.size(); ++i) {
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
         m_modeShortcuts.at(i)->setDefaultKeySequence(QKeySequence(QString("Meta+%1").arg(i+1)));
 #else
         m_modeShortcuts.at(i)->setDefaultKeySequence(QKeySequence(QString("Ctrl+%1").arg(i+1)));
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 091d19c2510..d93abca335e 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -363,7 +363,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget)
 
     m_navigationComboBox = new NavComboBox(this);
     m_navigationWidget = 0;
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     // this is to avoid ugly tool bar behavior
     m_navigationComboBox->setMaximumWidth(130);
 #endif
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 685327c5592..ba27f6771af 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -207,7 +207,7 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
     m_buttonsWidget = new QWidget;
     m_buttonsWidget->setLayout(new QHBoxLayout);
     m_buttonsWidget->layout()->setContentsMargins(5,0,0,0);
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     m_buttonsWidget->layout()->setSpacing(16);
 #else
     m_buttonsWidget->layout()->setSpacing(4);
@@ -299,7 +299,7 @@ void OutputPaneManager::init()
 
         Command *cmd = am->registerAction(action, actionId, QList() << Constants::C_GLOBAL_ID);
         if (outPane->priorityInStatusBar() != -1) {
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
             cmd->setDefaultKeySequence(QKeySequence(paneShortCut(Qt::CTRL, shortcutNumber)));
 #else
             cmd->setDefaultKeySequence(QKeySequence(paneShortCut(Qt::ALT, shortcutNumber)));
@@ -567,7 +567,7 @@ OutputPaneToggleButton::OutputPaneToggleButton(int number, const QString &text,
             "QPushButton { border-image: url(:/core/images/panel_button.png) 2 2 2 19;"
                          " border-width: 2px 2px 2px 19px; padding-left: -17; padding-right: 4 } "
             "QPushButton:checked { border-image: url(:/core/images/panel_button_checked.png) 2 2 2 19 } "
-#ifndef Q_WS_MAC // Mac UI's dont usually do hover
+#ifndef Q_WS_MAC // Mac UIs usually don't hover
             "QPushButton:checked:hover { border-image: url(:/core/images/panel_button_checked_hover.png) 2 2 2 19 } "
             "QPushButton:pressed:hover { border-image: url(:/core/images/panel_button_pressed.png) 2 2 2 19 } "
             "QPushButton:hover { border-image: url(:/core/images/panel_button_hover.png) 2 2 2 19 } "
diff --git a/src/plugins/coreplugin/stylehelper.cpp b/src/plugins/coreplugin/stylehelper.cpp
index b46f751e009..42ca012cf31 100644
--- a/src/plugins/coreplugin/stylehelper.cpp
+++ b/src/plugins/coreplugin/stylehelper.cpp
@@ -50,7 +50,7 @@ static int range(float x, int min, int max)
 
 qreal StyleHelper::sidebarFontSize()
 {
-#if defined(Q_OS_MAC)
+#if defined(Q_WS_MAC)
     return 9;
 #else
     return 7.5;
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 6af357ca805..f407e1b1000 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -100,7 +100,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_m
 
     m_postAction = new QAction(tr("Paste Snippet..."), this);
     command = actionManager->registerAction(m_postAction, "CodePaster.Post", globalcontext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+P")));
 #endif
     connect(m_postAction, SIGNAL(triggered()), this, SLOT(post()));
@@ -108,7 +108,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_m
 
     m_fetchAction = new QAction(tr("Fetch Snippet..."), this);
     command = actionManager->registerAction(m_fetchAction, "CodePaster.Fetch", globalcontext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+F")));
 #endif
     connect(m_fetchAction, SIGNAL(triggered()), this, SLOT(fetch()));
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 384058685b5..d69d683f819 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -405,7 +405,7 @@ void FunctionArgumentWidget::updateHintText()
     m_popupFrame->setFixedWidth(m_popupFrame->minimumSizeHint().width());
 
     const QDesktopWidget *desktop = QApplication::desktop();
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     const QRect screen = desktop->availableGeometry(desktop->screenNumber(m_editor->widget()));
 #else
     const QRect screen = desktop->screenGeometry(desktop->screenNumber(m_editor->widget()));
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index d252b2482da..60db690d214 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -112,7 +112,7 @@ const char * const BREAK_BY_FUNCTION    = "Debugger.BreakByFunction";
 const char * const BREAK_AT_MAIN        = "Debugger.BreakAtMain";
 const char * const ADD_TO_WATCH         = "Debugger.AddToWatch";
 
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
 const char * const INTERRUPT_KEY            = "Shift+F5";
 const char * const RESET_KEY                = "Ctrl+Shift+F5";
 const char * const STEP_KEY                 = "F7";
@@ -1136,7 +1136,7 @@ void DebuggerPlugin::readSettings()
     DebuggerSettings::instance()->readSettings(s);
 
     QString defaultCommand("gdb");
-#if defined(Q_OS_WIN32)
+#ifdef Q_OS_WIN
     defaultCommand.append(".exe");
 #endif
     //QString defaultScript = ICore::instance()->resourcePath() +
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 770586af681..9b0ae33cf80 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -72,7 +72,7 @@
 #    include "shared/sharedlibraryinjector.h"
 #endif
 
-#if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
+#ifdef Q_OS_UNIX
 #include 
 #include 
 #endif
@@ -826,12 +826,10 @@ void GdbEngine::handleInfoThreads(const GdbResultRecord &record, const QVariant
 void GdbEngine::handleInfoProc(const GdbResultRecord &record, const QVariant &)
 {
     if (record.resultClass == GdbResultDone) {
-        #if defined(Q_OS_MAC)
+        #ifdef Q_OS_MAC
         //^done,process-id="85075"
         maybeHandleInferiorPidChanged(_(record.data.findChild("process-id").data()));
-        #endif
-
-        #if defined(Q_OS_LINUX) || defined(Q_OS_WIN)
+        #else
         // FIXME: use something more robust
         QRegExp re(__("process (\\d+)"));
         QString data = __(record.data.findChild("consolestreamoutput").data());
@@ -919,14 +917,12 @@ static bool isStoppedReason(const QByteArray &reason)
 
 void GdbEngine::handleAqcuiredInferior()
 {
-    #if defined(Q_OS_WIN)
+    #ifdef Q_OS_WIN
     postCommand(_("info thread"), CB(handleInfoThreads));
-    #endif
-    #if defined(Q_OS_LINUX)
-    postCommand(_("info proc"), CB(handleInfoProc));
-    #endif
-    #if defined(Q_OS_MAC)
+    #elif defined(Q_OS_MAC)
     postCommand(_("info pid"), NeedsStop, CB(handleInfoProc));
+    #else
+    postCommand(_("info proc"), CB(handleInfoProc));
     #endif
     if (theDebuggerBoolSetting(ListSourceFiles))
         reloadSourceFiles();
@@ -1883,23 +1879,21 @@ void GdbEngine::sendInsertBreakpoint(int index)
 
     // set up fallback in case of pending breakpoints which aren't handled
     // by the MI interface
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
-    QString cmd = _("-break-insert -f ");
-    //if (!data->condition.isEmpty())
-    //    cmd += _("-c ") + data->condition + ' ';
-    cmd += where;
-#endif
-#if defined(Q_OS_MAC)
-    QString cmd = _("-break-insert -l -1 ");
-    //if (!data->condition.isEmpty())
-    //    cmd += "-c " + data->condition + " ";
-    cmd += where;
-#endif
 #if defined(Q_OS_WIN)
     QString cmd = _("-break-insert ");
     //if (!data->condition.isEmpty())
     //    cmd += "-c " + data->condition + " ";
     cmd += where;
+#elif defined(Q_OS_MAC)
+    QString cmd = _("-break-insert -l -1 ");
+    //if (!data->condition.isEmpty())
+    //    cmd += "-c " + data->condition + " ";
+    cmd += where;
+#else
+    QString cmd = _("-break-insert -f ");
+    //if (!data->condition.isEmpty())
+    //    cmd += _("-c ") + data->condition + ' ';
+    cmd += where;
 #endif
     debugMessage(_("Current state: %1").arg(q->status()));
     postCommand(cmd, NeedsStop, CB(handleBreakInsert), index);
@@ -2039,24 +2033,22 @@ void GdbEngine::handleBreakInsert(const GdbResultRecord &record, const QVariant
         const BreakpointData *data = handler->at(index);
         // Note that it is perfectly correct that the file name is put
         // in quotes but not escaped. GDB simply is like that.
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_WIN)
+        QFileInfo fi(data->fileName);
+        QString where = _c('"') + fi.fileName() + _("\":")
+            + data->lineNumber;
+        //QString where = m_data->fileName + _c(':') + data->lineNumber;
+#elif defined(Q_OS_MAC)
+        QFileInfo fi(data->fileName);
+        QString where = _c('"') + fi.fileName() + _("\":")
+            + data->lineNumber;
+#else
         //QString where = "\"\\\"" + data->fileName + "\\\":"
         //    + data->lineNumber + "\"";
         QString where = _c('"') + data->fileName + _("\":")
             + data->lineNumber;
         // Should not happen with -break-insert -f. gdb older than 6.8?
         QTC_ASSERT(false, /**/);
-#endif
-#if defined(Q_OS_MAC)
-        QFileInfo fi(data->fileName);
-        QString where = _c('"') + fi.fileName() + _("\":")
-            + data->lineNumber;
-#endif
-#if defined(Q_OS_WIN)
-        QFileInfo fi(data->fileName);
-        QString where = _c('"') + fi.fileName() + _("\":")
-            + data->lineNumber;
-        //QString where = m_data->fileName + _c(':') + data->lineNumber;
 #endif
         postCommand(_("break ") + where, CB(handleBreakInsert1), index);
     }
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index e51c27ac6d3..9354dda8068 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -133,7 +133,7 @@ void StackWindow::copyContentsToClipboard()
         str += '\n';
     }
     QClipboard *clipboard = QApplication::clipboard();
-    #ifdef Q_OS_LINUX
+    #ifdef Q_WS_X11
     clipboard->setText(str, QClipboard::Selection);
     #endif
     clipboard->setText(str, QClipboard::Clipboard);
diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp
index 313d229ceb8..2dff2fdc378 100644
--- a/src/plugins/find/findtoolbar.cpp
+++ b/src/plugins/find/findtoolbar.cpp
@@ -240,7 +240,7 @@ bool FindToolBar::eventFilter(QObject *obj, QEvent *event)
     if ((obj == m_ui.findEdit || obj == m_findCompleter->popup())
                && event->type() == QEvent::KeyPress) {
         QKeyEvent *ke = static_cast(event);
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
         if (ke->key() == Qt::Key_Space && (ke->modifiers() & Qt::MetaModifier)) {
 #else
         if (ke->key() == Qt::Key_Space && (ke->modifiers() & Qt::ControlModifier)) {
@@ -261,7 +261,7 @@ bool FindToolBar::eventFilter(QObject *obj, QEvent *event)
                 event->accept();
                 return true;
             }
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
         } else if (ke->key() == Qt::Key_Space && (ke->modifiers() & Qt::MetaModifier)) {
 #else
         } else if (ke->key() == Qt::Key_Space && (ke->modifiers() & Qt::ControlModifier)) {
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 4f240a21fe8..ac3cfb2d2d8 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -279,7 +279,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     m_diffAction = new Core::Utils::ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
     command = actionManager->registerAction(m_diffAction, "Git.Diff", globalcontext);
     command->setAttribute(Core::Command::CA_UpdateText);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+D")));
 #endif
     connect(m_diffAction, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
@@ -287,7 +287,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 
     m_statusAction = new Core::Utils::ParameterAction(tr("File Status"), tr("Status Related to \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
     command = actionManager->registerAction(m_statusAction, "Git.Status", globalcontext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+S")));
 #endif
     command->setAttribute(Core::Command::CA_UpdateText);
@@ -296,7 +296,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 
     m_logAction = new Core::Utils::ParameterAction(tr("Log File"), tr("Log of \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
     command = actionManager->registerAction(m_logAction, "Git.Log", globalcontext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+L")));
 #endif
     command->setAttribute(Core::Command::CA_UpdateText);
@@ -305,7 +305,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 
     m_blameAction = new Core::Utils::ParameterAction(tr("Blame"), tr("Blame for \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
     command = actionManager->registerAction(m_blameAction, "Git.Blame", globalcontext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+B")));
 #endif
     command->setAttribute(Core::Command::CA_UpdateText);
@@ -314,7 +314,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 
     m_undoFileAction = new Core::Utils::ParameterAction(tr("Undo Changes"), tr("Undo Changes for \"%1\""),  Core::Utils::ParameterAction::AlwaysEnabled, this);
     command = actionManager->registerAction(m_undoFileAction, "Git.Undo", globalcontext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+U")));
 #endif
     command->setAttribute(Core::Command::CA_UpdateText);
@@ -323,7 +323,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 
     m_stageAction = new Core::Utils::ParameterAction(tr("Stage File for Commit"), tr("Stage \"%1\" for Commit"), Core::Utils::ParameterAction::AlwaysEnabled, this);
     command = actionManager->registerAction(m_stageAction, "Git.Stage", globalcontext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+A")));
 #endif
     command->setAttribute(Core::Command::CA_UpdateText);
@@ -346,7 +346,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 
     m_diffProjectAction = new Core::Utils::ParameterAction(tr("Diff Current Project"), tr("Diff Project \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
     command = actionManager->registerAction(m_diffProjectAction, "Git.DiffProject", globalcontext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence("Alt+G,Alt+Shift+D"));
 #endif
     command->setAttribute(Core::Command::CA_UpdateText);
@@ -361,7 +361,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 
     m_logProjectAction = new Core::Utils::ParameterAction(tr("Log Project"), tr("Log Project \"%1\""), Core::Utils::ParameterAction::AlwaysEnabled, this);
     command = actionManager->registerAction(m_logProjectAction, "Git.LogProject", globalcontext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+K")));
 #endif
     command->setAttribute(Core::Command::CA_UpdateText);
@@ -398,7 +398,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 
     m_commitAction = new QAction(tr("Commit..."), this);
     command = actionManager->registerAction(m_commitAction, "Git.Commit", globalcontext);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+C")));
 #endif
     command->setAttribute(Core::Command::CA_UpdateText);
diff --git a/src/plugins/help/centralwidget.cpp b/src/plugins/help/centralwidget.cpp
index a53a67564ac..72574102f91 100644
--- a/src/plugins/help/centralwidget.cpp
+++ b/src/plugins/help/centralwidget.cpp
@@ -85,10 +85,10 @@ CentralWidget::CentralWidget(QHelpEngine *engine, QWidget *parent)
     globalActionList.clear();
     collectionFile = helpEngine->collectionFile();
 
-    QString system = QLatin1String("win");
-
 #ifdef Q_OS_MAC
-    system = QLatin1String("mac");
+#   define SYSTEM "mac"
+#else
+#   define SYSTEM "win"
 #endif
 
     tabWidget = new QTabWidget;
@@ -100,7 +100,7 @@ CentralWidget::CentralWidget(QHelpEngine *engine, QWidget *parent)
     QToolButton *newTabButton = new QToolButton(this);
     newTabButton->setAutoRaise(true);
     newTabButton->setToolTip(tr("Add new page"));
-    newTabButton->setIcon(QIcon(QString::fromUtf8(":/trolltech/assistant/images/%1/addtab.png").arg(system)));
+    newTabButton->setIcon(QIcon(QString::fromLatin1(":/trolltech/assistant/images/" SYSTEM "/addtab.png")));
 
     tabWidget->setCornerWidget(newTabButton, Qt::TopLeftCorner);
     connect(newTabButton, SIGNAL(clicked()), this, SLOT(newTab()));
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 661723464cb..f5287afbd6f 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -241,7 +241,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
     am->actionContainer(Core::Constants::M_HELP)->addAction(cmd,
         Core::Constants::G_HELP_HELP);
 
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     QAction *sep = new QAction(this);
     sep->setSeparator(true);
     cmd = am->registerAction(sep, QLatin1String("Help.Separator"), globalcontext);
@@ -344,7 +344,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
     actionList << previousAction
         << nextAction
         << homeAction
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
         << sep
 #endif
         << copyAction;
diff --git a/src/plugins/projectexplorer/debugginghelper.cpp b/src/plugins/projectexplorer/debugginghelper.cpp
index da5fefc5125..b403872f5b2 100644
--- a/src/plugins/projectexplorer/debugginghelper.cpp
+++ b/src/plugins/projectexplorer/debugginghelper.cpp
@@ -215,10 +215,11 @@ QStringList DebuggingHelperLibrary::possibleQMakeCommands()
     // On windows noone has renamed qmake, right?
 #ifdef Q_OS_WIN
     return QStringList() << "qmake.exe";
-#endif
+#else
     // On unix some distributions renamed qmake to avoid clashes
     QStringList result;
     result << "qmake-qt4" << "qmake4" << "qmake";
     return result;
+#endif
 }
 
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index 32b6ca9edfb..8054fa0f8d6 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -90,7 +90,7 @@ protected:
             QTreeView::focusOutEvent(event);
     }
 
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     void keyPressEvent(QKeyEvent *event)
     {
         if ((event->key() == Qt::Key_Return
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index 3b0049ec403..071d30a5ce3 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -103,7 +103,7 @@ bool QMakeStep::init(const QString &name)
 
 
     if (!qtVersion->isValid()) {
-#if defined(Q_OS_MAC)
+#if defined(Q_WS_MAC)
         emit addToOutputWindow(tr("\nNo valid Qt version set. Set one in Preferences \n"));
 #else
         emit addToOutputWindow(tr("\nNo valid Qt version set. Set one in Tools/Options \n"));
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 761e70612fa..ea64f2da180 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -937,8 +937,7 @@ static inline QStringList possibleGuiBinaries(const QString &name)
 {
 #ifdef Q_OS_WIN
     return QStringList(name + QLatin1String(".exe"));
-#endif
-#ifdef Q_OS_MAC // 'Foo.app/Contents/MacOS/Foo'
+#elif defined(Q_OS_MAC) // 'Foo.app/Contents/MacOS/Foo'
     QString upCaseName = name;
     upCaseName[0] = upCaseName.at(0).toUpper();
     QString macBinary = upCaseName;
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 532beecdf45..af0e674c1bc 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -336,7 +336,7 @@ bool SubversionPlugin::initialize(const QStringList &arguments, QString *errorMe
     command = ami->registerAction(m_addAction, SubversionPlugin::ADD,
         globalcontext);
     command->setAttribute(Core::Command::CA_UpdateText);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+A")));
 #endif
     connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile()));
@@ -368,7 +368,7 @@ bool SubversionPlugin::initialize(const QStringList &arguments, QString *errorMe
     command = ami->registerAction(m_diffCurrentAction,
         SubversionPlugin::DIFF_CURRENT, globalcontext);
     command->setAttribute(Core::Command::CA_UpdateText);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+D")));
 #endif
     connect(m_diffCurrentAction, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
@@ -386,7 +386,7 @@ bool SubversionPlugin::initialize(const QStringList &arguments, QString *errorMe
     command = ami->registerAction(m_commitCurrentAction,
         SubversionPlugin::COMMIT_CURRENT, globalcontext);
     command->setAttribute(Core::Command::CA_UpdateText);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+C")));
 #endif
     connect(m_commitCurrentAction, SIGNAL(triggered()), this, SLOT(startCommitCurrentFile()));
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 44ab1dab1fe..5448be6d4a3 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -956,7 +956,7 @@ void BaseTextEditor::keyPressEvent(QKeyEvent *e)
     case Qt::Key_End:
     case Qt::Key_Right:
     case Qt::Key_Left:
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
         if ((e->modifiers() & (Qt::AltModifier | Qt::ShiftModifier)) == (Qt::AltModifier | Qt::ShiftModifier)) {
 
             d->m_lastEventWasBlockSelectionEvent = true;
diff --git a/src/plugins/texteditor/completionwidget.cpp b/src/plugins/texteditor/completionwidget.cpp
index 8806fd3d6d5..a7d0c231297 100644
--- a/src/plugins/texteditor/completionwidget.cpp
+++ b/src/plugins/texteditor/completionwidget.cpp
@@ -255,7 +255,7 @@ void CompletionWidget::updatePositionAndSize(int startPos)
     // Determine the position, keeping the popup on the screen
     const QRect cursorRect = m_editor->cursorRect(startPos);
     const QDesktopWidget *desktop = QApplication::desktop();
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     const QRect screen = desktop->availableGeometry(desktop->screenNumber(m_editorWidget));
 #else
     const QRect screen = desktop->screenGeometry(desktop->screenNumber(m_editorWidget));
diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp
index 37907a345e5..441a7a67113 100644
--- a/src/plugins/texteditor/fontsettings.cpp
+++ b/src/plugins/texteditor/fontsettings.cpp
@@ -48,7 +48,7 @@ static const bool DEFAULT_ANTIALIAS = true;
     enum { DEFAULT_FONT_SIZE = 12 };
     static const char *DEFAULT_FONT_FAMILY = "Monaco";
 #else
-#ifdef Q_OS_UNIX
+#ifdef Q_WS_X11
     enum { DEFAULT_FONT_SIZE = 9 };
     static const char *DEFAULT_FONT_FAMILY = "Monospace";
 #else
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index 44220bfdb99..d8bd9e098e4 100644
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ b/src/plugins/texteditor/texteditoractionhandler.cpp
@@ -146,7 +146,7 @@ void TextEditorActionHandler::createActions()
     m_visualizeWhitespaceAction->setCheckable(true);
     command = am->registerAction(m_visualizeWhitespaceAction,
                                  TextEditor::Constants::VISUALIZE_WHITESPACE, m_contextId);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Ctrl+E, Ctrl+V")));
 #endif
     advancedMenu->addAction(command, Core::Constants::G_EDIT_FORMAT);
@@ -162,7 +162,7 @@ void TextEditorActionHandler::createActions()
     m_textWrappingAction = new QAction(tr("Enable Text &Wrapping"), this);
     m_textWrappingAction->setCheckable(true);
     command = am->registerAction(m_textWrappingAction, TextEditor::Constants::TEXT_WRAPPING, m_contextId);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Ctrl+E, Ctrl+W")));
 #endif
     advancedMenu->addAction(command, Core::Constants::G_EDIT_FORMAT);
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index 049d3a39780..b6bf55025bf 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -124,7 +124,7 @@ bool TextEditorPlugin::initialize(const QStringList &arguments, QString *errorMe
     // Make sure the shortcut still works when the completion widget is active
     completionShortcut->setContext(Qt::ApplicationShortcut);
     Core::Command *command = am->registerShortcut(completionShortcut, Constants::COMPLETE_THIS, context);
-#ifndef Q_OS_MAC
+#ifndef Q_WS_MAC
     command->setDefaultKeySequence(QKeySequence(tr("Ctrl+Space")));
 #else
     command->setDefaultKeySequence(QKeySequence(tr("Meta+Space")));
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp
index 7052495fcef..96c86437657 100644
--- a/src/shared/help/bookmarkmanager.cpp
+++ b/src/shared/help/bookmarkmanager.cpp
@@ -436,9 +436,10 @@ void BookmarkWidget::setup(bool showButtons)
     treeView = new TreeView(this);
     vlayout->addWidget(treeView);
 
-    QString system = QLatin1String("win");
 #ifdef Q_OS_MAC
-    system = QLatin1String("mac");
+#   define SYSTEM "mac"
+#else
+#   define SYSTEM "win"
 #endif
 
     if (showButtons) {
@@ -449,8 +450,8 @@ void BookmarkWidget::setup(bool showButtons)
 
         addButton = new QToolButton(this);
         addButton->setText(tr("Add"));
-        addButton->setIcon(QIcon(QString::fromUtf8(
-            ":/trolltech/assistant/images/%1/addtab.png").arg(system)));
+        addButton->setIcon(QIcon(QString::fromLatin1(
+            ":/trolltech/assistant/images/" SYSTEM "/addtab.png")));
         addButton->setAutoRaise(true);
         addButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         hlayout->addWidget(addButton);
@@ -458,8 +459,8 @@ void BookmarkWidget::setup(bool showButtons)
 
         removeButton = new QToolButton(this);
         removeButton->setText(tr("Remove"));
-        removeButton->setIcon(QIcon(QString::fromUtf8(
-            ":/trolltech/assistant/images/%1/closetab.png").arg(system)));
+        removeButton->setIcon(QIcon(QString::fromLatin1(
+            ":/trolltech/assistant/images/" SYSTEM "/closetab.png")));
         removeButton->setAutoRaise(true);
         removeButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         hlayout->addWidget(removeButton);
diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp
index 1b79ed00ae8..8ae9f4e0a93 100644
--- a/src/shared/help/indexwindow.cpp
+++ b/src/shared/help/indexwindow.cpp
@@ -140,7 +140,7 @@ bool IndexWindow::eventFilter(QObject *obj, QEvent *e)
             }
         }
     }
-#ifdef Q_OS_MAC
+#ifdef Q_WS_MAC
     else if (obj == m_indexWidget && e->type() == QEvent::KeyPress) {
         QKeyEvent *ke = static_cast(e);
         if (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter)
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 0a352e2b0b2..6f6d6c7bbc3 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -48,7 +48,7 @@
 #ifdef Q_OS_UNIX
 #include 
 #include 
-#elif defined(Q_OS_WIN32)
+#else
 #include 
 #endif
 #include 
diff --git a/src/shared/qtlockedfile/qtlockedfile.h b/src/shared/qtlockedfile/qtlockedfile.h
index b4a5cbd0637..49e26735dc6 100644
--- a/src/shared/qtlockedfile/qtlockedfile.h
+++ b/src/shared/qtlockedfile/qtlockedfile.h
@@ -32,7 +32,7 @@
 
 #include 
 
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
 #  if !defined(QT_QTLOCKEDFILE_EXPORT) && !defined(QT_QTLOCKEDFILE_IMPORT)
 #    define QT_QTLOCKEDFILE_EXPORT
 #  elif defined(QT_QTLOCKEDFILE_IMPORT)

From 259197a500cab562e79c758a17f372027a74be73 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen 
Date: Wed, 3 Jun 2009 20:54:40 +0200
Subject: [PATCH 22/25] clean up OS conditionals in project files

---
 doc/doc.pri                           |  2 --
 src/app/app.pro                       | 25 +++++++++----------------
 src/plugins/coreplugin/coreplugin.pro |  4 +++-
 src/qtcreatorlibrary.pri              |  2 +-
 src/qtcreatorplugin.pri               |  2 +-
 5 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/doc/doc.pri b/doc/doc.pri
index 67428a03892..98c6652a4b9 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -23,9 +23,7 @@ qch_docs.files = $$QCH_FILE
 
 unix:!macx {
     system("mkdir -p `dirname $$QCH_FILE` && touch $$QCH_FILE")
-}
 
-unix:!macx {
     qch_docs.path = /share/doc/qtcreator
     INSTALLS += qch_docs
 }
diff --git a/src/app/app.pro b/src/app/app.pro
index 3bb47607f0e..4f29e1f263c 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -5,29 +5,22 @@ TEMPLATE = app
 TARGET = $$IDE_APP_TARGET
 DESTDIR = $$IDE_APP_PATH
 
-
 SOURCES += main.cpp
 
 include(../rpath.pri)
 
-win32 {
-        RC_FILE = qtcreator.rc
-}
-
-macx {
-        ICON = qtcreator.icns
-        QMAKE_INFO_PLIST = Info.plist
-}
-
-macx {
-    CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
-    else:LIBS *= -lExtensionSystem -lAggregation
-}
 win32 {
     CONFIG(debug, debug|release):LIBS *= -lExtensionSystemd -lAggregationd
     else:LIBS *= -lExtensionSystem -lAggregation
-}
-unix:!macx {
+
+    RC_FILE = qtcreator.rc
+} else:macx {
+    CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
+    else:LIBS *= -lExtensionSystem -lAggregation
+
+    ICON = qtcreator.icns
+    QMAKE_INFO_PLIST = Info.plist
+} else {
     LIBS *= -lExtensionSystem -lAggregation
 
     target.path  = /bin
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index f36875126c0..0b9d77bf23b 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -170,9 +170,11 @@ FORMS += dialogs/newdialog.ui \
     welcomemode.ui
 RESOURCES += core.qrc \
     fancyactionbar.qrc
-linux-* { 
+
+unix:!macx {
     images.files = images/qtcreator_logo_*.png
     images.path = /share/pixmaps
     INSTALLS += images
 }
+
 OTHER_FILES += Core.pluginspec
diff --git a/src/qtcreatorlibrary.pri b/src/qtcreatorlibrary.pri
index fb92b5202a8..ecfee84d112 100644
--- a/src/qtcreatorlibrary.pri
+++ b/src/qtcreatorlibrary.pri
@@ -12,7 +12,7 @@ TARGET = $$qtLibraryTarget($$TARGET)
 
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
-linux-* {
+unix:!macx {
 	target.path = /$$IDE_LIBRARY_BASENAME/qtcreator
 	INSTALLS += target
 }
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index cb3e57f4e89..dcb4649e99e 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -42,7 +42,7 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
 CONFIG += plugin plugin_with_soname
 
-linux-* {
+unix:!macx {
     target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
     pluginspec.files += $${TARGET}.pluginspec
     pluginspec.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER

From 3104e4c121f3209890823db69a7c09d644b90951 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen 
Date: Thu, 4 Jun 2009 09:49:23 +0200
Subject: [PATCH 23/25] fix gcc 3.3. build

the templated friend just doesn't have any effect.
so simply skip the typeinfo. will be slower, but you deserve that if you
use that compiler.
---
 src/shared/proparser/profileevaluator.cpp | 2 ++
 src/shared/proparser/profileevaluator.h   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 6f6d6c7bbc3..47c9b93b336 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -248,8 +248,10 @@ public:
     bool m_parsePreAndPostFiles;
 };
 
+#if !defined(__GNUC__) || __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
 Q_DECLARE_TYPEINFO(ProFileEvaluator::Private::State, Q_PRIMITIVE_TYPE);
 Q_DECLARE_TYPEINFO(ProFileEvaluator::Private::ProLoop, Q_MOVABLE_TYPE);
+#endif
 
 ProFileEvaluator::Private::Private(ProFileEvaluator *q_)
   : q(q_)
diff --git a/src/shared/proparser/profileevaluator.h b/src/shared/proparser/profileevaluator.h
index de4b07f41d0..cb3a4880331 100644
--- a/src/shared/proparser/profileevaluator.h
+++ b/src/shared/proparser/profileevaluator.h
@@ -88,6 +88,7 @@ private:
     class Private;
     Private *d;
 
+    // This doesn't help gcc 3.3 ...
     template friend class QTypeInfo;
 };
 

From b184c8c3472bdfaf5cc9f27d73f2cbc791caa274 Mon Sep 17 00:00:00 2001
From: Kavindra Devi Palaraja 
Date: Wed, 3 Jun 2009 14:24:12 +0200
Subject: [PATCH 24/25] Fixes:    Doc - finishing part 2, yay ;)

RevBy:    TrustMe
---
 doc/addressbook-sdk.qdoc                      |  53 ++++++++++++++++++
 .../addressbook-sdk/part2/addressbook.cpp     |  51 ++++++++++++++++-
 .../addressbook-sdk/part2/addressbook.h       |   2 +
 ...dressbook-tutorial-part2-add-flowchart.png | Bin 0 -> 23533 bytes
 4 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 doc/images/addressbook-tutorial-part2-add-flowchart.png

diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc
index 3d97237e570..643f6d0b7e4 100644
--- a/doc/addressbook-sdk.qdoc
+++ b/doc/addressbook-sdk.qdoc
@@ -364,4 +364,57 @@
     \c submitButton and \c cancelButton; but we disable \c addButton.
 
     \snippet examples/addressbook-sdk/part2/addressbook.cpp addContact
+
+    \section2 The \c{submitContact()} Function
+
+    This function can be divided into three parts:
+
+    \list 1
+        \o  We extract the contact's detail from \c nameLine and \c addressText
+            and store them in QString objects. We also validate to ensure that
+            the user did not click \gui Submit with empty input fields;
+            otherwise, a QMessageBox is displayed to remind the user for a name
+            and address.
+
+            \snippet examples/addressbook-sdk/part2/addressbook.cpp submitContact part1
+
+        \o  We then proceed to check if the contact already exists. If it does
+            not exist, we add the contact to \c contacts and we display a
+            QMessageBox to inform the user about this, preventing the user from
+            adding duplicate contacts. Our \c contacts object is based on
+            key-value pairs or name and address, hence, we want to ensure that
+            \e key is unique.
+
+            \snippet examples/addressbook-sdk/part2/addressbook.cpp submitContact part2
+
+        \o  Once we have handled both cases mentioned above, we restore the
+            push buttons to their normal state with the following code:
+
+            \snippet examples/addressbook-sdk/part2/addressbook.cpp submitContact part3
+    \endlist
+
+    The screenshot below shows the QMessageBox object we use to display
+    information messages to the user.
+
+    # image
+
+    \section2 The \c{cancel()} Function
+
+    This function restores the last displayed contact details and enables
+    \c addButton, as well as hides \c submitButton and \c cancelButton.
+
+    \snippet examples/addressbook-sdk/part2/addressbook.cpp cancel
+
+    The general idea behind adding a contact is to give the user the
+    flexibility to click \gui Submit or \gui Cancel at any time. The flowchart
+    below further explains this concept:
+
+    \image addressbook-tutorial-part2-add-flowchart.png
+
+
+    \section1 Running the Application
+
+    Run your application now. You will be able to add as many unique contacts
+    as you like.
+
 */
diff --git a/doc/examples/addressbook-sdk/part2/addressbook.cpp b/doc/examples/addressbook-sdk/part2/addressbook.cpp
index 1406c3ca72b..06bb6327d5a 100644
--- a/doc/examples/addressbook-sdk/part2/addressbook.cpp
+++ b/doc/examples/addressbook-sdk/part2/addressbook.cpp
@@ -50,7 +50,7 @@ AddressBook::~AddressBook()
 void AddressBook::addContact()
 {
     oldName = nameLine->text();
-    oldAddress = addressTExt->toPlainText();
+    oldAddress = addressText->toPlainText();
 
     nameLine->clear();
     addressText->clear();
@@ -65,10 +65,57 @@ void AddressBook::addContact()
 }
 //! [addContact]
 
+//! [submitContact part1]
 void AddressBook::submitContact()
 {
-}
+    QString name = nameLine->text();
+    QString address = addressText->toPlainText();
 
+    if (name == "" || address == "") {
+        QMessageBox::information(this, tr("Empty Field"),
+            tr("Please enter a name and address."));
+        return;
+    }
+//! [submitContact part1]
+
+//! [submitContact part2]
+    if (!contacts.contains(name)) {
+        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));
+        return;
+    }
+//! [submitContact part2]
+
+//! [submitContact part3]
+    if (contacts.isEmpty()) {
+        nameLine->clear();
+        addressText->clear();
+    }
+
+    nameLine->setReadOnly(true);
+    addressText->setReadOnly(true);
+    addButton->setEnabled(true);
+    submitButton->hide();
+    cancelButton->hide();
+}
+//! [submitContact part3]
+
+//! [cancel]
 void AddressBook::cancel()
 {
+    nameLine->setText(oldName);
+    nameLine->setReadOnly(true);
+
+    addressText->setText(oldAddress);
+    addressText->setReadOnly(true);
+
+    addButton->setEnabled(true);
+    submitButton->hide();
+    cancelButton->hide();
 }
+//! [cancel]
diff --git a/doc/examples/addressbook-sdk/part2/addressbook.h b/doc/examples/addressbook-sdk/part2/addressbook.h
index 3021d5b9b09..86cf5b07bd8 100644
--- a/doc/examples/addressbook-sdk/part2/addressbook.h
+++ b/doc/examples/addressbook-sdk/part2/addressbook.h
@@ -6,6 +6,8 @@
 #include 
 #include 
 #include 
+#include 
+
 
 namespace Ui
 {
diff --git a/doc/images/addressbook-tutorial-part2-add-flowchart.png b/doc/images/addressbook-tutorial-part2-add-flowchart.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca9af3720d45f9be8806504b04c82a212e9df6ab
GIT binary patch
literal 23533
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
Date: Wed, 3 Jun 2009 17:00:30 +0200
Subject: [PATCH 25/25] Fixes:    Doc - starting on modifying Part 3

RevBy:    TrustMe
---
 doc/addressbook-sdk.qdoc                      |  32 +++++
 .../addressbook-sdk/part3/addressbook.cpp     | 121 ++++++++++++++++++
 .../addressbook-sdk/part3/addressbook.h       |  51 ++++++++
 .../addressbook-sdk/part3/addressbook.ui      |  93 ++++++++++++++
 doc/examples/addressbook-sdk/part3/main.cpp   |  12 ++
 doc/examples/addressbook-sdk/part3/part3.pro  |  16 +++
 .../addressbook-tutorial-part3-linkedlist.png | Bin 0 -> 10209 bytes
 7 files changed, 325 insertions(+)
 create mode 100644 doc/examples/addressbook-sdk/part3/addressbook.cpp
 create mode 100644 doc/examples/addressbook-sdk/part3/addressbook.h
 create mode 100644 doc/examples/addressbook-sdk/part3/addressbook.ui
 create mode 100644 doc/examples/addressbook-sdk/part3/main.cpp
 create mode 100644 doc/examples/addressbook-sdk/part3/part3.pro
 create mode 100644 doc/images/addressbook-tutorial-part3-linkedlist.png

diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc
index 643f6d0b7e4..7514052c0e7 100644
--- a/doc/addressbook-sdk.qdoc
+++ b/doc/addressbook-sdk.qdoc
@@ -418,3 +418,35 @@
     as you like.
 
 */
+
+
+/*!
+    \page tutorials-addressbook-sdk-part3.html
+    \previouspage Address Book 2 - Adding Addresses
+    \contentspage {Address Book Tutorial}{Contents}
+    \nextpage \l{examples/addressbook-sdk/part4}{Chapter 4}
+    \example examples/addressbook-sdk/part3
+    \title Address Book 3 - Navigating between Entries}
+
+    The address book application is now half complete. We need to add some
+    functions to navigate between contacts. But first, we have to decide what
+    sort of a data structure we would like to use to hold these contacts.
+
+    In Chapter 2, we used a QMap of key-value pairs with the contact's name as
+    the \e key, and the contact's address as the \e value. This works well for
+    our case. However, in order to navigate and display each entry, a little
+    bit of enhancement is needed.
+
+    We enhance the QMap by making it replicate a data structure similar to a
+    circularly-linked list, where all elements are connected, including the
+    first element and the last element. The figure below illustrates this data
+    structure;
+
+    \image addressbook-tutorial-part3-linkedlist.png
+
+
+    \section1 Placing Widgets on the Form
+
+    \section1 The AddressBook Class
+
+*/
diff --git a/doc/examples/addressbook-sdk/part3/addressbook.cpp b/doc/examples/addressbook-sdk/part3/addressbook.cpp
new file mode 100644
index 00000000000..06bb6327d5a
--- /dev/null
+++ b/doc/examples/addressbook-sdk/part3/addressbook.cpp
@@ -0,0 +1,121 @@
+#include "addressbook.h"
+#include "ui_addressbook.h"
+
+AddressBook::AddressBook(QWidget *parent)
+    : QWidget(parent), ui(new Ui::AddressBookClass)
+{
+    ui->setupUi(this);
+
+    //! [extract objects]
+    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]
+
+    //! [signal slot]
+    connect(addButton, SIGNAL(clicked()), this,
+                SLOT(addContact()));
+    connect(submitButton, SIGNAL(clicked()), this,
+                SLOT(submitContact()));
+    connect(cancelButton, SIGNAL(clicked()), this,
+                SLOT(cancel()));
+    //! [signal slot]
+
+    //! [window title]
+    setWindowTitle(tr("Simple Address Book"));
+    //! [window title]
+}
+
+AddressBook::~AddressBook()
+{
+    delete ui;
+}
+
+//! [addContact]
+void AddressBook::addContact()
+{
+    oldName = nameLine->text();
+    oldAddress = addressText->toPlainText();
+
+    nameLine->clear();
+    addressText->clear();
+
+    nameLine->setReadOnly(false);
+    nameLine->setFocus(Qt::OtherFocusReason);
+    addressText->setReadOnly(false);
+
+    addButton->setEnabled(false);
+    submitButton->show();
+    cancelButton->show();
+}
+//! [addContact]
+
+//! [submitContact part1]
+void AddressBook::submitContact()
+{
+    QString name = nameLine->text();
+    QString address = addressText->toPlainText();
+
+    if (name == "" || address == "") {
+        QMessageBox::information(this, tr("Empty Field"),
+            tr("Please enter a name and address."));
+        return;
+    }
+//! [submitContact part1]
+
+//! [submitContact part2]
+    if (!contacts.contains(name)) {
+        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));
+        return;
+    }
+//! [submitContact part2]
+
+//! [submitContact part3]
+    if (contacts.isEmpty()) {
+        nameLine->clear();
+        addressText->clear();
+    }
+
+    nameLine->setReadOnly(true);
+    addressText->setReadOnly(true);
+    addButton->setEnabled(true);
+    submitButton->hide();
+    cancelButton->hide();
+}
+//! [submitContact part3]
+
+//! [cancel]
+void AddressBook::cancel()
+{
+    nameLine->setText(oldName);
+    nameLine->setReadOnly(true);
+
+    addressText->setText(oldAddress);
+    addressText->setReadOnly(true);
+
+    addButton->setEnabled(true);
+    submitButton->hide();
+    cancelButton->hide();
+}
+//! [cancel]
diff --git a/doc/examples/addressbook-sdk/part3/addressbook.h b/doc/examples/addressbook-sdk/part3/addressbook.h
new file mode 100644
index 00000000000..86cf5b07bd8
--- /dev/null
+++ b/doc/examples/addressbook-sdk/part3/addressbook.h
@@ -0,0 +1,51 @@
+//! [class definition]
+#ifndef ADDRESSBOOK_H
+#define ADDRESSBOOK_H
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+
+namespace Ui
+{
+    class AddressBookClass;
+}
+
+class AddressBook : public QWidget
+{
+    Q_OBJECT
+
+public:
+    AddressBook(QWidget *parent = 0);
+    ~AddressBook();
+
+//! [slot definition]
+public slots:
+    void addContact();
+    void submitContact();
+    void cancel();
+//! [slot definition]
+
+private:
+    Ui::AddressBookClass *ui;
+
+//! [members1]
+    QPushButton *addButton;
+    QPushButton *submitButton;
+    QPushButton *cancelButton;
+    QLineEdit *nameLine;
+    QTextEdit *addressText;
+//! [members1]
+
+//! [members2]
+    QMap contacts;
+    QString oldName;
+    QString oldAddress;
+//! [members2]
+};
+
+#endif // ADDRESSBOOK_H
+//! [class definition]
diff --git a/doc/examples/addressbook-sdk/part3/addressbook.ui b/doc/examples/addressbook-sdk/part3/addressbook.ui
new file mode 100644
index 00000000000..493d546fc92
--- /dev/null
+++ b/doc/examples/addressbook-sdk/part3/addressbook.ui
@@ -0,0 +1,93 @@
+
+
+ addressbook
+ 
+  
+   
+    0
+    0
+    505
+    326
+   
+  
+  
+   addressbook
+  
+  
+   
+    
+     10
+     20
+     413
+     225
+    
+   
+   
+    
+     
+      
+       Name:
+      
+     
+    
+    
+     
+    
+    
+     
+      
+       Address:
+      
+      
+       Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+      
+     
+    
+    
+     
+    
+    
+     
+      
+       
+        
+         Add
+        
+       
+      
+      
+       
+        
+         Submit
+        
+       
+      
+      
+       
+        
+         Cancel
+        
+       
+      
+      
+       
+        
+         Qt::Vertical
+        
+        
+         
+          20
+          40
+         
+        
+       
+      
+     
+    
+   
+  
+ 
+ 
+ 
+ 
+
diff --git a/doc/examples/addressbook-sdk/part3/main.cpp b/doc/examples/addressbook-sdk/part3/main.cpp
new file mode 100644
index 00000000000..3378b4adce4
--- /dev/null
+++ b/doc/examples/addressbook-sdk/part3/main.cpp
@@ -0,0 +1,12 @@
+//! [main function]
+#include 
+#include "addressbook.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    AddressBook w;
+    w.show();
+    return a.exec();
+}
+//! [main function]
diff --git a/doc/examples/addressbook-sdk/part3/part3.pro b/doc/examples/addressbook-sdk/part3/part3.pro
new file mode 100644
index 00000000000..0bfd2f9e314
--- /dev/null
+++ b/doc/examples/addressbook-sdk/part3/part3.pro
@@ -0,0 +1,16 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2009-06-03T16:54:49
+#
+#-------------------------------------------------
+
+TARGET = part3
+TEMPLATE = app
+
+
+SOURCES += main.cpp\
+        addressbook.cpp
+
+HEADERS  += addressbook.h
+
+FORMS    += addressbook.ui
diff --git a/doc/images/addressbook-tutorial-part3-linkedlist.png b/doc/images/addressbook-tutorial-part3-linkedlist.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7f4725dceb7b9f602d55019e2d39c846d02b859
GIT binary patch
literal 10209
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

literal 0
HcmV?d00001