Merge remote-tracking branch 'origin/4.7'

Change-Id: I441f2b093992fcc7af29541681206bd3175614e3
This commit is contained in:
Eike Ziller
2018-07-18 12:03:08 +02:00
6 changed files with 208 additions and 35 deletions

11
dist/changes-4.7.0.md vendored
View File

@@ -20,6 +20,7 @@ General
* Added option to show folders on top (QTCREATORBUG-7818)
* Made synchronization of root directory with current document optional
(QTCREATORBUG-19322)
* Fixed that external tools did not expand variables for environment changes
Editing
@@ -51,6 +52,7 @@ All Projects
(QTCREATORBUG-19625)
* Added global option for `Add linker library search paths to run environment`
(QTCREATORBUG-20240)
* Added `%{CurrentBuild:Env}` Qt Creator variable
QMake Projects
@@ -58,6 +60,8 @@ QMake Projects
* Added deployment rules for devices to widget and console application wizards
(QTCREATORBUG-20358)
* Fixed that arguments for QMake step did not expand variables
* Fixed `lupdate` and `lrelease` external tools for Qt 5.9 and later
(QTCREATORBUG-19892)
C++ Support
@@ -102,11 +106,13 @@ Python Support
Debugging
* Fixed updating of memory view
* Added `Leave Debug Mode` button to toolbar
* Fixed updating of memory view
* Fixed issue with restoring debugger views (QTCREATORBUG-20721)
* QML
* Added support for nested properties (QTBUG-68474)
* Fixed issue with different endianness (QTBUG-68721)
* Fixed Qt namespace detection with GDB 8 (QTCREATORBUG-19620)
Qt Quick Designer
@@ -148,6 +154,8 @@ Test Integration
* Qt Quick
* Fixed parsing issue with non-ASCII characters (QTCREATORBUG-20105)
* Fixed detection of test name (QTCREATORBUG-20642)
* Fixed detection when `quick_test_main()` is used directly
(QTCREATORBUG-20746)
Welcome
@@ -212,6 +220,7 @@ Przemyslaw Gorszkowski
Razi Alavizadeh
Robert Löhning
Rune Espeseth
scootergrisen
Sergey Belyashov
Sergey Morozov
Tasuku Suzuki

View File

