From 1a351033444ea5bdb1fc754986b5b054dc461e9f Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 18 Apr 2013 11:41:31 +0200 Subject: [PATCH 1/8] Doc: make instructions for adding kits easier to find As the Qt version and compiler are now specified in a kit, and not in build settings any more, the instructions for adding kits, Qt versions, and compilers should be moved up one level, directly under "Configuring Projects". I also added some instructions and links to them in the text. These topics could also go into "Building and Running", but I feel they now fit quite well here. Change-Id: Icdf436a97e824e44a5997f39a105996c5bef05dc Reviewed-by: Tobias Hunger --- .../projects/creator-projects-compilers.qdoc | 2 +- .../creator-projects-settings-build.qdoc | 14 +----- .../creator-projects-settings-overview.qdoc | 43 +++++++++++-------- .../creator-projects-settings-run.qdoc | 2 +- .../projects/creator-projects-targets.qdoc | 2 +- doc/src/qtcreator.qdoc | 8 ++-- 6 files changed, 33 insertions(+), 38 deletions(-) diff --git a/doc/src/projects/creator-projects-compilers.qdoc b/doc/src/projects/creator-projects-compilers.qdoc index 91185f6acf8..7ab2957bc2a 100644 --- a/doc/src/projects/creator-projects-compilers.qdoc +++ b/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 diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc index 09dd42c6d4c..38b66eb5263 100644 --- a/doc/src/projects/creator-projects-settings-build.qdoc +++ b/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 - */ diff --git a/doc/src/projects/creator-projects-settings-overview.qdoc b/doc/src/projects/creator-projects-settings-overview.qdoc index 2441c1e42c6..c4af7d70730 100644 --- a/doc/src/projects/creator-projects-settings-overview.qdoc +++ b/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} - */ diff --git a/doc/src/projects/creator-projects-settings-run.qdoc b/doc/src/projects/creator-projects-settings-run.qdoc index 815aa075436..eff58304f25 100644 --- a/doc/src/projects/creator-projects-settings-run.qdoc +++ b/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 diff --git a/doc/src/projects/creator-projects-targets.qdoc b/doc/src/projects/creator-projects-targets.qdoc index f3e32720f53..553a72467e6 100644 --- a/doc/src/projects/creator-projects-targets.qdoc +++ b/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 diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc index 962f86606d6..dae5b27b97d 100644 --- a/doc/src/qtcreator.qdoc +++ b/doc/src/qtcreator.qdoc @@ -165,12 +165,10 @@ \li \l{Using Version Control Systems} \li \l{Configuring Projects} \list + \li \l{Adding Kits} + \li \l{Adding Qt Versions} + \li \l{Adding Compilers} \li \l{Specifying Build Settings} - \list - \li \l{Adding Kits} - \li \l{Adding Qt Versions} - \li \l{Adding Compilers} - \endlist \li \l{Specifying Run Settings} \li \l{Specifying Editor Settings} \li \l{Specifying Code Style Settings} From fae2052549a8af2143a47813f2f27d2843e8aad4 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Thu, 18 Apr 2013 10:42:12 +0200 Subject: [PATCH 2/8] Set "About Qt Designer plugins..." menu entry role to NoRole This fixes a problem on Mac, where the default menu role is TextHeuristic, and menu item syncing would reassing this entry as "About Qt Creator". Also ProxyAction would not forward the menu role. Task-number: QTBUG-30679 Change-Id: If5ad5fb3a34131c080543bf8160e9ab5140c8585 Reviewed-by: Eike Ziller --- src/libs/utils/proxyaction.cpp | 4 +++- src/plugins/designer/formeditorw.cpp | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/proxyaction.cpp b/src/libs/utils/proxyaction.cpp index 6bf38879dfc..def6ca807a4 100644 --- a/src/libs/utils/proxyaction.cpp +++ b/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()); diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index 7eda1df9f97..4aa5ac8cc05 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -561,7 +561,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, From bd6480394ca8c51f4895ca1165bbfcc5fe54204e Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 18 Apr 2013 10:45:18 +0200 Subject: [PATCH 3/8] README: Fix product description Qt Creator is also a QtScript/QML IDE since a while. Change-Id: I046da1478e92e45eed7e5cccb1888a3b30b00faa Reviewed-by: Leena Miettinen Reviewed-by: Eike Ziller --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index f93fe62fe3f..d92d5b25283 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ 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 =================== From 7802868f50691fc9de4ca7533afc646414a5b405 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 18 Apr 2013 11:35:21 +0200 Subject: [PATCH 4/8] README: Update botan license Change-Id: I7c0865e25083576101de17ba1c49ddae4d67e585 Reviewed-by: Christian Kandeler Reviewed-by: Leena Miettinen --- README | 69 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/README b/README index d92d5b25283..214ee7798b5 100644 --- a/README +++ b/README @@ -209,45 +209,50 @@ 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. - Copyright (C) 1999-2009 Jack Lloyd - 2001 Peter J Jones - 2004-2007 Justin Karneges - 2005 Matthew Gregan - 2005-2006 Matt Johnston - 2006 Luca Piccarreta - 2007 Yves Jerschow - 2007-2008 FlexSecure GmbH - 2007-2008 Technische Universitat Darmstadt - 2007-2008 Falko Strenzke - 2007-2008 Martin Doering - 2007 Manuel Hartl - 2007 Christoph Ludwig - 2007 Patrick Sona + Botan (http://botan.randombit.net/) is distributed under these terms:: + + 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 + 2007 Yves Jerschow + 2007-2008 FlexSecure GmbH + 2007-2008 Technische Universitat Darmstadt + 2007-2008 Falko Strenzke + 2007-2008 Martin Doering + 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, - this list of conditions, and the following disclaimer. + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions, and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions, and the following disclaimer in the documentation - and/or other materials provided with the distribution. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions, and the following disclaimer in the + documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) "AS IS" AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED. IN NO - EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) "AS IS" AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + 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 From cdc8d02d129aeb484e2b7fdb71473ffd404bec06 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 18 Apr 2013 10:49:34 +0200 Subject: [PATCH 5/8] README: Update Supported Platforms Be explicit that the supported platforms are only valid for the standalone (non Qt5) packages. Also update minimum Mac version to 10.6, and simplify Windows versions section. Change-Id: Ie9d001eec4e6d5dd1ade7d54a1fc75ac0bb4d741 Reviewed-by: Leena Miettinen Reviewed-by: Eike Ziller --- README | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 214ee7798b5..05af13c916d 100644 --- a/README +++ b/README @@ -4,11 +4,11 @@ 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 -(K)Ubuntu Linux 8.04 (32-bit and 64-bit) or later -Mac OS 10.5 or later +Windows XP SP2 or later +(K)Ubuntu Linux 10.04 (32-bit and 64-bit) or later +Mac OS 10.6 or later Building the sources requires Qt 4.8.0 or later. From a5b503f663b19888c93d89f2d96fb2d2d08e4f20 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 18 Apr 2013 10:58:50 +0200 Subject: [PATCH 6/8] README: Simplify Compiling prerequisites The actual compiler versions e.g. actually depend on Qt, not Qt Creator. Change-Id: I04ea7c5d94ef445ea54a91ea9c463851fddce2c1 Reviewed-by: Leena Miettinen Reviewed-by: Eike Ziller --- README | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index 05af13c916d..cd20f5b7b12 100644 --- a/README +++ b/README @@ -15,14 +15,14 @@ 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 2.5 or later, compiling on 10.4 requires setting the - environment variable QTC_TIGER_COMPAT before running qmake + * On Mac: Xcode + +The installed toolchains have to match the one Qt was compiled with. You can build Qt Creator with From af57639847f1ec93031991748e6dfedd963a6603 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 18 Apr 2013 11:29:37 +0200 Subject: [PATCH 7/8] README: Update Windows section We don't recommend Qt 4.7 any more, Qt 4.8 is minimum. Change-Id: I66dde5b7012b82380d77aab658d5e3591f30c768 Reviewed-by: Leena Miettinen Reviewed-by: Friedemann Kleint --- README | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README b/README index cd20f5b7b12..e932975046a 100644 --- a/README +++ b/README @@ -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 - produces insufficient debugging information, and therefore, we - recommend that you use gcc 4.4 for debugging. + - For a MinGW toolchain for Qt 4, see http://www.mingw.org. For a MinGW + toolchain for Qt 5, see http://mingwbuilds.sourceforge.net. - For Microsoft Visual C++, install the Windows SDK and the "Debugging Tools for Windows" from the SDK image. We strongly recommend using the From 3110c28cc11eeaab2ac796a21a51f61263308c87 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 19 Apr 2013 08:44:23 +0200 Subject: [PATCH 8/8] Revert "Fix building treeviewfind test." That shouldn't have gone into 2.7... This reverts commit 4647cb77d30e0a991faea197e8eba4fcec0d27a9. Change-Id: I4abfc8120d7c3d5a6b9e11d212f955cd66ba01a5 Reviewed-by: Eike Ziller --- tests/auto/treeviewfind/treeviewfind.pro | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/auto/treeviewfind/treeviewfind.pro b/tests/auto/treeviewfind/treeviewfind.pro index f2f6250a15e..00aa98ae5d2 100644 --- a/tests/auto/treeviewfind/treeviewfind.pro +++ b/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