summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Updated url variable in qdocconf files.v5.2.0-rc1v5.2.0Jerome Pasion2013-11-061-0/+1
| | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I7f989870b311e101ed4de85f3139f010012cfd71 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* QAbstractXmlNodeModel: avoid undefined behaviorMarc Mutz2013-11-051-4/+2
| | | | | | | | | | | | | | | | | | | | | | | In 409655f3451815930b70a71baa175ab9f34467ed, the C-style cast was replaced by pointer arithmetic: char *null = 0; return null + offset; Says the standard (5.7 [expr.add]/5): When an expression that has integral type is added to or subtracted from a pointer, [...] If both the pointer operand and the result point to elements of the same array object, or one past the last element of the array object, the evaluation shall not produce an overflow; otherwise, the behavior is undefined. Iow: the above code has undefined behaviour. Fix by going back to the casting version, but using a C++ reinterpret_cast instead of a C-style one. Task-number: QTBUG-32735 Change-Id: Ia774491b13b1c52089daf63a7921b163fc93abce Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Revert "Handle new QtTraceMsg type, fix warnings about unhandled enumeration ↵Kai Koehne2013-11-052-3/+3
| | | | | | | | | | value." This reverts commit bf49d9f0d41c3be802dbdd2c23dfe7c5fd86f4b0. QtTraceMsg was removed from QtCore for the moment, too. Change-Id: I1d6aaacf5e363f81272da4fbb0a4ff12337dd677 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix compilation with mingw.org headersKai Koehne2013-10-231-0/+3
| | | | | | | | | -std=c++11 sets __STRICT_ANSI__, and the stdio.h from mingw.org doesn't declare e.g. _fileno then. Change-Id: Iaa29e4f2b04bcae73b8706aff1be83913bcf6a52 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Android: Skip tools built for target architecturev5.2.0-beta1Eskil Abrahamsen Blomfeldt2013-10-111-1/+1
| | | | | | | | | | Android apps require packaging to be usable, so they need to be built individually, not as part of the subdirs build. The build would fail during make install due to this. Task-number: QTBUG-34023 Change-Id: If7627dcdc15334f82c454c6a2a19501fcc6bc970 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix undefined behavior validating XSD substitution groupsMark Shroyer2013-10-025-1/+34
| | | | | | | | | | | | | | | | | | | | | A bug in XSD substitution group validation would result in an invalid cast of SchemaType::Ptr to XsdComplexType::Ptr, in which case evaluating complexType->prohibitedSubstitutions() exhibited undefined behavior. In practice this caused validation against XSD schemas containing substitution groups to fail on some machines, where ORing the checkSet mask against out of bounds memory could cause the function XsdSchemaHelper::substitutionGroupOkTransitive() to return a false negative. Minus the bug fix, the regression test added in this commit failed on (at least) Linux ARM when compiled with the Linaro toolchain 2013.01 g++ 4.7, with flags -marm -mcpu=cortex-a8 -O2. However, it did not fail on a Linux amd64 machine prior to the bug fix. Change-Id: Idd060a941a3bc0620f1fcc903375e43022bdcbdc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Remove QtAlgorithms usage from QtXmlPatterns.Friedemann Kleint2013-09-273-4/+10
| | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I4e2c7bf7970ba59ca9443c545b66db9f509d946b Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Handle new QtTraceMsg type, fix warnings about unhandled enumeration value.Friedemann Kleint2013-09-262-3/+3
| | | | | Change-Id: Ia908aa03e0f6a0e4f92013ae84fc68ac73919d08 Reviewed-by: hjk <hjk121@nokiamail.com>
* Fix MSVC2010 warnings.v5.2.0-alpha1Mitch Curtis2013-09-242-7/+3
| | | | | Change-Id: Ic586e7d306729f26859411b17c79d36320f487e7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Adapt to QDateTime's new timezone supportThiago Macieira2013-09-231-0/+6
| | | | | | Change-Id: I685b1be45fcf6b59de12204ca471e35a5a03f06d Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: John Layt <jlayt@kde.org>
* Update QXmlQuery test result after default date format change.Jędrzej Nowacki2013-09-231-1/+1
| | | | | | | | | QTime is not showing milliseconds by default anymore, when converted to QString. Change-Id: Iba745919ee1f034aebc75628a96efad5546f03c1 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix Clang warning of constant-false comparisonThiago Macieira2013-09-071-1/+1
| | | | | | | qstringvaluefns.cpp:224:23: error: comparison of constant -1 with expression of type 'QString::NormalizationForm' is always false [-Werror,-Wtautological-constant-out-of-range-compare] Change-Id: Ia0dd98f72521709712f5ed11ecf19a48acaf1998 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-061-3/+3
|\ | | | | | | Change-Id: I29e25aef95a7b845bfe7d57d41369fec2f1fd562
| * Replace use of C-style cast with something that is not a cast.old/5.1Thiago Macieira2013-08-161-3/+3
| | | | | | | | | | | | | | | | | | Avoids a warning in user code. We should add -Wold-style-cast to our header checks. Task-number: QTBUG-32735 Change-Id: Ic284e3a5df56789d51484364b34a9ebc026bb20a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Use the new, non-deprecated QDateTime functions for UTC offsetThiago Macieira2013-09-033-6/+6
| | | | | | | | | | Change-Id: Ia7f8c08bba44fbb01d3babeed7a430dcb9660b99 Reviewed-by: John Layt <jlayt@kde.org>
* | QtXmlPatterns: Fix (!a == b) bugTobias Hunger2013-08-292-2/+2
| | | | | | | | | | | | | | | | | | | | The ! applies to a only, so the result of this expression is most likely not what was expected. Clang warned about this one. Change-Id: I600c1ec70fa22313eee70ecce8995afd83713de6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-08-052-2/+25
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8472ccedaa829436aebf4424b64a3b7dd0adc173
| * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-261-0/+25
| |\ | | | | | | | | | Change-Id: I861d55430174471036b7e7e34202725ae6131490
| | * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-231-0/+25
| | | | | | | | | | | | | | | Change-Id: I056aba05ab8e3e1c8ea9edde1a893bbade3d379a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | test: Remove QSKIP from tst_xmlpatternsSergio Ahumada2013-07-261-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Tests are passing nowaways on OS X. Task-number: QTBUG-22556 Change-Id: I1c2c864c6a9d9c9195012291745750b0193f4d00 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-231-1/+1
| |/ | | | | | | | | Change-Id: I6b23978f099044c766cf1e022253b78a7dba797b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Doc: Setting \qtvariable in module page.Jerome Pasion2013-08-021-0/+1
| | | | | | | | | | | | | | \qtvariable indicates the QT variable needed in .pro files. Change-Id: Iefd2cbc9f516cf3abb76b0f2fc2c009fb9a83900 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-234-22/+22
|\ \ | |/ | | | | Change-Id: I746d5aa3e11e8c01c370db3786788270cdd7c685
| * Replace qt.nokia.com by www.qt-project.org in doc snippets.Friedemann Kleint2013-07-162-4/+4
| | | | | | | | | | | | | | | | Task-number: QTBUG-32390 Change-Id: I1e08a4cd5bbefbfc5cfd5b36724089cb1d0e78a8 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Replace qt.nokia.com by www.qt-project.org in tests.Friedemann Kleint2013-07-152-18/+18
| | | | | | | | | | | | | | Task-number: QTBUG-32390 Change-Id: I8e3d0df9ff929490a288dca0a9da12751af6b851 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-113-1/+9049
|\ \ | |/ | | | | Change-Id: Ibc00a0629361eb26d2ad3b47e64620a2ad03717b
| * Fix mailing list address.Friedemann Kleint2013-07-111-1/+1
| | | | | | | | | | Change-Id: I31792fd1ce8dc353403a91935c872334ca7e10cc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * test: Add 5.0.0/5.1.0 bic data for linux-gcc-ia32Sergio Ahumada2013-07-102-0/+9048
| | | | | | | | | | | | | | | | The 5.0.0 data was missing from before, so taking the opportunity to add it now. Change-Id: I8d269fa735cfea9e50eeaf70c49c56aeb173b357 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Doc: Setting navigation bar variables.Jerome Pasion2013-06-261-1/+4
| | | | | | | | | | Change-Id: I0e0ac77bbae4847e65f62fb3d5b7d2c5c2368eb0 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-201-5/+5
|\ \ | |/ | | | | Change-Id: I468ad5664b2c462812a0046d14024a19392f24db
| * Remove use of 'register' from QtXmlPatterns.Stephen Kelly2013-06-161-5/+5
| | | | | | | | | | Change-Id: I7d5136b9381fcce1ac7233ac743ab205d73ca0fa Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-122-10/+7
|\ \ | |/ | | | | Change-Id: I6cadf21a571a4d6608c75d4e79f5231c8e4ab5aa
| * Fix warnings found by clang: private members unused in classesThiago Macieira2013-06-112-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | These are private classes, so there's no need to keep binary compatibility or reserved members. qabstractxmlpullprovider_p.h:103:41: error: private field 'd' is not used [-Werror,-Wunused-private-field] projectedexpression_p.h:124:55: error: private field 'm_axis' is not used [-Werror,-Wunused-private-field] qprojectedexpression_p.h:154:41: error: private field 'm_right' is not used [-Werror,-Wunused-private-field] Change-Id: Idd46da87aaa85124b285cdcf01cf76eaa16e86c3 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-06-065-5/+27
|\ \ | | | | | | | | | refs/staging/dev
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-045-5/+27
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: I6b08ce96935cf082c83496c521a9c1527f1321c4
| | * Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-291-1/+1
| | | | | | | | | | | | | | | Change-Id: I6a3c725d0c0a102a3f1254f203dde46e3512a9c5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * sync.profile: Point dependencies to an empty stringv5.1.0-rc2v5.1.0-rc1v5.1.0Sergio Ahumada2013-05-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: Ia57b19490beaab0ab551620c5a033aaf0189a5b0 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * Doc: Removed module page from "technology-apis" group.Jerome Pasion2013-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | The overviews in the main index.html replaced the technology-apis group. Change-Id: I827abd6488b07c75a23925137fce75d37de05319 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| | * Add changes-5.1.0 fileSergio Ahumada2013-05-131-0/+22
| | | | | | | | | | | | | | | Change-Id: I0d3ebb797ee1c185162a6defa4a58e2ffbfca41b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Fix warnings about signal-slot connection in filetree example.Friedemann Kleint2013-05-132-3/+3
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31079 Change-Id: I2696834f70bd0db05c9d70759b81159fabe561fd Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Fix tst_QXmlQuery::evaluateToReceiver failure.Mitch Curtis2013-06-051-1/+1
|/ / | | | | | | | | | | | | | | | | | | This patch fixes a test failure introduced by 15da0a5af20fe6771bcb94ef8d46edbd5c8fb64c. Change the date format in allAtomics.ref file to include milliseconds. Change-Id: I8786e04976872da87cbc322d322c394cb0c62a67 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-2911-17834/+465
|\ \ | |/ | | | | Change-Id: I1684b8409323c07a45b096526eff896bb6dbc13c
| * remove pointless INCLUDEPATHv5.1.0-beta1Oswald Buddenhagen2013-04-261-1/+0
| | | | | | | | | | | | | | QT+=xmlpatterns-private in xmlpatterns.pri already handles that. Change-Id: Id276ff89cc3b315119ce23c654be24a9503e9001 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Doc: Fix module name in .qdocconfTopi Reinio2013-04-261-11/+11
| | | | | | | | | | | | | | | | | | Use CamelCase for module name(s) used in in .qdocconf - this is required as qdoc will generate visible output (tags in example manifest files) based on these names. Change-Id: I2ec5426b5f2a3ea6cc40608ef2bc6c9e7b6f8dd2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Remove old QtXmlPatterns.4.* dataSergio Ahumada2013-04-226-17789/+0
| | | | | | | | | | Change-Id: I96304652faab35bdbb71bf814aab35be7dc68151 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| * Add missing LICENSE.FDL fileSergio Ahumada2013-04-191-0/+450
| | | | | | | | | | | | | | | | This seems to be a leftover from c79d19ae9d4feb353236db49381d8c6b9b032a4b Change-Id: Ie40dd9cd9f500fea6b453f2e4d37e699f3c95a70 Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com> Reviewed-by: Jason McDonald <macadder1@gmail.com>
| * Doc: Remove instructions for using qtdemo from examples READMETopi Reinio2013-04-161-32/+3
| | | | | | | | | | | | | | | | | | | | The Qt Examples and Demos Launcher is not maintained anymore. Edit the README to mention Qt Creator as the way to find and launch examples. Task-number: QTBUG-28388 Change-Id: If3662d53a46335a5bdd8ced2df104e545d3fe5ba Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * Doc: Fix minor typoSze Howe Koh2013-04-101-1/+1
| | | | | | | | | | Change-Id: I68323ffd7f58f9dcb41aab96195598eebcc6b7ce Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Update module version to 5.2.0Sergio Ahumada2013-04-081-1/+1
| | | | | | | | | | | | Change-Id: I7ef98de17bd2aafdf6cb33572a1ed05b13105e2b Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* | Merge branch 'stable' into devSergio Ahumada2013-04-054-5/+60
|\ \ | |/ | | | | Change-Id: I06fd788ffd32b612d7cc99ab65b2ae4deffcd508
View Lorry Controller Status