@@ -51,9 +51,9 @@
Copyright (C) 2011-2012 Andrzej Krzemienski
Distributed under the Boost Software License, Version 1.0
(see accompanying file LICENSE_1_0.txt or a copy at
http://www.boost.org/LICENSE_1_0.txt)
Distributed under the \l {http://boost.org/LICENSE_1_0.txt}
{Boost Software License, Version 1.0}.
(See accompanying file LICENSE_1_0.txt)
The idea and interface is based on Boost.Optional library
authored by Fernando Luis Cacciola Carballal
@@ -70,8 +70,9 @@
Copyright Michael Park, 2015-2017
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
Distributed under the \l {http://boost.org/LICENSE_1_0.txt}
{Boost Software License, Version 1.0}.
(See accompanying file LICENSE.md.)
The source code can be found here:
\list
@@ -106,19 +107,19 @@
\li 2007 Patrick Sona
\endlist
All rights reserved.\br\br
\code
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:\br\br
met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions, and the following disclaimer.\br\br
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.\br
\br
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
@@ -130,7 +131,9 @@
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.\br\br
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\endcode
The source code of Botan C++ crypto library can be found
here:
\list
@@ -138,27 +141,37 @@
\li \l{https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/src/libs/3rdparty}
\endlist
\li \b{ANGLE (Windows)}
\li \b{ANGLE Library (Windows)}
Copyright (C) 2002-2013 The ANGLE Project Authors.\br
All rights reserved.\br\br
Used on Windows to implement OpenGL ES on top of DirectX.
The source code of ANGLE is part of the Qt libraries. For more
information about the licenses used in Qt GUI, see
\l{https://doc.qt.io/qt-5.9/licenses-used-in-qt.html#qt-gui}{Qt GUI}.
\l{https://spdx.org/licenses/BSD-3-Clause.html}
{BSD 3-clause "New" or "Revised" License}
\code
Copyright (C) 2002-2013 The ANGLE Project Authors.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:\br\br
are met:
Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.\br\br\
Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
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.\br\br
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.
Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
Ltd., nor the names of their contributors may be used to endorse
or promote products derived from this software without specific
prior written permission.\br\br
Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
Ltd., nor the names of their contributors may be used to endorse
or promote products derived from this software without specific
prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -171,10 +184,8 @@
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.\br\br
The source code of ANGLE is part of the Qt libraries.
\br\br
POSSIBILITY OF SUCH DAMAGE.
\endcode
\li \b{SQLite, an embedded database. Version 3.8.10.2}\br\br
@@ -195,5 +206,158 @@
Copyright (C) 2010-2015 three.js authors\br
share/qtcreator/templates/wizards/projects/qmake/qtcanvas3dapplication
\li \b{OpenSSL toolkit. Version 1.0.2j}
The OpenSSL toolkit stays under a double license, i.e. both the conditions of
the OpenSSL License and the original SSLeay license apply to the toolkit.
See below for the actual license texts.
\code
OpenSSL License
====================================================================
Copyright (c) 1998-2018 The OpenSSL Project. All rights reserved.
Redistribution and use in source and binary forms, with or without
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.
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.
3. All advertising materials mentioning features or use of this
software must display the following acknowledgment:
"This product includes software developed by the OpenSSL Project
for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
endorse or promote products derived from this software without
prior written permission. For written permission, please contact
openssl-core@openssl.org.
5. Products derived from this software may not be called "OpenSSL"
nor may "OpenSSL" appear in their names without prior written
permission of the OpenSSL Project.
6. Redistributions of any form whatsoever must retain the following
acknowledgment:
"This product includes software developed by the OpenSSL Project
for use in the OpenSSL Toolkit (http://www.openssl.org/)"
THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
EXPRESSED 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 OpenSSL PROJECT OR
ITS CONTRIBUTORS 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 product includes cryptographic software written by Eric Young
(eay@cryptsoft.com). This product includes software written by Tim
Hudson (tjh@cryptsoft.com).
Original SSLeay License
=======================
Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
All rights reserved.
This package is an SSL implementation written
by Eric Young (eay@cryptsoft.com).
The implementation was written so as to conform with Netscapes SSL.
This library is free for commercial and non-commercial use as long as
the following conditions are aheared to. The following conditions
apply to all code found in this distribution, be it the RC4, RSA,
lhash, DES, etc., code; not just the SSL code. The SSL documentation
included with this distribution is covered by the same copyright terms
except that the holder is Tim Hudson (tjh@cryptsoft.com).
Copyright remains Eric Young's, and as such any Copyright notices in
the code are not to be removed.
If this package is used in a product, Eric Young should be given attribution
as the author of the parts of the library used.
This can be in the form of a textual message at program startup or
in documentation (online or textual) provided with the package.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the 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.
3. All advertising materials mentioning features or use of this software
must display the following acknowledgement:
"This product includes cryptographic software written by
Eric Young (eay@cryptsoft.com)"
The word 'cryptographic' can be left out if the rouines from the library
being used are not cryptographic related :-).
4. If you include any Windows specific code (or a derivative thereof) from
the apps directory (application code) you must include an acknowledgement:
"This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 OR CONTRIBUTORS 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 licence and distribution terms for any publically available version or
derivative of this code cannot be changed. i.e. this code cannot simply be
copied and put under another distribution licence
[including the GNU Public Licence.]
\endcode
\li \b{Mesa LLVMPipe, 3D graphics library}
Mesa is a 3D graphics library with an API which is very similar to that
of OpenGL. The llvmpipe software renderer enables the running of OpenGL
applications without any hardware or driver support.
Mesa is shipped as part of the binary packages for Windows
(opengl32sw.dll).
\l{https://spdx.org/licenses/MIT.html}{MIT License}:
\code
Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
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
BRIAN PAUL 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.
\endcode
\endlist
*/

View File

@@ -133,9 +133,9 @@ class PlainDumper:
def __call__(self, d, value):
try:
printer = self.printer.gen_printer(value)
printer = self.printer.gen_printer(value.nativeValue)
except:
printer = self.printer.invoke(value)
printer = self.printer.invoke(value.nativeValue)
lister = getattr(printer, 'children', None)
children = [] if lister is None else list(lister())
d.putType(self.printer.name)

View File

@@ -64,7 +64,7 @@ const char * const IDE_SETTINGSVARIANT_STR = \"QtProject\";
#ifdef IDE_COPY_SETTINGS_FROM_VARIANT
const char * const IDE_COPY_SETTINGS_FROM_VARIANT_STR = STRINGIFY(IDE_COPY_SETTINGS_FROM_VARIANT);
#else
const char * const IDE_COPY_SETTINGS_FROM_VARIANT_STR = \"Nokia\";
const char * const IDE_COPY_SETTINGS_FROM_VARIANT_STR = \"\";
#endif
#undef IDE_VERSION_DISPLAY_DEF

View File

@@ -159,7 +159,7 @@ public:
QByteArray pattern = txt.toLatin1();
bool wasReset = (m_incrementalStartPos < 0);
if (m_contPos == -1) {
m_contPos = m_widget->cursorPosition();
m_contPos = m_widget->cursorPosition() + 1;
if (findFlags & FindBackward)
m_contPos = m_widget->selectionStart()-1;
}

View File

@@ -167,7 +167,7 @@ void QmlProfilerStatisticsView::contextMenuEvent(QContextMenuEvent *ev)
if (selectedAction == getGlobalStatsAction)
emit showFullRange();
if (selectedAction == showExtendedStatsAction)
m_mainView->setShowExtendedStatistics(m_mainView->showExtendedStatistics());
m_mainView->setShowExtendedStatistics(showExtendedStatsAction->isChecked());
}
}