summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QAbstractScrollArea - add SizeAdjustPolicy and viewportSizeHintChristoph Schleifenbaum2013-04-2217-28/+262
| | | | | | | | | | This patch adds SizeAdjustPolicy to QAbstractScrollArea. If it is set to AdjustToContents it will make use of the new protected viewportSizeHint() (BC since it was reserved in Qt5). This function returns a suggested size based on contents. Change-Id: I5d8aa517e88b8b21c5712e62b4d574c3aad99d3b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* SSL namespace: Add enum to disable SSL session sharingPeter Hartmann2013-04-224-3/+6
| | | | | | | | | | There is already an enum to disable SSL session tickets, which has been used to disable session sharing for now. However, SSL session sharing is not the same as SSL session tickets: Session sharing is built into the SSL protocol, while session tickets is a TLS extension (RFC 5077). Change-Id: If76b99c94b346cfb00e47366e66098f6334fd9bc Reviewed-by: Richard J. Moore <rich@kde.org>
* Compile with Clang.Morten Johan Sørvig2013-04-181-4/+17
| | | | | | | | | | This bug surfaced after we switched Mac over to use clang's libstdc++, which has __builtin_popcount but does not mark it as constexpr. Change-Id: I4260af48b00c6db3322e52fb113075d305b1e1ec Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-04-1749-210/+348
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-1249-210/+348
| |\ | | | | | | | | | Change-Id: Iee73c93067c5822d8dd51a8692e6da9df4ba49f5
| | * Widgets: Propagate 'accepted'-state of touch begin events.Friedemann Kleint2013-04-123-9/+16
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29946 Change-Id: Ia9ac54251f52b6ae4b3d667e49b96441def72a57 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * Fix Windows CE compilation.Friedemann Kleint2013-04-121-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Breakage introduced by 11e9f1368be986d0e128e8f7b2423d9cc7dd5436 . Simplify #ifdef-blocks. Task-number: QTBUG-30063 Change-Id: I0710915ff7b0ad5947935904c43ff9b621f638f2 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| | * Fix qlocalsocket_tcp.cpp build for Windows Embedded Compact 7.Janne Anttila2013-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no 'name' variable, but apparently 'd->serverName' is correct variable here. Some other methods take 'name' as an argument and have similar code block, so I think this is a copy/paste error introduced somewhere in the past. Change-Id: I2e82b42688b9928e0dcc5054df04e87d30a5e38e Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Johannes Oikarinen <johannes.oikarinen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * tst_qtranslator: Remove QT_DISABLE_DEPRECATED_BEFORE=0Debao Zhang2013-04-122-9/+6
| | | | | | | | | | | | | | | Change-Id: Iefd8ce56b7102b5a6a656df7dbea2cd344bb9b5d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * tst_qcoreapplication: Remove QT_DISABLE_DEPRECATED_BEFORE=0Debao Zhang2013-04-122-2/+1
| | | | | | | | | | | | | | | Change-Id: I6d5098ff57293171b5ddd3a58c53718cbbc8e4bf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * tst_qdataurl: Remove QT_DISABLE_DEPRECATED_BEFORE=0Debao Zhang2013-04-121-2/+0
| | | | | | | | | | | | | | | Change-Id: I6f2e45bbc6d31cac4d9b8c735650f7985865109c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Fix leaking of QFontEngineDataKonstantin Ritt2013-04-124-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFontCache now references QFontEngineData-s it maintains, so that QFont instances not freed prior to calling ~QFontCache() would destroy QFontEngineData on their own. Task-number: QTBUG-25434 Change-Id: Ia7679d64de436841f09ac7be62ceb570e50cce5b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: jian liang <jianliang79@gmail.com>
| | * Enable qDebug to console when desired on Android.Gunnar Sletta2013-04-121-1/+7
| | | | | | | | | | | | | | | Change-Id: I91906c5fc2a5b406f416c296c124a01795e69b8a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * Warn if mouse event occurs outside target window in tests.Stephen Kelly2013-04-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class of bug seems to occur in 'flaky' CI tests, so give more information about what the problem is. Found here: https://codereview.qt-project.org/#change,44210 Change-Id: I73908e309bdecf1fd3bc323dd4e8febe47c1239a Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * Only test cmake module versions if available for test.Stephen Kelly2013-04-111-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The expected versions are only set if the cmake tests are set up by qmake by running qmake && make check If instead someone uses cmake directly: mkdir build && cd build && cmake .. && ctest the expected versions are not known, and the test fails without this patch. So, don't test the versions if they are not known. Change-Id: I2e8a4f651a69a8817c819d881be75ca07bc1bfd4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * Remove unused private members [tools]Thiago Macieira2013-04-115-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apple Clang 4.2 caught private members that aren't used in a class with no friends. Since this code is in a tool, there's no binary compatibility requirement. databaseinfo.h:71:13: error: private field 'driver' is not used [-Werror,-Wunused-private-field] quoter.h:86:10: error: private field 'validRegExp' is not used [-Werror,-Wunused-private-field] qmlvisitor.h:123:11: error: private field 'tree' is not used [-Werror,-Wunused-private-field] Change-Id: Iba9995f28ddef983c9ffc1dc551f042539252704 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Fix the check if mouse events should be synthesized from touch eventsFabian Bumberger2013-04-114-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QGuiApplication only Qt::AA_SynthesizeMouseForUnhandledTouchEvents is taken into account when synthesizing mouse from touch events, in QApplication only the PlatformIntegration syle hint QPlatformIntegration::SynthesizeMouseFromTouchEvents. With this patch both attributes are checked. Furthermore the check was moved out of translateTouchToMouse in QApplication in order not to influence the result which is returned to the user, when mouse events are not be synthesized. Change-Id: I87ac7299f0a9fbf0a083eff9c547f0dbfab75dfb Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * ANGLE: Use rtti_off in CONFIG only for releaseJonathan Liu2013-04-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | ANGLE uses dynamic_cast in debug.h for debug builds which require RTTI. Change-Id: I0e2fea7ed751dc87624d7e76d179023accb9c126 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * INSTALL: Fix URL of Installing Qt documentationSergio Ahumada2013-04-111-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also removing qt-embedded-install.html link because it doesn't exist anymore and it references to a non-existing html page. Change-Id: Iad9bad20544cf6398c096a4df7662abdf5be5644 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Minimize the contents of the INTERFACE_INCLUDE_DIRECTORIESStephen Kelly2013-04-111-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The property only needs to contain the direct include dirs of a target. For example, Qt5::Gui does not need to contain the include/QtCore directory because it already has Qt5::Core in its LINK_INTERFACE_LIBRARIES. Change-Id: I69612f42c29e6056b3d15399498d041d43a0dd6b Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * Android: Remove qdevice.pri warning in configure stepEskil Abrahamsen Blomfeldt2013-04-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Use the appropriate way to load the .pri file which also checks for its existence before loading it. Change-Id: I7d36da1593bb7fa1b5f6fd4d10b69e20c6aaa836 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Write two missing linker options to the vcxproj fileAndy Shaw2013-04-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Both the /NXCOMPAT and /DYNAMICBASE options were handled by qmake but never written to the vcxproj file even if they were set in the pro file. Change-Id: I4ca26fb312648944c25d3a24cdc8c640c9de619d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Call QString::normalized when it is constructed via the native APIAndy Shaw2013-04-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a string comes from the native APIs then it may need to be normalized. Task-number: QTBUG-14787 Change-Id: I5164e80efcd1d99a50263c72bcf97d7fb31b38f7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * Do not show the warning if queryAI() returns an invalid interface.Jan Arve Saether2013-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should only warn about missing a11y plugins if iface is 0, since we obviously have the plugin otherwise. This got triggered by that a visible widget got destructed, which in turn called hide(), which ultimately ended up calling QAccessible::updateAccessibility(QAccessible::ObjectHide). When QAccessibleEvent::accessibleInterface() then called queryAccessibleInterface(), QAI::isValid() would return false because the widget was in its destructor. Change-Id: If655e00e7bb3737a39e24e26dbd1e23edd515bf5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * QVector: Fix signedness warning in assert.Friedemann Kleint2013-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-30331 Change-Id: I91b346b36162e8146a05babd24afa4bfb7259bec Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| | * Stabilize tst_qcombobox.Friedemann Kleint2013-04-111-46/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove member variable testWidget and instantiate on the stack to ensure tests do not interfere. - Move widgets away from taskbar areas. - Fix windows geometry warnings by making small windows frameless. - Fix wrong target widget for key click in keyBoardNavigationWithMouse(). Task-number: QTBUG-30573 Change-Id: I6d9fad0f212814a67367baf446750e9bed0ebdb2 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * Merge "Merge branch 'release' into stable" into refs/staging/stableStephen Kelly2013-04-112-16/+27
| | |\
| | | * Merge branch 'release' into stableSergio Ahumada2013-04-102-16/+27
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/styles/qwindowsvistastyle.cpp Change-Id: Ifd17532393ebab8ed454c6a79bab622959ceef95
| | | | * Update changes log for 5.0.2v5.0.2Sergio Ahumada2013-04-081-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01321d4d2074a04e48e90580a4ec38f0af2f23c6 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| | | | * Fix compilation with QT_NO_ACCESSIBILITY.Friedemann Kleint2013-04-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-27860 Change-Id: I561b0b0b1a098556f9de909241b448307a271985 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> (cherry picked from commit 8b29c7539d87a387854cf06782a7b078dce63612) Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | | | * Clear the WA_QuitOnClose flag from EvalMessageBox.Michael Brüning2013-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The evaluation message box caused the QtWebProcess to quit due to the fact that the process has no other windows and EvalMessageBox was both set to be closed on quit and ended up being the last window in the process. Change-Id: Iad6461d014258fdc5fade7dafe48da33903377bb Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| | * | | Make qt5_use_modules find dependents only in the parent directory.Stephen Kelly2013-04-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to 70420ec3 (Look for cmake package dependents only in the parent directory., 2013-04-02), make sure this cmake function only searches for sibling packages as dependencies. Change-Id: Icab23d333fa6a750ee262b592fae39f0ba334fee Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * | | Make the umbrella Qt5 CMake Config file find components only in the parent ↵Stephen Kelly2013-04-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory. Similar to 70420ec3 (Look for cmake package dependents only in the parent directory., 2013-04-02), make sure cmake only searches for sibling packages as components. Change-Id: I9e0c13dfcdba28a9fd6892828b0f509dd63e6604 Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * | | QFreetypeFace: Fix getFace() uses UTF-8 paths on non UTF-8 localesKonstantin Ritt2013-04-115-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFontEngine::FaceId::filename is intended to be local8Bit-encoded but QFreetypeFace::getFace() always treats it like UTF-8-encoded. Also replace explicit (to|from)Local8Bit and toLatin FaceId::filename conversions with QFile::(en|de)codeName, where appropriate. Change-Id: Ic7beabf0a160f2f02f1667bcb8e6067adaba1c16 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * | | Fix QFontconfigDatabase unable to fallback to a localized familyKonstantin Ritt2013-04-113-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When populating the font database, FcPatternGetString(FC_FAMILY) gets a localized font family name; but, in fallbacksForFamily, it gets a non-localized font family name, so it unable to find the proper font to fallback. Simply register all family name variants as aliases to localized name and make sure they are checked when getting fallback families. Task-number: QTBUG-28806 Task-number: QTBUG-30415 Change-Id: I71c03ae9b51a28736c2576f3442f1bbdb3497c09 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: jian liang <jianliang79@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * | | Generate Win64 code when testing 64bit Qt on Windows.Stephen Kelly2013-04-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix the issue reported here: http://thread.gmane.org/gmane.comp.lib.qt.devel/10746 From: http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/6590/focus=6593 Change-Id: I523de5c1a89f08bd832a684fcff7c57565ebc5c9 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * | | Use CMake facility for verbose makefiles instead of an env var.Stephen Kelly2013-04-102-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should also have an effect for Visual Studio project files, not just makefile generators. Change-Id: I395071f09b29a6e8967a3d44e41d30480ae783f7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * | | Windows: Dont use black as clear color on opengl windowsJens Bache-Wiig2013-04-101-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perhaps this made sense when all our open gl examples were black, but with components and I would assume the majority of use cases we should use the default window background color to fill exposed window background during a resize. Change-Id: Ia439a7c3919243efa6026e2e07bee62c25557df0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * | | Don't use UNAME_MACHINE on LinuxThiago Macieira2013-04-101-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need it. Let linux-g++ be the default on all Linux builds, period. Task-number: QTBUG-30590 Change-Id: I26c73bf4f054684763b64ef5651b3488363ea7a1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | | QNX: Adjust rotation according to initial orientationRafael Roquetto2013-04-103-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29201 Change-Id: I37e82904e0f3d8b372b31ee7d1379e61c788c622 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
| | * | | Android: Backslash workarounds for Unix Makefile generatorRay Donnelly2013-04-101-10/+14
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If mingw32-make.exe encounters a backslash as the last character on a line it interprets this as signifying line continuation. When building Android Qt on Windows via cmd.exe, this happens as backslashes are used on Windows as directory separators. The workarounds are to make sure that a comment appears directly after the definition of DESTDIR and that a space ends such $(MOVE) command lines. Change-Id: I7f93b655e004edaadac41d0d96bca23e1ba3a85c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | QNX: Fix filenames returned by the file dialog.Sergio Martins2013-04-171-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QUrl prefixes like file:// should be used. QFileDialog will use QFileInfo later on, and that doesn't support QUrl prefixes. Change-Id: I8f6d2fb9a4f502cff030a1cdd43b047b8ed5a120 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | | | qmake: do not write timestamps to generated MakefilesDmitry Shachnev2013-04-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These timestamps were useless and broken on non-ascii locales. Change-Id: Iad08eb0f5dfd5e86f6451d6572365d0c080e6115 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | iOS: Don't mangle QT_ARCH when being more specific about what arch to buildTor Arne Vestbø2013-04-162-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On iOS the compiler expects archs like armv6, armv7, armv7s when passed the -arch flag, or when the ARCHS Xcode variable is set. Instead of mangling QT_ARCH, which is used other places and assumed to match the values provided by the arch.test, we use our own variable. Change-Id: I05e10be8d69dd4d7cbcef04640fef99f1efb253d Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | | | Scope QT_COMPILER_SUPPORTS_xxx by processor architecture in qconfig.hTor Arne Vestbø2013-04-131-8/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie306b7b26e7dde641177ad54daf4365085fe9dce Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | Make QT_CPU_FEATURES a map of features based on architectureTor Arne Vestbø2013-04-133-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now there's only one architecture per host/target, but this will change once we start detecting the CPU features for both device and simulator on iOS. For convenience we set QT_CPU_FEATURES to the resolved value of the current architecture, so that simd.prf still can use QT_CPU_FEATURES directly. Change-Id: I28e8b339a5c30a630e276165254dba09a3da6940 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | Json writer, support larger signed integers upto 2^53Darryl L. Miles2013-04-123-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously only 32bit signed integers were ensured to be supported by JsonValue type via API but it is expected that a larger integer range should be supported by a JSON implementation. This commit brings the Qt implementation into parity with NodeJS JSON.stringify() in respect of the JavaScript Number type. Change-Id: If91153cb3b13ecc14c50da97055b35ce42f341e7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Json writer, emit full precision for floating point Number typesDarryl L. Miles2013-04-123-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously Qt JSON writer would only emit 6 digits of precision as this is the default with the formatter. However with testing against NodeJS JSON.stringify() this behavior is inconsistent with the defacto standard JSON implementation and conveys a loss of precision. Change-Id: Ie1845a6e0ee0b4c05f63ec0062f372e891855f0b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Json writer, only emit floating point finite numbers, ignore INF/NaNDarryl L. Miles2013-04-123-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My interpretation of RFC4627, Section 2.4 "Numbers" of: Numeric values that cannot be represented as sequences of digits (such as Infinity and NaN) are not permitted. I have also verified this matter with NodeJS JSON.stringify() that emitting a null is consistent behavior with a JSON implementation written in JavaScript. Previously Qt would emit: { plusInfinity: inf, minusInfinity: -inf, notANumber: nan } Which maybe turned into a string values of "inf", "-inf", "nan" by the receiving parser. Now it returns the JSON null value just like NodeJS JSON.stringify(). Change-Id: I9f9c17f12b2606280806c47a9d90465c4ba5f786 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | iOS: Don't quote -force_load, it broke when generating MakefilesTor Arne Vestbø2013-04-121-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Instead we pass the -force-load as a single argument to the linker, which is not mangled/touched by either the Xcode or Makefile generators. Change-Id: I72e17638f0a4a8308a352d4b2033c1b5a9b65b84 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 10:28:44 +0000