Merge remote-tracking branch 'origin/2.7'

README

@@ -1,28 +1,28 @@
 Qt Creator
 ==========
-Qt Creator is a cross-platform C++ IDE for development with the Qt framework.
+Qt Creator is a cross-platform IDE for development with the Qt framework.
 
 Supported Platforms
 ===================
-The binary packages support the following platforms:
+The standalone binary packages support the following platforms:
 
-Windows 7, Windows XP SP2, Windows Vista
+Windows XP SP2 or later
-(K)Ubuntu Linux 8.04 (32-bit and 64-bit) or later
+(K)Ubuntu Linux 10.04 (32-bit and 64-bit) or later
-Mac OS 10.5 or later
+Mac OS 10.6 or later
 
 Building the sources requires Qt 4.8.0 or later.
 
 Compiling Qt Creator
 ====================
 Prerequisites:
-   * Qt 4.8.0
+   * Qt 4.8.0 or later
    * On Windows:
      -  ActiveState Active Perl
-     -  MinGW 4.4 or later, Visual Studio 2008 or later
+     -  MinGW or Visual Studio
      -  jom
-     The Qt SDK provides you with most of the required software.
+   * On Mac: Xcode
-   * On Mac: XCode 2.5 or later, compiling on 10.4 requires setting the
+
-     environment variable QTC_TIGER_COMPAT before running qmake
+The installed toolchains have to match the one Qt was compiled with.
 
 You can build Qt Creator with
 
@@ -83,13 +83,13 @@ SDK (release builds of Qt using MinGW and Visual C++ 2008).
        for example, c:\work. If you plan to use MinGW and Microsoft Visual
        Studio simultaneously or mix different Qt versions, we recommend
        creating a directory structure which reflects that. For example:
-       C:\work\qt4.7.1-vs10, C:\work\qt4.7.2-mingw.
+       C:\work\qt4.8.1-vs10, C:\work\qt4.8.4-mingw.
 
    4.  Download and install Perl from http://www.activestate.com/activeperl
        and check that perl.exe is added to the path.
 
    5.  In the working directory, check out the respective branch of Qt
-       (we recommend 4.7; see http://qt.gitorious.org/qt).
+       (we recommend 4.8; see http://qt.gitorious.org/qt).
 
    6.  Check out Qt Creator (master branch, see
        http://qt.gitorious.org/qt-creator).
@@ -97,9 +97,8 @@ SDK (release builds of Qt using MinGW and Visual C++ 2008).
        directory.
 
    7.  Install a compiler:
-       - For MinGW (4.4 onwards), see http://www.mingw.org/. Note that gcc 4.5
+       - For a MinGW toolchain for Qt 4, see http://www.mingw.org. For a MinGW
-         produces insufficient debugging information, and therefore, we
+         toolchain for Qt 5, see http://mingwbuilds.sourceforge.net.
-         recommend that you use gcc 4.4 for debugging.
 
        - For Microsoft Visual C++, install the Windows SDK and the "Debugging
          Tools for Windows" from the SDK image. We strongly recommend using the
@@ -209,12 +208,14 @@ we thank the authors who made this possible:
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-* Botan, a C++ crypto library. Version 1.8.8
+* Botan, a C++ crypto library. Version 1.10.2
 
-  Copyright (C) 1999-2004 The Botan Project. All rights reserved.
+  Botan (http://botan.randombit.net/) is distributed under these terms::
-  Copyright (C) 1999-2009 Jack Lloyd
+
+  Copyright (C) 1999-2011 Jack Lloyd
                 2001 Peter J Jones
                 2004-2007 Justin Karneges
+                2004 Vaclav Ovsik
                 2005 Matthew Gregan
                 2005-2006 Matt Johnston
                 2006 Luca Piccarreta
@@ -226,28 +227,31 @@ we thank the authors who made this possible:
                 2007 Manuel Hartl
                 2007 Christoph Ludwig
                 2007 Patrick Sona
+                2010 Olivier de Gaalon
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
+  modification, are permitted provided that the following conditions are
+  met:
 
-  1. Redistributions of source code must retain the above copyright notice,
+  1. Redistributions of source code must retain the above copyright
-  this list of conditions, and the following disclaimer.
+  notice, this list of conditions, and the following disclaimer.
 
-  2. Redistributions in binary form must reproduce the above copyright notice,
+  2. Redistributions in binary form must reproduce the above copyright
-  this list of conditions, and the following disclaimer in the documentation
+  notice, this list of conditions, and the following disclaimer in the
-  and/or other materials provided with the distribution.
+  documentation and/or other materials provided with the distribution.
 
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) "AS IS" AND ANY EXPRESS OR IMPLIED
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) "AS IS" AND ANY EXPRESS OR
-  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED. IN NO
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE,
-  EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE FOR ANY DIRECT,
+  ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE
-  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
   The source code of Botan C++ crypto library can be found in
   QtCreator/src/libs/3rdparty

doc/src/projects/creator-projects-compilers.qdoc

@@ -26,7 +26,7 @@
     \contentspage index.html
     \previouspage creator-project-qmake.html
     \page creator-tool-chains.html
-    \nextpage creator-run-settings.html
+    \nextpage creator-build-settings.html
 
     \title Adding Compilers
 

doc/src/projects/creator-projects-settings-build.qdoc

@@ -24,9 +24,9 @@
 
 /*!
     \contentspage index.html
-    \previouspage creator-configuring-projects.html
+    \previouspage creator-tool-chains.html
     \page creator-build-settings.html
-    \nextpage creator-targets.html
+    \nextpage creator-run-settings.html
 
     \title Specifying Build Settings
 
@@ -192,14 +192,4 @@
     compilers and tools need. Therefore, the environment is never totally empty,
     even after you clear it.
 
-    \section1 Related Topics
-
-    \list
-
-        \li \l{Adding Kits}
-        \li \l{Adding Qt Versions}
-        \li \l{Adding Compilers}
-
-    \endlist
-
 */

doc/src/projects/creator-projects-settings-overview.qdoc

@@ -26,7 +26,7 @@
     \contentspage index.html
     \previouspage creator-version-control.html
     \page creator-configuring-projects.html
-    \nextpage creator-build-settings.html
+    \nextpage creator-targets.html
 
     \title Configuring Projects
 
@@ -41,11 +41,34 @@
     open projects and use the \gui Build menu commands to build, deploy, and
     run projects.
 
+    \section1 Selecting Kits
+
+    \image qtcreator-project-targets.png
+
+    To add kits for the project, select \gui {Add Kit}. The list displays kits
+    that are configured in \gui Tools > \gui Options > \gui {Build & Run} >
+    \gui Kits. To add kits to the list, select \gui {Manage Kits}.
+    For more information about adding kits, see \l{Adding Kits}.
+
+    Each kit consists of a set of values that define one environment, such as a
+    device, compiler, and Qt version. For more information, see
+    \l{Adding Qt Versions} and \l{Adding Compilers}.
+
+    To copy the build and run settings for a kit to another kit, select
+    \gui {Copy to Kit} in the kit menu.
+
+    To change the kit, while preserving the build and run settings, select
+    \gui {Change Kit}.
+
+    To remove a kit, select \gui {Remove Kit}.
+
+    \section1 Specifying Settings
+
     The project pane consists of the following tabs:
 
     \list
 
-        \li \l{Adding Kits}{Build & Run}
+        \li Build & Run
 
             \list
 
@@ -73,20 +96,4 @@
     If you have multiple projects open in \QC, use the tabs at the top of the
     window to navigate between their settings.
 
-    \section1 Selecting Kits
-
-    \image qtcreator-project-targets.png
-
-    To add kits for the project, select \gui {Add Kit}. The list displays kits
-    that are configured in \gui Tools > \gui Options > \gui {Build & Run} >
-    \gui Kits. To add kits to the list, select \gui {Manage Kits}.
-
-    To copy the build and run settings for a kit to another kit, select
-    \gui {Copy to Kit} in the kit menu.
-
-    To change the kit, while preserving the build and run settings, select
-    \gui {Change Kit}.
-
-    To remove a kit, select \gui {Remove Kit}
-
 */

doc/src/projects/creator-projects-settings-run.qdoc

@@ -24,7 +24,7 @@
 
 /*!
     \contentspage index.html
-    \previouspage creator-tool-chains.html
+    \previouspage creator-build-settings.html
     \page creator-run-settings.html
     \nextpage creator-editor-settings.html
 

doc/src/projects/creator-projects-targets.qdoc

@@ -24,7 +24,7 @@
 
 /*!
     \contentspage index.html
-    \previouspage creator-build-settings.html
+    \previouspage creator-configuring-projects.html
     \page creator-targets.html
     \nextpage creator-project-qmake.html
 

doc/src/qtcreator.qdoc

@@ -164,13 +164,11 @@
             \endlist
             \li \l{Using Version Control Systems}
             \li \l{Configuring Projects}
-            \list
-                \li \l{Specifying Build Settings}
             \list
                 \li \l{Adding Kits}
                 \li \l{Adding Qt Versions}
                 \li \l{Adding Compilers}
-                \endlist
+                \li \l{Specifying Build Settings}
                 \li \l{Specifying Run Settings}
                 \li \l{Specifying Editor Settings}
                 \li \l{Specifying Code Style Settings}

src/libs/utils/proxyaction.cpp

@@ -120,8 +120,10 @@ void ProxyAction::update(QAction *action, bool initialize)
         return;
     disconnectAction();
     disconnect(this, SIGNAL(changed()), this, SLOT(updateToolTipWithKeySequence()));
-    if (initialize)
+    if (initialize) {
         setSeparator(action->isSeparator());
+        setMenuRole(action->menuRole());
+    }
     if (hasAttribute(UpdateIcon) || initialize) {
         setIcon(action->icon());
         setIconText(action->iconText());

src/plugins/designer/formeditorw.cpp

@@ -553,7 +553,8 @@ void FormEditorW::setupActions()
     addToolAction(actionFormSettings, m_contexts, Core::Id("FormEditor.FormSettings"), mformtools);
 
     mformtools->addSeparator(m_contexts);
-    m_actionAboutPlugins = new QAction(tr("About Qt Designer plugins...."), this);
+    m_actionAboutPlugins = new QAction(tr("About Qt Designer plugins..."), this);
+    m_actionAboutPlugins->setMenuRole(QAction::NoRole);
     addToolAction(m_actionAboutPlugins, m_contexts,
                    Core::Id("FormEditor.AboutPlugins"), mformtools);
     connect(m_actionAboutPlugins,  SIGNAL(triggered()), m_fwm,

tests/auto/treeviewfind/treeviewfind.pro

@@ -1,7 +1,8 @@
-QTC_PLUGIN_DEPENDS += find
 include(../qttest.pri)
 
-LIBS *= -L$$IDE_PLUGIN_PATH/QtProject
+include($$IDE_SOURCE_TREE/src/plugins/find/find.pri)
+
+LIBS *= -L$$IDE_LIBRARY_PATH/QtProject
 
 SOURCES += \
     tst_treeviewfind.cpp