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

doc/qtcreator.qdoc

@@ -788,31 +788,31 @@
     \table
         \row
             \i \bold{Note:}
-            \i  Gdb, and therefore Qt Creator's debugger works for optimized builds
-    on Linux and Mac OS X. However, optimization may lead to re-ordering of
-    instructions or sometimes even complete removal of some local variables.
-    In this case, the \gui{Locals and Watchers} view may show unexpected data.
+
+            \i  Gdb, and therefore Qt Creator's debugger works for optimized
+                builds on Linux and Mac OS X. However, optimization may lead
+                to re-ordering of instructions or sometimes even complete
+                removal of some local variables. In this case, the
+                \gui{Locals and Watchers} view may show unexpected data.
+
+            \i  The debug information provided by gcc does not include enough
+                information about the time when a variable is initialized.
+                Qt Creator therefore can not tell whether the contents of a
+                local variable contains "real data", or "initial noise". If a
+                QObject appears uninitialized, its value will be reported as
+                "out of scope". However, not all uninitialized objects can be
+                recognized as such.
     \endtable
 
-    \note 
-   
-    \bold{Note:} The debug information provided by gcc does not include 
-    enough information about the time at which a variable is initialized.
-    Qt Creator therefore can not tell whether the contents of a local
-    variable contains "real data", or "initial noise". If an QObject
-    appears uninitialized, its value will be reported as "out of scope".
-    Not all uninitialized objects can be recognized as such, though.
-
-    The \gui{Locals and Watchers View} also gives accesst to the most powerful
-    feature of the Qt Creator Debugger: The comprehensive display of data
-    of objects of some of Qt's basic classes.
-
-    To start using that feature, select \gui{Debug} and \gui{Use Custom
-    Display for Qt Objects}. The \gui{Locals and Watchers View} will
-    be re-organized to give a more high-level view of the objects
-    in question. So instead of displaying a pointer to some private
-    data structure in case of QObject, a list of children, signals
-    and slots will be shown. 
+
+    The \gui{Locals and Watchers} view also provides access to the most
+    powerful feature of the debugger: comprehensive display of data belonging
+    to Qt's basic objects. To enable this feature, select \gui{Use Custom
+    Display for Qt Objects} from the \gui Debug menu.The
+    \gui{Locals and Watchers} view will be re-organized to provide a high-level
+    view of the objects. For example, in case of QObject, instead of displaying
+    a pointer to some private data structure, you will see a list of children,
+    signals and slots.
 
     Similarily, instead of showing a bunch of pointers and ints,
     a QHash or QMap will display its contents in an orderly fashion,

shared/help/helpviewer.cpp

