diff options
Diffstat (limited to 'src')
19 files changed, 47 insertions, 53 deletions
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 |