summaryrefslogtreecommitdiffstats
path: root/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-5/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| * QS60Style: Sliders are too smallSami Merila2010-05-061-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometime back slider graphic in the QS60Style was changed to use the "new" slider graphic available in 5th Edition and newer SDKs (the old SDKs still use the slider graphic). However, at that time nobody noticed that the new slider has different size than the old one in the Nokia LAF document. To fix the sliders, updated the pixel metrics calculation rules to use the new slider LAF data. Also fixed a grpahic start and end part rounding to match native look. Task-number: QTBUG-10454 Reviewed-by: Alessandro Portale
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-292-3/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | All EGL-related changes from 4.6 were discarded. Conflicts: src/gui/egl/egl.pri src/gui/egl/qegl.cpp src/gui/egl/qegl_p.h src/gui/egl/qegl_stub.cpp src/gui/egl/qeglproperties_p.h src/gui/egl/qeglproperties_stub.cpp src/gui/gui.pro src/multimedia/multimedia/audio/qaudioinput_win32_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * fix crash in QXmlStreamReaderPeter Hartmann2010-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this fixes a possible off-by-one data corruption which apparently is only triggered in rare circumstances. The problem was: We were checking whether we would need to reallocate the stack (line 1245), but sometimes were incrementing tos (line 1278) and then accessing the state stack at an out-of-bounds position (line 1951). Additionally, adapt the qlalr generator for changes made to qxmlstream_p.h directly and recreate that file with qlalr. Reviewed-by: Frans Englich Reviewed-by: Roberto Raggi Task-number: QTBUG-9196
| * QS60Style: QMenu behaves badly with a lot of menu itemsSami Merila2010-04-261-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to recent change in QS60Style where combobox menu was changed to popup menu, instead of dropdown menu, long QMenus now work sloppily. This is due to that pixel metric PE_MenuScrollerHeight was set to zero to avoid "non-drawn" areas in combobox popups. Of course, QMenu scrolling really needs the scrolling area if it is to make any scrolling. As a solution, scroller height is now zero for combobox popup and in QMenu it is the height of itemview item (for "standard" content), but no any scroller indication is drawn. The menu scrolls automatically when bottom/top part of menu list is highlighted. Task-number: QTBUG-10073 Reviewed-by: Janne Koskinen
* | Convert date/time format to something that Qt understandsDenis Dzyubenko2010-04-162-4/+125
| | | | | | | | | | | | | | | | | | | | The date/time format in QLocale originate from unicode CLDR which has more format patterns that Qt understands, so when generating date for QLocale we remove unsupported patterns and convert some other to something that Qt understands. Task-number: QTBUG-9500 Reviewed-by: Thiago
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-293-6/+18
|\ \ | |/ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * QMessageBox is smaller than native MessageBoxSami Merila2010-03-253-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Messageboxes are smaller than native ones. This is due to that native ones have a lot of empty space. To fix this, we define a new custom pixel metrics that is the minimum height of one text line messagebox (aka AknPopUp) on the native side. Then we ensure that the QMessageBox is at least of this height. Additionally we do some minor styling for QMessageBox: - the corners graphics are now as rounded as on native side - the font is set to match the native side - the top margin space is doubled for dialogs, which is rather good approximation of native side Task-number: QTBUG-4875 Reviewed-by: Janne Anttila
* | Upgraded QLocale data to Unicode CLDR 1.8.0Denis Dzyubenko2010-03-223-9224/+64
| | | | | | | | Reviewed-by: Frans Englich
* | Improved CLDR parser.Denis Dzyubenko2010-03-222-17/+39
| | | | | | | | | | | | | | | | | | Added support for "defaultNumberingSystem" element to get the right numeric information (decimal point, group separator, zero digit etc). Also fixed xpaths to the AM/PM text for CLDR 1.8.0 Reviewed-by: trustme
* | Fixed reading draft data from CLDR.Denis Dzyubenko2010-03-222-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | When draft resolution is specified we should accept it and all values "above" it. For example if we are searching for a group separator with a "contributed" resolution, we should also accept data that is "approved". In theory we should only accept data with "contributed" or "approved" resolutions and should not trust other resolutions. However in order not to introduce data regressions to QLocale we will only handle drafts for new data. Reviewed-by: Frans Englich
* | Improved the cldr parser for QLocale.Denis Dzyubenko2010-03-222-169/+230
| | | | | | | | | | | | | | | | | | | | I believe now we parse the CLDR properly. If a data is not present in a file, we remove the last part of the filename and try again. And we should do the same if a file is an alias to some other file. For example az_AZ.xml is an alias to az_Latn_AZ.xml which itself falls back to az_Latn.xml and then to az.xml Reviewed-by: Frans Englich
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-03-181-1/+4
|\ \ | |/ | | | | | | Conflicts: qmake/generators/symbian/symmake_abld.cpp
| * Set PM_MenuScrollerHeight to zeroSami Merila2010-03-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously QS60Style didn't define a pixel metrics value for PM_MenuScrollerHeight at all and value was fetched from qcommonstyle. However, QS60Style didn't draw the CE_MenuScroller area at all, so menuscrollers were layoutted and drawn. Thus, long menus were left with a 'hole' in them. With this fix, PM_MenuScrollerHeight is zero. This is related to QT-2274. Task-number: QT-2274 Reviewed-by: Alessandro Portale
* | Update src/3rdparty/javascriptcore and adapt src/script to the changesKent Hansen2010-03-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update qscriptvalueiterator test to expect length property when iterating arrays and strings. - Use EvalExecutable::create() instead of EvalExecutable constructor. The constructor is private. - Reimplement getOwnPropertyDescriptor() in all custom script objects. - Remove all reimplementations of getPropertyAttributes(). It doesn't exist in trunk anymore (getOwnPropertyDescriptor() is used instead). - Remove checkDontDelete argument from deleteProperty() reimplementations. The purpose of this argument was to support deleting properties with attribute Undeletable from C++. But it was quite an invasive patch to JavaScriptCore, and it doesn't seem worth it. If this feature is really crucial it should be re-done upstream. One of the tests needed to be updated so it's not sensitive to the C++ undeletability. - Adapt getOwnPropertyNames() reimplementations to signature change. - Add missing QScriptObject structure flags, otherwise we don't get all virtual calls. - Remove our patch for reporting column numbers in the debugger callbacks. It was just too intrusive. As with the checkDontDelete issue, this should be redone upstream if it's really important. In 4.7, QScriptEngineAgent will always report a column number of 1. Other compilation fixes: - InternalFunction::name() takes an ExecState* argument, not GlobalData* - ScopeChain::globalObject is no longer a function but a member variable - ScopeChainNode constructor takes a GlobalObject argument - Heap::collect() is called collectAllGarbage() - JSValue::strictEqual() takes an ExecState* argument - Debugger::exception() takes a bool hasHandler argument - Debugger no longer reports column number (we decided to drop that patch from JSC) - UString doesn't have operator+=(char*) - Update the autotests to reflect the columnNumber=1 change. - Add helper class to avoid crashing inside JSC. Ever since r52856 in WebKit trunk, this is needed. There are probably a lot of other public API functions that need this guard as well, but I'll add them as they are discovered. - Update mkdist-javascriptcore tag, exclude a few more files. - Set ENABLE_JSC_MULTIPLE_THREADS=0 define on Mac due to r52355 in trunk. Reviewed-by: Simon Hausmann
* | Fix the code after merge: DerivedNormalizationProps has two or more columnsThiago Macieira2010-03-051-1/+1
| |
* | add some usefull definitions to qunicodetables_p.hRitt Konstantin2010-03-051-2/+3
| | | | | | | | | | | | | | | | | | | | * CURRENT_VERSION macro in qunicodetables.cpp was renamed to UNICODE_DATA_VERSION and it's definition was moved to qunicodetables_p.h * LAST_UNICODE_CHAR macro in qchar.cpp was renamed to UNICODE_LAST_CODEPOINT and it's definition was moved to qunicodetables_p.h Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | finish last commitRitt Konstantin2010-03-051-3/+4
| | | | | | | | | | | | | | don't skip non-starters in composition exclusions code; warn & exit instead Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | prefer DerivedNormalizationProps.txt over CompositionExclusions.txtRitt Konstantin2010-03-052-208/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) http://www.unicode.org/reports/tr44/ :2.1 > Implementations should simply use the derived properties, > and should not try to rederive them from lists of simple > properties and collections of rules, because of the chances > for error and divergence when doing so. 2) DerivedNormalizationProps.txt file also provides additional info that can be used for Normalization Form Quick Check algorithm implementation some later Note: this commit *must not* change anything in the (re)generated data; any change in generated data will point to the data inconsistency between CompositionExclusions.txt, DerivedNormalizationProps.txt and UnicodeData.txt files Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | improve error reporting a bit moreRitt Konstantin2010-03-051-1/+8
| | | | | | | | | | Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | improve error reportingRitt Konstantin2010-03-051-0/+8
| | | | | | | | | | | | | | | | warn on upperCaseDiff/lowerCaseDiff/titleCaseDiff/caseFoldDiff 's value exceeds signed short bounds Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | fix incorect conditionRitt Konstantin2010-03-051-1/+1
| | | | | | | | | | Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | check if string to int conversions were done w/o errorsRitt Konstantin2010-03-051-3/+18
| | | | | | | | | | Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | improve error reporting for unassigned grapheme/word/sentence break classesRitt Konstantin2010-03-051-8/+18
| | | | | | | | | | Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | avoid using of qunicodetables_p.h in generatorRitt Konstantin2010-03-051-1/+3
| | | | | | | | | | | | | | we can do that after last changes Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | use QHash for line break mapRitt Konstantin2010-03-051-45/+74
| | | | | | | | | | | | | | | | to be consistent with other maps this also improves perfomance a bit Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | use QHash for age mapRitt Konstantin2010-03-051-26/+29
| | | | | | | | | | | | | | to be consistent with other maps Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | minor clean-upsRitt Konstantin2010-03-051-42/+44
| | | | | | | | | | | | | | | | | | | | no changes in behavior in our case `c->cat != QChar::NoCategory` logically equals to `c->name` and the latter expression used in other maps Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | generate specialCaseMap as set of human-readable code-sequencesRitt Konstantin2010-03-051-3/+3
| | | | | | | | | | Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | make sure that the sequences in specialCaseMap are uniqueRitt Konstantin2010-03-051-1/+1
| | | | | | | | | | | | | | | | | | there is was a bug caused appending the same sequence again and again... this fix also reduces count of unique unicode properties (and blocks) Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Unicode character property 'General_Category=Cn' was erroneously ignoredRitt Konstantin2010-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | causing two related bugs in QChar::category() and QChar::isPrint(). As described in tr44, 4.2.8 Default Values General_Category character property should be setted to Cn for all codepoints omitted in UCD. Instead they was mapped to QChar::NoCategory (=0) which have no equivalent in Unicode specs and as result was ignored in filtering by binary mask. Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | fix some 0x10000 codepoint -related issuesRitt Konstantin2010-03-051-10/+8
| | | | | | | | | | Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | minor cleanups and styling fixes for generator and generated codeRitt Konstantin2010-03-051-92/+98
| | | | | | | | | | Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | apply some (forgotten) changes to generator as they were applied to the dataRitt Konstantin2010-03-051-3/+9
| | | | | | | | | | | | | | | | b6542eb2 - Thierry Bastian) fix to exported symbol 2e429e40 - Lars Knoll) N'Ko support Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | adjust unicode tables generator to work better under winRitt Konstantin2010-03-052-0/+2
| | | | | | | | | | | | | | | | | | * protect data-files from crlf line-endings since generator asserts on windows because of crlf line endings * assume generator is a console app Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-251-0/+2650
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (35 commits) Doc: Added a config file for creating Simplified Chinese docs directly. Doc: add a few lines about bearer managment to "What's New" page. Fix the SIMD implementations of QString::toLatin1() Update of the QScriptValue autotest suite. New data set for QScriptValue autotest generator. Autotest: make tst_qchar run out-of-source too Autotest: add a test for roundtrips through toLatin1/fromLatin1 Implement toLatin1_helper with Neon QRegExp::pos() should return -1 for empty/non-matching captures Revert "qdoc: Finished "Inherited by" list for QML elements." Revert "qdoc: List new QML elements in \sincelist for What's New page." Add the Unicode normalisation properties. Autotest: add a test for QDBusPendingCallWatcher use in threads Doc: placeholders for new feature highlights. doc: mark as reimplemented. Update of the QScriptValue autotest suite. New autotests cases for QScriptValue autotests generator. QScriptValue autotest generator templates change. Fix license template. QScriptValue::isQMetaObject crash fix. ...
| * | Add the Unicode normalisation properties.Thiago Macieira2010-02-241-0/+2650
| |/ | | | | | | | | | | Source: http://unicode.org/Public/5.0.0/ucd/DerivedNormalizationProps.txt Reviewed-by: Trust Me
* | Adjust the mkdist-webkit script before the importation of WebKit.Jocelyn Turcotte2010-02-231-12/+24
|/ | | | Reviewed-by: TrustMe
* generate code which does not break QT_USE_FAST_CONCATENATION with old gccOswald Buddenhagen2010-02-081-1/+1
|
* List item margins are too small due to invalid pixel metric valueSami Merila2010-01-291-7/+14
| | | | | | | | | | | | | Pixel metric values for PM_FocusFrameVMargin and PM_FocusFrameHMargin were based on AVKON grid layout. Apparently, AVKON has a major difference for text margin in lists and grids. List values are almost double of what is used in the grids. Original values were poor fit for list usability, it made the text items very close to each anothre. Task-number: QTBUG-7258 Reviewed-by: Alessandro Portale
* Fix copyright year.Jason McDonald2010-01-191-1/+1
| | | | Reviewed-by: Trust Me
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0973-79/+79
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits) Reverted two commits that were pushed to the wrong branch. Use the new QTextCodec api in the QXmlStreamWriter. Added new functions to QTextCodec that accept ConversionFlags. Fix passing of arguments to syncqt doc: Fixed typos. Fixes: Fix spinbox with NoButton style in QGtkStyle doc: Explained parameter value defaults where appropriate. Cocoa: Fix painting errors on QGLWidget resizing. Fix broken QGLWidget::renderPixmap on Mac/Carbon Fixes: Setting any style sheet breaks checkbox positioning Fixes: MenuItem size fixes and missing separator with Gtk+ Autotest: add a test for QNAM's HTTP cache handling code QNAM HTTP: just use the expirationDate in the code that validates the cache QNAM HTTP: change the caching semantics to match documentation QNAM HTTP: fix the caching algorithm from RFC 2616 Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner improve readability a bit more fix styling; improve readability make it possible to retrieve name of the user who owns the file Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d ) ...
| * Update copyright year to 2010Jason McDonald2010-01-0673-79/+79
| | | | | | | | Reviewed-by: Trust Me
* | added CONFIG += console to qlalr.proJoerg Bornemann2010-01-081-0/+1
|/ | | | | | Otherwise we don't see any console output on Windows. Reviewed-by: Roberto Raggi
* QS60Style: Remove layouts with mirrored informationSami Merila2009-12-156-144/+35
| | | | | | | | | | | | | | Currently QS60Style stores pixel metrics values (96 of them for each layout) in a static lookup table. There is one "line" for each screensize, orientation and layout direction (ten in total). This fix removes the layout direction specific "lines" as there are only two pixel metrics values that differ depending on direction. We can handle those two inside QS60Style::pixelMetrics() and thus remove half of the rows, and thus gain 16*96*5 ~ 8kB of RAM. Task-number: QTBUG-6803 Reviewed-by: Alessandro Portale
* Remove compilation warning from S60pixelMetrics on ARMSami Merilä2009-12-071-3/+2
| | | | | | | | | Compiling s60pixelMetrics utility for ARMV5 urel gives two warnings: a) unused variable - Solution: removed b) transfer of control bypasses initialization (missing brackets within a switch-case) - Solution: brackets added. Reviewed-by: TrustMe
* utils/qlalr generator: adapt changes to xmlstream and script filesPeter Hartmann2009-11-113-85/+45
| | | | | | | | | | | | some changes were made to qxmlstream_p.h and script files directly; however, those files are generated automatically by src/corelib/xml/make-parser.sh and src/script/parser/make-parser.sh, respectively, so the generator would overwrite the manual changes to the files the next time it is run. This patch integrates those changes into the generator rather than into the files directly. Reviewed-by: Roberto Raggi Reviewed-by: Olivier Goffart
* Update mkdist-webkit script:Jocelyn Turcotte2009-11-031-2/+2
| | | | | | | - Use newest qtwebkit tag - Keep BitmapInfo.h and BitmalInfo.cpp in src/3rdparty Reviewed-by: TrustMe
* Merge commit 'origin/4.6' into featureJørgen Lind2009-11-023-5/+5
|\
| * Use PM_SplitterWidth in QS60StyleSami Merilä2009-10-273-5/+5
| | | | | | | | | | | | | | | | Updated pixel metrics values from latest S60 layouts. Also, updated pixel metrics harvester to collect pixel metric for QSplitter. Task-number: QT-686 Reviewed-by: Shane Kearns
generated by cgit v0.12 at 2024-11-14 13:18:15 (GMT)