diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 13:31:52 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 13:31:52 +0100 |
commit | 1e470ee3fe914e811cfbfc104223bd230d084c74 (patch) | |
tree | 1ab63e821b45af188e07831e10086f680f14567b | |
parent | 2124c1654f5e280870fb2bf6039d67a1cea2c1a9 (diff) | |
parent | 4bffdf96b1418b011757bd1a7e8b6b109819a8fe (diff) | |
download | qtscript-1e470ee3fe914e811cfbfc104223bd230d084c74.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: I5479b6eacc5366304d3d65c5287d9170b21a3c6c
41 files changed, 150 insertions, 237 deletions
@@ -261,3 +261,6 @@ src/xml/lib/ *.dep *.map work + +# Generated static plugin import sources +*_plugin_import.cpp diff --git a/.qmake.conf b/.qmake.conf index 42ba8e4..5de255c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1 +1,2 @@ load(qt_build_config) +CONFIG += qt_example_installs diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1 new file mode 100644 index 0000000..cc5a670 --- /dev/null +++ b/dist/changes-5.0.1 @@ -0,0 +1,51 @@ +Qt 5.0.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.0.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://qt-project.org/doc/qt-5.0/ + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt-project.org/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + +**************************************************************************** +* General * +**************************************************************************** + +General Improvements +-------------------- + +Third party components +---------------------- + +**************************************************************************** +* Library * +**************************************************************************** + + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + + +**************************************************************************** +* Compiler Specific Changes * +**************************************************************************** + + +**************************************************************************** +* Tools * +**************************************************************************** + + +**************************************************************************** +* Plugins * +**************************************************************************** + diff --git a/examples/script/calculator/calculator.pro b/examples/script/calculator/calculator.pro index ddf7ecb..a52e892 100644 --- a/examples/script/calculator/calculator.pro +++ b/examples/script/calculator/calculator.pro @@ -5,13 +5,7 @@ QMAKE_PROJECT_NAME = scripted_calculator contains(QT_CONFIG, scripttools): QT += scripttools -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/calculator -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.js *.ui -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/calculator -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/calculator +INSTALLS += target -symbian: CONFIG += qt_example maemo5: CONFIG += qt_example - -symbian: warning(This example does not work on Symbian platform) diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro index d2bc25d..6640c33 100644 --- a/examples/script/context2d/context2d.pro +++ b/examples/script/context2d/context2d.pro @@ -16,19 +16,8 @@ RESOURCES += context2d.qrc contains(QT_CONFIG, scripttools): QT += scripttools -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/context2d -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS context2d.pro scripts -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/context2d -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/context2d +INSTALLS += target -symbian:{ - TARGET.UID3 = 0xA000C608 - CONFIG += qt_example - TARGET.EPOCHEAPSIZE = 0x200000 0xA00000 - contextScripts.path = . - contextScripts.files = scripts - DEPLOYMENT += contextScripts -} maemo5: CONFIG += qt_example diff --git a/examples/script/customclass/customclass.pro b/examples/script/customclass/customclass.pro index 612456b..1edc511 100644 --- a/examples/script/customclass/customclass.pro +++ b/examples/script/customclass/customclass.pro @@ -6,13 +6,7 @@ SOURCES += main.cpp include(bytearrayclass.pri) -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/customclass -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.pri -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/customclass -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/customclass +INSTALLS += target -symbian: CONFIG += qt_example maemo5: CONFIG += qt_example - -symbian: warning(This example does not work on Symbian platform) diff --git a/examples/script/defaultprototypes/defaultprototypes.pro b/examples/script/defaultprototypes/defaultprototypes.pro index 0685673..8fa008d 100644 --- a/examples/script/defaultprototypes/defaultprototypes.pro +++ b/examples/script/defaultprototypes/defaultprototypes.pro @@ -3,11 +3,7 @@ RESOURCES += defaultprototypes.qrc SOURCES += main.cpp prototypes.cpp HEADERS += prototypes.h -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/defaultprototypes -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.js defaultprototypes.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/defaultprototypes -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/defaultprototypes +INSTALLS += target -symbian: CONFIG += qt_example maemo5: CONFIG += qt_example diff --git a/examples/script/helloscript/helloscript.pro b/examples/script/helloscript/helloscript.pro index 419a826..780c8a4 100644 --- a/examples/script/helloscript/helloscript.pro +++ b/examples/script/helloscript/helloscript.pro @@ -2,11 +2,7 @@ QT += widgets script RESOURCES += helloscript.qrc SOURCES += main.cpp -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/helloscript -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS helloscript.pro helloscript.js -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/helloscript -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/helloscript +INSTALLS += target -symbian: CONFIG += qt_example maemo5: CONFIG += qt_example diff --git a/examples/script/marshal/marshal.pro b/examples/script/marshal/marshal.pro index 8519d9f..39654e1 100644 --- a/examples/script/marshal/marshal.pro +++ b/examples/script/marshal/marshal.pro @@ -2,13 +2,7 @@ QT = core script CONFIG += console SOURCES += main.cpp -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/marshal -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS marshal.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/marshal -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/marshal +INSTALLS += target -symbian: CONFIG += qt_example maemo5: CONFIG += qt_example - -symbian: warning(This example does not work on Symbian platform) diff --git a/examples/script/qscript/qscript.pro b/examples/script/qscript/qscript.pro index 4efe686..697d71b 100644 --- a/examples/script/qscript/qscript.pro +++ b/examples/script/qscript/qscript.pro @@ -7,13 +7,7 @@ SOURCES += main.cpp include(../customclass/bytearrayclass.pri) -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qscript -sources.files = $$RESOURCES $$FORMS main.cpp qscript.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qscript -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/qscript +INSTALLS += target -symbian: CONFIG += qt_example maemo5: CONFIG += qt_example - -symbian: warning(This example does not work on Symbian platform) diff --git a/examples/script/qsdbg/qsdbg.pro b/examples/script/qsdbg/qsdbg.pro index 1e2a2c8..0a23c36 100644 --- a/examples/script/qsdbg/qsdbg.pro +++ b/examples/script/qsdbg/qsdbg.pro @@ -6,13 +6,9 @@ SOURCES += main.cpp include(qsdbg.pri) -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qsdbg -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qsdbg.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qsdbg -INSTALLS += target sources +EXAMPLE_FILES = *.js -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example +target.path = $$[QT_INSTALL_EXAMPLES]/script/qsdbg +INSTALLS += target -symbian: warning(This example does not work on Symbian platform) +maemo5: CONFIG += qt_example diff --git a/examples/script/qstetrix/qstetrix.pro b/examples/script/qstetrix/qstetrix.pro index de02601..08b972c 100644 --- a/examples/script/qstetrix/qstetrix.pro +++ b/examples/script/qstetrix/qstetrix.pro @@ -8,13 +8,7 @@ RESOURCES = tetrix.qrc contains(QT_CONFIG, scripttools): QT += scripttools -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qstetrix -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qstetrix.pro *.js -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script/qstetrix -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/script/qstetrix +INSTALLS += target -symbian: CONFIG += qt_example maemo5: CONFIG += qt_example - -symbian: warning(This example does not work on Symbian platform) diff --git a/examples/script/script.pro b/examples/script/script.pro index 9e66a61..245824c 100644 --- a/examples/script/script.pro +++ b/examples/script/script.pro @@ -1,23 +1,29 @@ TEMPLATE = subdirs -SUBDIRS = customclass -!contains(QT_CONFIG, no-gui):SUBDIRS += helloscript context2d defaultprototypes +SUBDIRS = \ + customclass \ + qsdbg -!wince*:!contains(QT_CONFIG, no-gui):SUBDIRS += qscript marshal -!wince*:SUBDIRS *= marshal +!isEmpty(QT.widgets.name) { + SUBDIRS += \ + helloscript \ + context2d \ + defaultprototypes -symbian: SUBDIRS = context2d + !isEmpty(QT.uitools.name) { + SUBDIRS += \ + calculator \ + qstetrix + } -isEmpty(QT.widgets.name):SUBDIRS -= \ - context2d \ - defaultprototypes \ - helloscript \ - qscript + !wince { + SUBDIRS += \ + qscript + } +} -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS script.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/qtscript/script -INSTALLS += target sources +!wince { + SUBDIRS += \ + marshal +} -symbian: CONFIG += qt_example maemo5: CONFIG += qt_example diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog index 5ab23e6..00d3499 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog +++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog @@ -1,3 +1,17 @@ +2012-08-08 Patrick Gansterer <paroga@webkit.org> + + [WIN] Use GetTimeZoneInformation() for getting the timezone name + https://bugs.webkit.org/show_bug.cgi?id=91936 + + Reviewed by Ryosuke Niwa. + + The MS CRT implementation of strftime calls the same functions in the background. + Using them directly avoids the overhead of parsing the format string and removes + the dependency on strftime() for WinCE where this function does not exist. + + * runtime/DateConversion.cpp: + (JSC::formatTime): + 2010-07-08 Gavin Barraclough <barraclough@apple.com> Reviewed by Sam Weinig. diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri index 7a3dcd2..29dea36 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri @@ -13,12 +13,6 @@ CONFIG(debug, debug|release) { OBJECTS_DIR = obj/release } -symbian: { - # Need to guarantee this comes before system includes of /epoc32/include - MMP_RULES += "USERINCLUDE ../JavaScriptCore/profiler" - LIBS += -lhal -} - INCLUDEPATH = \ $$PWD \ $$PWD/.. \ @@ -69,8 +63,6 @@ contains(JAVASCRIPTCORE_JIT,no) { } wince* { - INCLUDEPATH += $$QT.core.sources/../3rdparty/ce-compat - SOURCES += $$QT.core.sources/../3rdparty/ce-compat/ce_time.c DEFINES += WINCEBASIC } diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp index 9028f50..0ad6a49 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.pri b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.pri index 4f59e17..ca5e58f 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.pri +++ b/src/3rdparty/javascriptcore/JavaScriptCore/pcre/pcre.pri @@ -1,7 +1,6 @@ # Perl Compatible Regular Expressions - Qt4 build info VPATH += $$PWD INCLUDEPATH += $$PWD $$OUTPUT_DIR/JavaScriptCore/tmp -DEPENDPATH += $$PWD SOURCES += \ pcre_compile.cpp \ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/DateConversion.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/DateConversion.cpp index f129407..2ca70ff 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/DateConversion.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/DateConversion.cpp @@ -48,6 +48,10 @@ #include <wtf/DateMath.h> #include <wtf/StringExtras.h> +#if OS(WINDOWS) +#include <windows.h> +#endif + using namespace WTF; namespace JSC { @@ -79,12 +83,22 @@ void formatDateUTCVariant(const GregorianDateTime &t, DateConversionBuffer& buff void formatTime(const GregorianDateTime &t, DateConversionBuffer& buffer) { int offset = abs(gmtoffset(t)); +#if OS(WINDOWS) + TIME_ZONE_INFORMATION timeZoneInformation; + GetTimeZoneInformation(&timeZoneInformation); + const WCHAR* timeZoneName = t.isDST ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; +#else char timeZoneName[70]; struct tm gtm = t; strftime(timeZoneName, sizeof(timeZoneName), "%Z", >m); +#endif if (timeZoneName[0]) { +#if OS(WINDOWS) + snprintf(buffer, DateConversionBufferSize, "%02d:%02d:%02d GMT%c%02d%02d (%S)", +#else snprintf(buffer, DateConversionBufferSize, "%02d:%02d:%02d GMT%c%02d%02d (%s)", +#endif t.hour, t.minute, t.second, gmtoffset(t) < 0 ? '-' : '+', offset / (60*60), (offset / 60) % 60, timeZoneName); } else { diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackSymbian.cpp index bda14ac..54b4a91 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackSymbian.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MarkStackSymbian.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) + Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp index 0ac2717..ea48fc4 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2007 Staikos Computing Services Inc. - * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) * Copyright (C) 2008 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp index 6a28e9e..da16892 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h index 21422f6..c25a4df 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp index ca13399..afe6fb5 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h index 69d78c1..5143075 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/RegisterFileAllocatorSymbian.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h index 99db5d7..afa65e4 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/symbian/SymbianDefines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/3rdparty/javascriptcore/WebKit.pri b/src/3rdparty/javascriptcore/WebKit.pri index 9aaaa99..d3f22fd 100644 --- a/src/3rdparty/javascriptcore/WebKit.pri +++ b/src/3rdparty/javascriptcore/WebKit.pri @@ -10,8 +10,6 @@ CONFIG(standalone_package) { OUTPUT_DIR=$$PWD } -CONFIG += depend_includepath - isEmpty(OUTPUT_DIR) { CONFIG(debug, debug|release) { OUTPUT_DIR=$$PWD/WebKitBuild/Debug @@ -40,18 +38,13 @@ building-libs { else: LIBS += $${QTWEBKITLIBNAME}.lib } else { LIBS += -lQtWebKit - symbian { - TARGET.EPOCSTACKSIZE = 0x14000 // 80 kB - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB - } } } } - DEPENDPATH += $$PWD/WebKit/qt/Api } greaterThan(QT_MINOR_VERSION, 5):DEFINES += WTF_USE_ACCELERATED_COMPOSITING -!mac:!unix|symbian { +!mac:!unix { DEFINES += USE_SYSTEM_MALLOC } @@ -66,7 +59,7 @@ CONFIG -= warn_on *-g++*:QMAKE_CXXFLAGS += -Wall -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self # Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT -symbian|*-armcc { +*-armcc { RVCT_COMMON_CFLAGS = --gnu --diag_suppress 68,111,177,368,830,1293 RVCT_COMMON_CXXFLAGS = $$RVCT_COMMON_CFLAGS --no_parse_templates } @@ -76,11 +69,7 @@ symbian|*-armcc { QMAKE_CXXFLAGS += $$RVCT_COMMON_CXXFLAGS } -symbian { - QMAKE_CXXFLAGS.ARMCC += $$RVCT_COMMON_CXXFLAGS -} - -symbian|maemo5: DEFINES *= QT_NO_UITOOLS +maemo5: DEFINES *= QT_NO_UITOOLS contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools diff --git a/src/plugins/script/qtdbus/qtdbus.pro b/src/plugins/script/qtdbus/qtdbus.pro index 457af45..e37bf26 100644 --- a/src/plugins/script/qtdbus/qtdbus.pro +++ b/src/plugins/script/qtdbus/qtdbus.pro @@ -1,6 +1,7 @@ TARGET = qtscriptdbus PLUGIN_TYPE = script +PLUGIN_CLASS_NAME = QtDBusScriptPlugin load(qt_plugin) QT = core gui script diff --git a/src/script/api/qscriptextensionplugin.cpp b/src/script/api/qscriptextensionplugin.cpp index 4926ca5..f63cb4f 100644 --- a/src/script/api/qscriptextensionplugin.cpp +++ b/src/script/api/qscriptextensionplugin.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE Writing a script extension plugin is achieved by subclassing this base class, reimplementing the pure virtual keys() and initialize() - functions, and exporting the class using the Q_EXPORT_PLUGIN2() + functions, and exporting the class using the Q_PLUGIN_METADATA() macro. See \l {How to Create Qt Plugins} for details. \sa QScriptEngine::importExtension(), {Creating QtScript Extensions} @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE Constructs a script extension plugin with the given \a parent. Note that this constructor is invoked automatically by the - Q_EXPORT_PLUGIN2() macro, so there is no need for calling it + Q_PLUGIN_METADATA() macro, so there is no need for calling it explicitly. */ QScriptExtensionPlugin::QScriptExtensionPlugin(QObject *parent) diff --git a/src/script/doc/qtscript.qdocconf b/src/script/doc/qtscript.qdocconf index d07e15a..382e09d 100644 --- a/src/script/doc/qtscript.qdocconf +++ b/src/script/doc/qtscript.qdocconf @@ -16,7 +16,7 @@ headerdirs += .. imagedirs += images sourcedirs += .. -depends += qtcore +depends += qtcore qtlinguist # The following parameters are for creating a qhp file, the qhelpgenerator # program can convert the qhp file into a qch file which can be opened in @@ -36,11 +36,12 @@ qhp.qtscript.namespace = org.qt-project.qtscript.500 # Title for the package, will be the main title for the package in # Assistant/Creator. -qhp.qtscript.indexTitle = Qt Script Documentation +qhp.qtscript.indexTitle = Qt Script # Only update the name of the project for the next variables. qhp.qtscript.virtualFolder = qtscript qhp.qtscript.subprojects = classes -qhp.qtscript.subprojects.classes.title = Qt Script C++ Classes +qhp.qtscript.subprojects.classes.title = C++ Classes +qhp.qtscript.subprojects.classes.indexTitle = Qt Script C++ Classes qhp.qtscript.subprojects.classes.selectors = class fake:headerfile qhp.qtscript.subprojects.classes.sortPages = true diff --git a/src/script/doc/src/qtscript-index.qdoc b/src/script/doc/src/qtscript-index.qdoc index aabf584..15e7c30 100644 --- a/src/script/doc/src/qtscript-index.qdoc +++ b/src/script/doc/src/qtscript-index.qdoc @@ -1723,7 +1723,7 @@ Once you are using qsTr() and/or qsTranslate() throughout your scripts, you can start producing translations of the user-visible text in your program. - The \l{Qt Linguist manual} provides further information about + The \l{Qt Linguist Manual} provides further information about Qt's translation tools, \e{Qt Linguist}, \c lupdate and \c lrelease. diff --git a/src/script/script.pro b/src/script/script.pro index 7891513..03a9da1 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -71,20 +71,6 @@ INCLUDEPATH += $$PWD include(script.pri) -symbian { - TARGET.UID3=0x2001B2E1 -} - -symbian { - symbian-abld|symbian-sbsv2 { - MMP_RULES += ALWAYS_BUILD_AS_ARM - } else { - QMAKE_CFLAGS -= --thumb - QMAKE_CXXFLAGS -= --thumb - } - QMAKE_CXXFLAGS.ARMCC += -OTime -O3 -} - integrity { CFLAGS += --diag_remark=236,82 } diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro index 555278f..0cb8381 100644 --- a/src/scripttools/scripttools.pro +++ b/src/scripttools/scripttools.pro @@ -8,5 +8,3 @@ DEFINES += QT_NO_USING_NAMESPACE load(qt_module) include(debugging/debugging.pri) - -symbian:TARGET.UID3=0x2001E625 diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro index 77a7645..4c6c350 100644 --- a/tests/auto/headersclean/headersclean.pro +++ b/tests/auto/headersclean/headersclean.pro @@ -1,8 +1,3 @@ -TARGET = tst_headersclean -CONFIG += testcase -SOURCES += tst_headersclean.cpp -QT = core testlib - -contains(QT_CONFIG,script): QT += script -contains(QT_CONFIG,scripttools): QT += scripttools +QT = script scripttools +load(qt_headersclean) DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/headersclean/tst_headersclean.cpp b/tests/auto/headersclean/tst_headersclean.cpp deleted file mode 100644 index facfa55..0000000 --- a/tests/auto/headersclean/tst_headersclean.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 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 the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#define QT_NO_KEYWORDS -#define signals int -#define slots int -#define emit public:; -#define foreach public:; -#define forever public:; - -#include <QtCore/QtCore> -#include <QtTest/QtTest> - -#include <QtScript/QtScript> - -#ifdef QT_SCRIPTTOOLS_LIB -# include <QtScriptTools/QtScriptTools> -#endif - -class tst_HeadersClean: public QObject -{ - Q_OBJECT -public: - tst_HeadersClean() {} -}; - -QTEST_MAIN(tst_HeadersClean) -#include "tst_headersclean.moc" diff --git a/tests/auto/qscriptengine/qscriptengine.pro b/tests/auto/qscriptengine/qscriptengine.pro index adc1a46..3900f5d 100644 --- a/tests/auto/qscriptengine/qscriptengine.pro +++ b/tests/auto/qscriptengine/qscriptengine.pro @@ -7,18 +7,14 @@ include(../shared/util.pri) wince* { DEFINES += SRCDIR=\\\"./\\\" -} else:!symbian { +} else { DEFINES += SRCDIR=\\\"$$PWD\\\" } -wince*|symbian: { +wince* { addFiles.files = script addFiles.path = . DEPLOYMENT += addFiles } -symbian: { - TARGET.UID3 = 0xE0340006 - DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x","")) -} DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro index c449a8e..0acd167 100644 --- a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro +++ b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro @@ -5,9 +5,9 @@ SOURCES += tst_qscriptjstestsuite.cpp RESOURCES += qscriptjstestsuite.qrc include(../qscriptv8testsuite/abstracttestsuite.pri) -!symbian: DEFINES += SRCDIR=\\\"$$PWD\\\" +DEFINES += SRCDIR=\\\"$$PWD\\\" -wince*|symbian: { +wince* { testFiles.files = tests testFiles.path = . DEPLOYMENT += testFiles diff --git a/tests/auto/qscriptqwidgets/qscriptqwidgets.pro b/tests/auto/qscriptqwidgets/qscriptqwidgets.pro index 4a2f763..a08c519 100644 --- a/tests/auto/qscriptqwidgets/qscriptqwidgets.pro +++ b/tests/auto/qscriptqwidgets/qscriptqwidgets.pro @@ -3,7 +3,6 @@ CONFIG += testcase TEMPLATE = app TARGET = tst_qscriptqwidgets -DEPENDPATH += . INCLUDEPATH += . QT += widgets script testlib diff --git a/tests/auto/qscriptv8testsuite/abstracttestsuite.pri b/tests/auto/qscriptv8testsuite/abstracttestsuite.pri index 1de5b93..5a9e18f 100644 --- a/tests/auto/qscriptv8testsuite/abstracttestsuite.pri +++ b/tests/auto/qscriptv8testsuite/abstracttestsuite.pri @@ -1,4 +1,3 @@ SOURCES += $$PWD/abstracttestsuite.cpp HEADERS += $$PWD/abstracttestsuite.h INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD diff --git a/tests/benchmarks/script/qscriptengine/qscriptengine.pro b/tests/benchmarks/script/qscriptengine/qscriptengine.pro index c8e89da..cc95370 100644 --- a/tests/benchmarks/script/qscriptengine/qscriptengine.pro +++ b/tests/benchmarks/script/qscriptengine/qscriptengine.pro @@ -6,8 +6,4 @@ SOURCES += tst_qscriptengine.cpp QT += script testlib -symbian* { - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB - TARGET.EPOCSTACKSIZE = 0x14000 -} DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/script/sunspider/sunspider.pro b/tests/benchmarks/script/sunspider/sunspider.pro index 5cc3682..f275fa7 100644 --- a/tests/benchmarks/script/sunspider/sunspider.pro +++ b/tests/benchmarks/script/sunspider/sunspider.pro @@ -6,8 +6,4 @@ SOURCES += tst_sunspider.cpp QT = core script testlib -symbian* { - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB - TARGET.EPOCSTACKSIZE = 0x14000 -} DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/script/v8/v8.pro b/tests/benchmarks/script/v8/v8.pro index 136403f..59af163 100644 --- a/tests/benchmarks/script/v8/v8.pro +++ b/tests/benchmarks/script/v8/v8.pro @@ -6,8 +6,4 @@ SOURCES += tst_v8.cpp QT = core script testlib -symbian* { - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB - TARGET.EPOCSTACKSIZE = 0x14000 -} DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |