From fc9407affb74bbfa9d396fef32f319b6baa8471f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 19:19:31 +0200 Subject: delete .desktop files of examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit they were added without an explanation, and they can't be particularly useful (because they contain hard-coded paths and refer to non-existing icons). Change-Id: I55f6786bc2463051e97ca55c81309dd2afbf7580 Reviewed-by: Jędrzej Nowacki --- examples/script/calculator/calculator.desktop | 11 ----------- examples/script/context2d/context2d.desktop | 11 ----------- examples/script/customclass/customclass.desktop | 11 ----------- examples/script/defaultprototypes/defaultprototypes.desktop | 11 ----------- examples/script/helloscript/helloscript.desktop | 11 ----------- examples/script/marshal/marshal.desktop | 11 ----------- examples/script/qscript/qscript.desktop | 11 ----------- examples/script/qsdbg/qsdbg.desktop | 11 ----------- examples/script/qstetrix/qstetrix.desktop | 11 ----------- 9 files changed, 99 deletions(-) delete mode 100644 examples/script/calculator/calculator.desktop delete mode 100644 examples/script/context2d/context2d.desktop delete mode 100644 examples/script/customclass/customclass.desktop delete mode 100644 examples/script/defaultprototypes/defaultprototypes.desktop delete mode 100644 examples/script/helloscript/helloscript.desktop delete mode 100644 examples/script/marshal/marshal.desktop delete mode 100644 examples/script/qscript/qscript.desktop delete mode 100644 examples/script/qsdbg/qsdbg.desktop delete mode 100644 examples/script/qstetrix/qstetrix.desktop diff --git a/examples/script/calculator/calculator.desktop b/examples/script/calculator/calculator.desktop deleted file mode 100644 index 25c0820..0000000 --- a/examples/script/calculator/calculator.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Qt Script Calculator -Exec=/opt/usr/bin/calculator -Icon=calculator -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/context2d/context2d.desktop b/examples/script/context2d/context2d.desktop deleted file mode 100644 index 16f7df2..0000000 --- a/examples/script/context2d/context2d.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Context2D -Exec=/opt/usr/bin/context2d -Icon=context2d -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/customclass/customclass.desktop b/examples/script/customclass/customclass.desktop deleted file mode 100644 index 2e3ffa6..0000000 --- a/examples/script/customclass/customclass.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Custom Script Class -Exec=/opt/usr/bin/customclass -Icon=customclass -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/defaultprototypes/defaultprototypes.desktop b/examples/script/defaultprototypes/defaultprototypes.desktop deleted file mode 100644 index 6381546..0000000 --- a/examples/script/defaultprototypes/defaultprototypes.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Default Prototypes -Exec=/opt/usr/bin/defaultprototypes -Icon=defaultprototypes -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/helloscript/helloscript.desktop b/examples/script/helloscript/helloscript.desktop deleted file mode 100644 index 7dafad9..0000000 --- a/examples/script/helloscript/helloscript.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Hello Script -Exec=/opt/usr/bin/helloscript -Icon=helloscript -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/marshal/marshal.desktop b/examples/script/marshal/marshal.desktop deleted file mode 100644 index 8abed70..0000000 --- a/examples/script/marshal/marshal.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Qt Script Marshalling -Exec=/opt/usr/bin/marshal -Icon=marshal -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/qscript/qscript.desktop b/examples/script/qscript/qscript.desktop deleted file mode 100644 index d580981..0000000 --- a/examples/script/qscript/qscript.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Qt Script Interpreter -Exec=/opt/usr/bin/qscript -Icon=qscript -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/qsdbg/qsdbg.desktop b/examples/script/qsdbg/qsdbg.desktop deleted file mode 100644 index 359b93c..0000000 --- a/examples/script/qsdbg/qsdbg.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Qt Script Debugger -Exec=/opt/usr/bin/qsdbg -Icon=qsdbg -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/script/qstetrix/qstetrix.desktop b/examples/script/qstetrix/qstetrix.desktop deleted file mode 100644 index 4795b13..0000000 --- a/examples/script/qstetrix/qstetrix.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Qt Script Tetrix -Exec=/opt/usr/bin/qstetrix -Icon=qstetrix -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable -- cgit v1.2.1 From 95333d804470dac6d529fc68d5dc5bfb7fa30ffe Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 May 2016 13:27:11 +0200 Subject: Bump version Change-Id: I7abf5bb8276fea2f75479a7884b5c6ecc3e41ed2 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index cc974f4..d65b348 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += qt_example_installs android|boot2qt: CONFIG -= headersclean -MODULE_VERSION = 5.6.1 +MODULE_VERSION = 5.6.2 -- cgit v1.2.1 From 76b5b0c3598a595c61f0cb274b392feeaf3e8dc3 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 21:23:06 +0200 Subject: do not enable example installs explicitly any more MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit it's done centrally now. Change-Id: I8f659fd2676aeedbfe4aaa36b8e9e93c979eee05 Reviewed-by: Jędrzej Nowacki Reviewed-by: Simon Hausmann --- .qmake.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index d65b348..e899c42 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,4 @@ load(qt_build_config) -CONFIG += qt_example_installs android|boot2qt: CONFIG -= headersclean MODULE_VERSION = 5.6.2 -- cgit v1.2.1 From 4c8efb407fa9ebfe3e1923970140cfe270fda75d Mon Sep 17 00:00:00 2001 From: Ralf Nolden Date: Thu, 2 Jun 2016 00:13:52 +0200 Subject: Compile Fix for OpenBSD in C++11 mode Add a __cplusplus condition to an already existing OpenBSD defined part to activate the code only on older gcc compilers. See commit 32e0c5f96dac3f8afe187259929dd87012e1a464 in qtdeclarative. Change-Id: Ia7846f9058ee94bad160651347c128015e21698e Reviewed-by: Simon Hausmann --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h index 46b2241..f2517cd 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h @@ -95,7 +95,7 @@ inline bool isinf(double x) { return !finite(x) && !isnand(x); } #endif -#if OS(OPENBSD) +#if OS(OPENBSD) && __cplusplus < 201103L namespace std { -- cgit v1.2.1 From 6d3c33c07998236363f3503d376d6be1e0b074f4 Mon Sep 17 00:00:00 2001 From: James McDonnell Date: Tue, 14 Jun 2016 12:01:32 -0400 Subject: Make some QNX only code Dinkum specific The undefines won't be needed for QNX 7.0 with GNU libc++. Change-Id: I01bc306c5ebb0cb7f508bb7ee2994589f2936201 Reviewed-by: Rafael Roquetto --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h index f2517cd..706ec39 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h @@ -40,7 +40,7 @@ #include #endif -#if OS(QNX) +#if OS(QNX) && defined(_CPPLIB_VER) // FIXME: Look into a way to have cmath import its functions into both the standard and global // namespace. For now, we include math.h since the QNX cmath header only imports its functions // into the standard namespace. -- cgit v1.2.1 From d84da60d5f7f884ab0ad7737658f4a5936780799 Mon Sep 17 00:00:00 2001 From: James McDonnell Date: Tue, 7 Jun 2016 15:01:41 -0400 Subject: Switch to debug_thread_t type Switch from "struct _debug_thread_info" to debug_thread_t. For QNX 7.0, debug_thread_t becomes the architecture independent type. The original type becomes the 32-bit specific version. The type can be changed now because the two types are interchangeable on QNX 6.6.0. Change-Id: I515b2aca73370200cd0401af0f26fc1653a07421 Reviewed-by: Dan Cape Reviewed-by: Rafael Roquetto --- src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp index d5adbd7..1b2fd1d 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp @@ -559,7 +559,7 @@ static inline void *currentThreadStackBaseQNX() static pthread_t stackThread; pthread_t thread = pthread_self(); if (stackBase == 0 || thread != stackThread) { - struct _debug_thread_info threadInfo; + debug_thread_t threadInfo; memset(&threadInfo, 0, sizeof(threadInfo)); threadInfo.tid = pthread_self(); int fd = open("/proc/self", O_RDONLY); -- cgit v1.2.1 From e7db88eb5cc1b51dd27b5b614909c1f9670977d3 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Wed, 15 Jun 2016 08:38:32 +0800 Subject: Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: If04c585cdd374c4fce88ed39b5cc23b0668bd9b7 Reviewed-by: Lars Knoll --- LICENSE.GPLv3 | 2 +- LICENSE.LGPLv21 | 2 +- LICENSE.LGPLv3 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3 index 4e49b12..71c4ad4 100644 --- a/LICENSE.GPLv3 +++ b/LICENSE.GPLv3 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 3. That license references the General Public License version 3, that is displayed below. Other portions of the Qt Toolkit may be licensed directly under this license. diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21 index 6e18461..dfcab5e 100644 --- a/LICENSE.LGPLv21 +++ b/LICENSE.LGPLv21 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 2.1, which is displayed below. ------------------------------------------------------------------------- diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index 4d67bac..6bf924c 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 3, which is displayed below. This license makes reference to the version 3 of the GNU General Public License, which you can find in the LICENSE.GPLv3 file. -- cgit v1.2.1 From f1045b954411fb01cfeae63fda2645c3713e7adc Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 20 Jun 2016 13:59:29 -0700 Subject: Update the detection of MSVC versions to be forward-compatible Qt 5.8 may deprecate the win32-msvc20xx mkspecs, so use the MSVC_VER variable to detect which version of MSVC it is. This commit removes the detection for win32-icc, as it really depended on what version of MSVC headers it was targeting. With Qt prior to 5.8, it was not possible to detect it anyway, so the rule was broken anyway (ICC prior to 16 only worked with MSVC <= 2013, but ICC 17 will work with 2015). Change-Id: Ib57b52598e2f452985e9fffd1459e682978341f5 Reviewed-by: Simon Hausmann --- src/3rdparty/javascriptcore/WebKit.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri index 932b17a..18898b3 100644 --- a/src/3rdparty/javascriptcore/WebKit.pri +++ b/src/3rdparty/javascriptcore/WebKit.pri @@ -20,7 +20,7 @@ isEmpty(OUTPUT_DIR) { DEFINES += BUILDING_QT__=1 building-libs { - win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-msvc2013|win32-icc: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32 + contains(MSVC_VER, "(9|10|11|12)\.0"): INCLUDEPATH += $$PWD/JavaScriptCore/os-win32 } else { CONFIG(QTDIR_build) { QT += webkit -- cgit v1.2.1 From 069a8fd9c5be4f2e20e2f897dff17c205bd06c55 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 4 Jul 2016 16:45:28 +0200 Subject: Remove superfluous include paths Remove include paths that are already added by JavaScriptCore.pri. Change-Id: I862a806007e8bc6202785a86b014735402830195 Reviewed-by: Oswald Buddenhagen --- src/script/script.pro | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/script/script.pro b/src/script/script.pro index dec4a4f..08f095c 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -41,22 +41,6 @@ DEFINES += LOG_DISABLED=1 include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri) -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/parser -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecompiler -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/debugger -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/runtime -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/wtf -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/unicode -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/interpreter -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/jit -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/profiler -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/wrec -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/API -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecode -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/assembler -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/generated - # This line copied from WebCore.pro DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1 -- cgit v1.2.1 From 11e06dabcddc34b689ba38ab6b1898170c3ebc6e Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 4 Jul 2016 16:49:59 +0200 Subject: Remove superfluous NDEBUG define This is already added in WebKit.pri. Change-Id: I6bb2bd9ed20c5cc661847404bc1862314f97a799 Reviewed-by: Oswald Buddenhagen --- src/script/script.pro | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/script/script.pro b/src/script/script.pro index 08f095c..03444d2 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -44,8 +44,6 @@ include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri) # This line copied from WebCore.pro DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1 -CONFIG(release, debug|release):DEFINES += NDEBUG - # Avoid JSC C API functions being exported. DEFINES += JS_NO_EXPORT -- cgit v1.2.1 From 9dc78a2d847bca5ec7b1445356523383a030d7ce Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 5 Jul 2016 11:49:48 +0200 Subject: Fix usage of deprecated QStyleOptionViewItemV3 Change-Id: Ie8223958c2e281bd00bacf80c22cc3f7282b42db Reviewed-by: Friedemann Kleint --- src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp index e902021..0425f5a 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp +++ b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp @@ -217,14 +217,6 @@ private Q_SLOTS: pal.setColor(QPalette::Active, QPalette::Base, col); editor->setPalette(pal); } - -private: - static const QWidget *widget(const QStyleOptionViewItem &option) - { - if (const QStyleOptionViewItemV3 *v3 = qstyleoption_cast(&option)) - return v3->widget; - return 0; - } }; QScriptDebuggerLocalsItemDelegate::QScriptDebuggerLocalsItemDelegate( @@ -306,7 +298,7 @@ void QScriptDebuggerLocalsItemDelegate::paint(QPainter *painter, const QStyleOpt QStyledItemDelegate::paint(painter, option, index); } else { // this is a top-level item. - const QTreeView *view = qobject_cast(widget(option)); + const QTreeView *view = qobject_cast(option.widget); Q_ASSERT(view != 0); QStyleOptionButton buttonOption; -- cgit v1.2.1 From 6e1dde1568d5b0dd774173e3d8f63a15c9a10e15 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 22 Jul 2016 23:16:30 -0700 Subject: Fix build with the Intel compiler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ICC's supplied math.h has #defines for isnan and signbit. So work around that. Change-Id: I149e0540c00745fe8119fffd1463d7473c4c1f8a Reviewed-by: Jędrzej Nowacki --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h index 46b2241..094d456 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h @@ -40,7 +40,7 @@ #include #endif -#if OS(QNX) +#if OS(QNX) || COMPILER(INTEL) // FIXME: Look into a way to have cmath import its functions into both the standard and global // namespace. For now, we include math.h since the QNX cmath header only imports its functions // into the standard namespace. -- cgit v1.2.1