@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#if defined(USE_WEBKIT)
+#if !defined(QT_NO_WEBKIT)
 
 class HelpNetworkReply : public QNetworkReply
 {

shared/help/helpviewer.h

@@ -39,7 +39,7 @@
 #include <QtGui/QTextBrowser>
 #include <QtGui/QAction>
 
-#if defined(USE_WEBKIT)
+#if !defined(QT_NO_WEBKIT)
 #include <QWebView>
 #endif
 
@@ -54,7 +54,7 @@ class QKeyEvent;
 class QMouseEvent;
 class QContextMenuEvent;
 
-#if defined(USE_WEBKIT)
+#if !defined(QT_NO_WEBKIT)
 
 class HelpViewer : public QWebView
 {

src/plugins/coreplugin/coreplugin.cpp

@@ -41,7 +41,7 @@
 #include "fileiconprovider.h"
 
 #include <QtCore/qplugin.h>
-#ifdef QT_WEBKIT
+#if !defined(QT_NO_WEBKIT)
 #include <QtGui/QApplication>
 #include <QtWebKit/QWebSettings>
 #endif
@@ -75,7 +75,7 @@ bool CorePlugin::initialize(const QStringList & /*arguments*/, QString *error_me
     m_pm = ExtensionSystem::PluginManager::instance();
     const bool success = m_mainWindow->init(m_pm, error_message);
     if (success) {
-#ifdef QT_WEBKIT
+#if !defined(QT_NO_WEBKIT)
         QWebSettings *webSettings = QWebSettings::globalSettings();
         const QFont applicationFont = QApplication::font();
         webSettings->setFontFamily(QWebSettings::StandardFont, applicationFont.family());

src/plugins/coreplugin/coreplugin.pro

@@ -163,7 +163,6 @@ FORMS += dialogs/newdialog.ui \
 RESOURCES += core.qrc \
     fancyactionbar.qrc
 
-contains(QT_CONFIG, webkit): {
+contains(QT_CONFIG, webkit) {
     QT += webkit
-    DEFINES += QT_WEBKIT
 }

src/plugins/coreplugin/welcomemode.cpp

@@ -36,7 +36,7 @@
 #include "coreimpl.h"
 #include "modemanager.h"
 
-#ifdef QT_WEBKIT
+#if !defined(QT_NO_WEBKIT)
 #include <QtWebKit/QWebView>
 #include <QtGui/QApplication>
 #include <QtCore/QFileInfo>
@@ -69,7 +69,7 @@ struct WelcomeModePrivate {
     WelcomeModePrivate();
 
     QWidget *m_widget;
-#ifdef QT_WEBKIT
+#if !defined(QT_NO_WEBKIT)
     QWebView *m_webview;
 #else
     QLabel *m_label;
@@ -85,7 +85,7 @@ struct WelcomeModePrivate {
 
 WelcomeModePrivate::WelcomeModePrivate() :
     m_widget(new QWidget),
-#ifdef QT_WEBKIT
+#if !defined(QT_NO_WEBKIT)
     m_webview(new QWebView),
 #else
     m_label(new QLabel),
@@ -97,7 +97,7 @@ WelcomeModePrivate::WelcomeModePrivate() :
 {
 }
 
-#ifndef QT_WEBKIT
+#if defined(QT_NO_WEBKIT)
 
 const char *LABEL = "<center><table><tr><td><img src=\":/qworkbench/html/images/product_logo.png\"/></td><td width=300>"
                     "<h2><br/><br/>Welcome</h2><p> Qt Creator is an intuitive, modern cross platform IDE that enables "
@@ -142,7 +142,7 @@ WelcomeMode::WelcomeMode() :
     l->setMargin(0);
     l->setSpacing(0);
     l->addWidget(new QToolBar(m_d->m_widget));
-#ifdef QT_WEBKIT
+#if !defined(QT_NO_WEBKIT)
     connect(m_d->m_webview, SIGNAL(linkClicked(QUrl)), this, SLOT(linkClicked(QUrl)));
 
     WelcomePageData welcomePageData;
@@ -199,7 +199,7 @@ void WelcomeMode::updateWelcomePage(const WelcomePageData &welcomePageData)
 {
 // should really only modify the DOM tree
 
-#ifndef QT_WEBKIT
+#if defined(QT_NO_WEBKIT)
     Q_UNUSED(welcomePageData);
 #else
 

src/plugins/cpptools/rpp/pp-fwd.h

-/***************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact:  Qt Software Information (qt-info@nokia.com)
-**
-** 
-** Non-Open Source Usage  
-** 
-** Licensees may use this file in accordance with the Qt Beta Version
-** License Agreement, Agreement version 2.2 provided with the Software or,
-** alternatively, in accordance with the terms contained in a written
-** agreement between you and Nokia.  
-** 
-** GNU General Public License Usage 
-** 
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the packaging
-** of this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-**
-** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
-** 
-***************************************************************************/
-/*
-  Copyright 2005 Roberto Raggi <roberto@kdevelop.org>
-
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  KDEVELOP TEAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef PP_FWD_H
-#define PP_FWD_H
-
-namespace rpp {
-
-} // namespace rpp
-
-#endif // PP_FWD_H
-
-// kate: space-indent on; indent-width 2; replace-tabs on;

src/plugins/cpptools/rpp/pp-internal.h

@@ -60,27 +60,6 @@ namespace rpp {
     namespace _PP_internal
     {
 
-        inline void output_line(const QByteArray &__filename, int __line, QByteArray *__result)
-        {
-            QByteArray __msg;
-
-            __msg += "# ";
-
-            char __line_descr[16];
-            qsnprintf (__line_descr, 16, "%d", __line);
-            __msg += __line_descr;
-
-            __msg += " \"";
-
-            if (__filename.isEmpty ())
-                __msg += "<editor>";
-            else
-                __msg += __filename;
-
-            __msg += "\"\n";
-            __result->append(__msg);
-        }
-
         inline bool comment_p (const char *__first, const char *__last)
         {
             if (__first == __last)

src/plugins/cpptools/rpp/pp-symbol.h

-/***************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact:  Qt Software Information (qt-info@nokia.com)
-**
-** 
-** Non-Open Source Usage  
-** 
-** Licensees may use this file in accordance with the Qt Beta Version
-** License Agreement, Agreement version 2.2 provided with the Software or,
-** alternatively, in accordance with the terms contained in a written
-** agreement between you and Nokia.  
-** 
-** GNU General Public License Usage 
-** 
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the packaging
-** of this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-**
-** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
-** 
-***************************************************************************/
-/*
-  Copyright 2005 Roberto Raggi <roberto@kdevelop.org>
-
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  KDEVELOP TEAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-

src/plugins/cpptools/rpp/pp.h

@@ -53,18 +53,11 @@
 #ifndef PP_H
 #define PP_H
 
-#if defined(_WIN64) || defined(WIN64) || defined(__WIN64__) \
-    || defined(_WIN32) || defined(WIN32) || defined(__WIN32__)
-#  define PP_OS_WIN
-#endif
-
 #include <cassert>
 #include <cstring>
 #include <cctype>
 
-#include "pp-fwd.h"
 #include "pp-cctype.h"
-#include "pp-symbol.h"
 #include "pp-internal.h"
 #include "pp-macro.h"
 #include "pp-environment.h"

src/plugins/cpptools/rpp/rpp.pri

@@ -4,12 +4,10 @@ INCLUDEPATH += $$PWD
 HEADERS += $$PWD/pp-cctype.h \
            $$PWD/pp-engine.h \
            $$PWD/pp-environment.h \
-           $$PWD/pp-fwd.h \
            $$PWD/pp-internal.h \
            $$PWD/pp-macro-expander.h \
            $$PWD/pp-macro.h \
            $$PWD/pp-scanner.h \
-           $$PWD/pp-symbol.h \
            $$PWD/pp.h \
            $$PWD/pp-client.h
 

src/plugins/help/centralwidget.cpp

@@ -296,7 +296,7 @@ void CentralWidget::print()
     initPrinter();
 
     QPrintDialog *dlg = new QPrintDialog(printer, this);
-#if !defined(USE_WEBKIT)
+#if defined(QT_NO_WEBKIT)
     if (viewer->textCursor().hasSelection())
         dlg->addEnabledOption(QAbstractPrintDialog::PrintSelection);
 #endif
@@ -414,7 +414,7 @@ HelpViewer *CentralWidget::newEmptyTab()
     HelpViewer* viewer = new HelpViewer(helpEngine, this);
     viewer->installEventFilter(this);
     viewer->setFocus(Qt::OtherFocusReason);
-#if !defined(USE_WEBKIT)
+#if defined(QT_NO_WEBKIT)
     viewer->setDocumentTitle(tr("unknown"));
 #endif
     tabWidget->setCurrentIndex(tabWidget->addTab(viewer, tr("unknown")));
@@ -465,7 +465,7 @@ void CentralWidget::setTabTitle(const QUrl& url)
     int tab = lastTabPage;
     HelpViewer* viewer = currentHelpViewer();
 
-#if defined(USE_WEBKIT)
+#if !defined(QT_NO_WEBKIT)
     if (!viewer || viewer->source() != url) {
         QTabBar *tabBar = qFindChild<QTabBar*>(tabWidget);
         for (tab = 0; tab < tabBar->count(); ++tab) {
@@ -611,7 +611,7 @@ bool CentralWidget::find(const QString &txt, QTextDocument::FindFlags findFlags,
 {
     HelpViewer* viewer = currentHelpViewer();
 
-#if defined(USE_WEBKIT)
+#if !defined(QT_NO_WEBKIT)
     Q_UNUSED(incremental);
     if (viewer) {
         QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;

src/plugins/help/help.pro

@@ -30,7 +30,7 @@ FORMS += docsettingspage.ui \
     filtersettingspage.ui
 RESOURCES += help.qrc
 include(../../../shared/help/help.pri)
-contains(QT_CONFIG, webkit) { 
-    DEFINES += USE_WEBKIT
+
+contains(QT_CONFIG, webkit) {
     QT += webkit
 }

src/plugins/help/helpfindsupport.cpp

@@ -54,7 +54,7 @@ QString HelpFindSupport::currentFindString() const
     HelpViewer* viewer = m_centralWidget->currentHelpViewer();
     if (!viewer)
         return QString();
-#if defined(USE_WEBKIT)
+#if !defined(QT_NO_WEBKIT)
     return viewer->selectedText();
 #else
     return viewer->textCursor().selectedText();