summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Doc: link issue qtxmlpatternsNico Vertriest2015-01-192-3/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: Ibc6b27e1935d54e90a8842e788b20dd472472065 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | Fix broken QSourceLocation autotestKai Koehne2015-02-131-2/+2
|/ / | | | | | | | | | | | | | | The test relied on operator<<(QDebug, const QUrl &) adding unnecessary spaces. This got fixed in qtbase commit 868201155. Change-Id: I75f71a82f6426da396c1634cecce3b21e3ca8580 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-1910-87/+114
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id327fd1d5933b38c3fcc3f7e9edadb34aaf7a059
| * Bump versionOswald Buddenhagen2015-01-161-1/+1
| | | | | | | | Change-Id: I18f0254aed77198fe045cd0747931b400e2af6d5
| * Doc: fix issues to display examples in Qt Creatorv5.4.15.4.1Leena Miettinen2015-01-0510-87/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | - Add \brief commands to example docs to show descriptions - Add an examples page with the \group command - Link to the examples page from the module index page - Edit the .qdocconf file - Edit the .gitignore file to allow pushing changes to examples - Add a generic thumbnail image for C++ Code Analyzer example Change-Id: I1a313ae26664ce9fc50ef8962f0facd57dea546b Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-01-142-293/+1
|\ \
| * \ Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-022-293/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1a3ce01707f9a09f7370479a97a8d8a738881389
| | * remove unnecessary LICENSE.GPLv2Jani Heikkinen2014-12-221-292/+0
| | | | | | | | | | | | | | | Change-Id: I8719910e1e48ba73ace71914b38a23c7b12a874b Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
| | * Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | | | | | | | | | Change-Id: If7dfc46f236f8a6a2ee6721e64ec6552901bfad6
| | * Doc: Updated the \example command to point to the right directoryv5.4.0-rc1v5.4.05.4.0Venu2014-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | qdoc needs a directory with a project file to generate the source files list at the bottom of the example page. Change-Id: I06b459cce495435d68ed5555ff4f48c860b63e64 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Add support for QtInfoMsgKai Koehne2015-01-121-2/+2
|/ / | | | | | | | | | | | | | | | | Replace the generic default label by the new QtInfoMsg enum, which got added to Qt5Core. Change-Id: Ia56d24f29519d8f9c8f184d74b77292ecbb0bd4b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add default label to QtMsgType switch statementKai Koehne2014-12-201-0/+1
| | | | | | | | | | | | | | | | | | This enables us to add a new QtInfoMsg message type to qtbase without breaking qtxmlpatterns. Change-Id: Ia4dcee9390eb6b7fc02cf10067317879e931a092 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-0920-51/+192
|\ \ | |/ | | | | Change-Id: I4a853063ea9aaeb5d7055d4652be6faef468236e
| * Doc: Applied title case to section1 titlesv5.4.0-beta1Nico Vertriest2014-10-092-4/+4
| | | | | | | | | | | | Task-number: QTBUG-41250 Change-Id: I3155acb9a6813b0309de7fa0542f29c5a3a46b17 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Polish schema example.Friedemann Kleint2014-10-081-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | Add some error handling, fix warning on startup: QIODevice::read: device not open caused by MainWindow::schemaSelected(0) which clears the instance combo causing the current index to temporarily change to -1. Change-Id: I213d68b07b2dee4e2bbc1404aaf149ce7c189713 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Don't spin a nested event loop for loading schemas synchronously over HTTP.Pierre Rossi2014-09-222-42/+12
| | | | | | | | | | | | | | | | | | | | Instead, use the internal synchronous load API in QNAM that relies on a separate thread with a blocking queued connection, just like QtWebKit does for synchronous XHR. FTP doesn't support this attribute, so we have to keep the event loop trick for that one. Change-Id: I785fa6d967160552b31778fcfc120d7ec4194a08 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Frederik Gladhorn2014-09-170-0/+0
| |\
| | * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-160-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iaffc08b9bd62e43d866a60785b0a2e6ac3a46010
| | | * Bump version5.3Frederik Gladhorn2014-08-291-1/+1
| | | | | | | | | | | | | | | | Change-Id: I0b33f04b08aec0d3c1745fb06796747973014100
| * | | Remove qtdemo from gitignoreRainer Keller2014-09-171-1/+0
| |/ / | | | | | | | | | | | | | | | | | | QtDemo was removed with a commit in qtdoc. Change-Id: Id7c73ade6ba377aafc389bf1f11468d301438af3 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
| * | Merge remote-tracking branch 'origin/5.3' into 5.4v5.4.0-alpha1Frederik Gladhorn2014-08-2814-0/+154
| |\ \ | | |/ | | | | | | Change-Id: I3d603fd0df0a445b392a758d1668bfaa9af29b53
| | * Add missing private headers warningv5.3.25.3.2Samuel Gaist2014-08-1814-0/+154
| | | | | | | | | | | | | | | Change-Id: Iaac8c5129451d958d4e8d90ed6bbae80ed6c8755 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-08-28853-16849/+9844
|\ \ \ | |/ / | | | | | | Change-Id: I8b1548b720d241259bb531b4742ac92d93788855
| * | Update license headers and add new license filesAntti Kokko2014-08-24853-16835/+9826
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: If9208b9c90bcea35bbfe6b9c10db7803e97767e0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * | fix for stack overflowKamil Rojewski2014-08-141-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | Recursion in item mapping iterator caused a stack overflow for large datasets. Task-number: QTBUG-40153 Change-Id: I693798de0ecfd3a920a3dd270172ce7ec3c13d8d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | Remove a wrong ###Lars Knoll2014-08-151-1/+0
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-28940 Change-Id: I38c4af131d6056b42d564d20b3a1a5fd839b5b5b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Bump versionOswald Buddenhagen2014-08-091-1/+1
|/ / | | | | | | Change-Id: I03fecb881425cacf7d4ef47376ea69a188aa716e
* | Make tests compile with the QExplicitlySharedDataPointer's static_castUlf Hermann2014-07-091-1/+1
| | | | | | | | | | | | | | | | We also need the static_casts there. Change-Id: I5e04109d2465e079909138152324820e931062cd Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Make QtXmlPatterns compile with the QExplicitlySharedDataPointer's static_castGiuseppe D'Angelo2014-07-081-1/+1
| | | | | | | | | | | | | | | | This module requires the static_casts to happen. Change-Id: Iea2f5aa8c6033edffd920a6de73509f3ae19721d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* | Compile fix for platforms without process supportMaurice Kalinowski2014-07-072-1/+21
| | | | | | | | | | Change-Id: Ie150bec62827b592d4b3f2df98a51862d3cc76ae Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I4f64b5d342409fbe7013c8f5b6c1cef9b3c33673 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-260-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I792cdcb53c271d64f58cd25e6541665daa6efcac
| * Bump versionOswald Buddenhagen2014-06-181-1/+1
| | | | | | | | Change-Id: I3d915197872fbeda076ac4118ce66e856a678acc
* | Add missing copy assignment operator to QXmlSchemaThiago Macieira2014-06-212-0/+12
| | | | | | | | | | | | | | Found by MSVC 2013 when. Change-Id: I09c23afca4c9045523ae0722751fb27737b1b5f8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-05-222-3/+3
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia4376114da086f0e01c5e0833a222d5fb06e33fd
| * Fix copy and paste errorv5.3.1stable5.3.1Frederik Gladhorn2014-05-161-1/+1
| | | | | | | | | | | | | | | | | | Fix error 11 identified by static analysis from http://www.viva64.com/en/b/0251/ Change-Id: I3ed821c6d7cda874bfa5e3a24ccde1a4f2f13ec9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * Fix copy and paste errorFrederik Gladhorn2014-05-141-2/+2
| | | | | | | | | | | | | | | | Fix error 8 and 9 identified by static analysis from http://www.viva64.com/en/b/0251/ Change-Id: I7f6741513814d8707e9dfe3402f970696238b8a3 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-221-1/+1
| | | | | | | | | | Change-Id: Ib01b7b81f4b154910595a5eacd5fa502241097fa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-112-2/+2
|\ \ | |/ | | | | Change-Id: I600107f9b564a5eddac5a1e9a346e3ae3d8bbd6e
| * Fix typov5.3.0-rc1v5.3.0release5.3.0Sergio Ahumada2014-04-012-2/+2
| | | | | | | | | | Change-Id: I4754f1bc1f9fb3e099fc7c7135ca0a933d9b7475 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-244-4/+4
|\ \ | |/ | | | | Change-Id: If9e2f5b518a9078488a7df537d306d495da4672a
| * Fix some typosv5.3.0-beta1Sergio Ahumada2014-03-034-4/+4
| | | | | | | | | | Change-Id: Ic387dac14f664fd01700142ca303d01d2fe09168 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/ | | | | | Change-Id: Id44380d8e5fe73ef63a6517637de53cbd6700c8a Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/stable' into devv5.3.0-alpha1Sergio Ahumada2014-02-112-3/+21
|\ | | | | | | Change-Id: I60405f79dbe590e2f598d57f80794364f415c566
| * test: Don't fail *all* tests if the network test server is not set upold/5.2Sergio Ahumada2014-02-112-3/+21
| | | | | | | | | | | | | | | | | | Since not all tests for tst_qxmlquery and tst_xmlpatterns depend on the network test server being set up, now we just fail those which really depend on it allowing the rest to be normally run. Change-Id: I0588cf986ffddea117cee680e07e1a8cc4d68436 Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | Compile fix for WinRTMaurice Kalinowski2014-01-241-1/+1
| | | | | | | | | | Change-Id: I1c9a9027ac4a592aaf6f34450ab6fbcf3224e47f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | whitespace fixesOswald Buddenhagen2014-01-2227-80/+80
| | | | | | | | | | | | | | | | remove trailing spaces & expand tabs Change-Id: Ic958087d8c50f3c51d767f5191e54c4079cc74a2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-172-7/+5
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8a745d75ab994164aa861f5d5082e493b02eaea4
| * Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
| | | | | | | | | | Change-Id: Ibf702ab35725578d4f72f4959b1bcca9d8332ce0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Minor optimization, use QStringRef over QStringJędrzej Nowacki2014-01-151-3/+3
| | | | | | | | | | | | | | That way we avoid some unnecessary memory allocations Change-Id: I597443393671d57b1a47b37eb15c3eca54ee4168 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
View Lorry Controller Status