summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-10-04Updated to Qt 5.3.99+beta1tizen_3.0.m14.3_ivi_releasetizen_3.0.2014.q3_common_releasesubmit/tizen_mobile/20141120.000000submit/tizen_ivi/20141010.000000submit/tizen/20141007.194728accepted/tizen/ivi/20141011.052141accepted/tizen/common/20141008.082130tizen_3.0_ivitizen_3.0.m14.3_ivitizen_3.0.2014.q3_commonaccepted/tizen_3.0.m14.3_iviaccepted/tizen_3.0.2014.q3_commonTomasz Olszak1-1/+1
Change-Id: Iaf428cd0912176116e97511b24c2802e52c8566f Bug-Tizen: TC-1008 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-10-04Added .gbs.conf file to follow upstream tags formatTomasz Olszak1-0/+2
Change-Id: I2b0869ad3274b3787ed07c64a12bf627fb395859 Bug-Tizen: TC-1008 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-10-04Changed source package name in prep step to allow incremental builds.Tomasz Olszak1-2/+2
Bug-Tizen: TC-1008 Change-Id: I7c86e0778582d0cf1595ca248d8f1365e14cd6fc Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-10-03Bump package version to 5.3.1Tomasz Olszak1-1/+1
Change-Id: I2d0191fe4ed41b4c7364e72d93188d757449a9f5 Bug-Tizen: TIVI-2416 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-10-03Bump package version to 5.3.0Tomasz Olszak1-1/+1
Change-Id: I29cee42fb45903de746492ef75799646395e00f7 Bug-Tizen: TIVI-2416 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-10-03Bump package version to 5.2.96+rc2Tomasz Olszak1-1/+1
Change-Id: Ibbe6d2cc1bbbd6f8372d32016f2f5f4a5b4eadb1 Bug-Tizen: TIVI-2416 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-10-03Bump package version to 5.2.95+rc1Tomasz Olszak1-1/+1
Change-Id: I81a743856684b56032c67956c16797197d09efbe Bug-Tizen:TIVI-2416 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-10-03Added manifest file according to smack 3-domain model.Tomasz Olszak2-0/+9
Bug-Tizen:TIVI-2416 Change-Id: I3a92a3b89c35775cec7a97fb4f4028f88750d71b Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-10-03Bump package version to 5.2.90+alphaTomasz Olszak1-1/+1
Change-Id: I9f6603c18e3db5ba853465df157ce2c7a0d807de Bug-Tizen:TIVI-2416 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-10-03Bump package version to 5.2.2Tomasz Olszak1-1/+1
Change-Id: I6fefc3480fff429891e23927de7f2d2e0ecfe220 Tizen-Bug: TIVI-2416 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-10-03Bump package version to 5.2.1Tomasz Olszak1-1/+1
Change-Id: Ic470d500167409096fad54ccd87de2a13efdec3e
2014-10-03Spec file adapted for TizenTomasz Olszak1-14/+39
2014-10-03Import from MerTomasz Olszak1-0/+101
2014-09-22Don't spin a nested event loop for loading schemas synchronously over HTTP.v5.3.99+beta1Pierre Rossi2-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>
2014-09-17Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Frederik Gladhorn0-0/+0
2014-09-17Remove qtdemo from gitignoreRainer Keller1-1/+0
QtDemo was removed with a commit in qtdoc. Change-Id: Id7c73ade6ba377aafc389bf1f11468d301438af3 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-09-16Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn0-0/+0
Conflicts: .qmake.conf Change-Id: Iaffc08b9bd62e43d866a60785b0a2e6ac3a46010
2014-08-29Bump versionFrederik Gladhorn1-1/+1
Change-Id: I0b33f04b08aec0d3c1745fb06796747973014100
2014-08-28Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn14-0/+154
Change-Id: I3d603fd0df0a445b392a758d1668bfaa9af29b53
2014-08-24Update license headers and add new license filesAntti Kokko853-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>
2014-08-18Add missing private headers warningSamuel Gaist14-0/+154
Change-Id: Iaac8c5129451d958d4e8d90ed6bbae80ed6c8755 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2014-08-14fix for stack overflowKamil Rojewski1-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>
2014-07-09Make tests compile with the QExplicitlySharedDataPointer's static_castUlf Hermann1-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>
2014-07-08Make QtXmlPatterns compile with the QExplicitlySharedDataPointer's static_castGiuseppe D'Angelo1-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>
2014-07-07Compile fix for platforms without process supportMaurice Kalinowski2-1/+21
Change-Id: Ie150bec62827b592d4b3f2df98a51862d3cc76ae Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-07-07Doc: Removing url variable from qdocconf file.Jerome Pasion1-1/+0
-url inherited from the url variable set in qtbase/doc/global Change-Id: I4f64b5d342409fbe7013c8f5b6c1cef9b3c33673 Reviewed-by: Martin Smith <martin.smith@digia.com>
2014-06-26Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn0-0/+0
Conflicts: .qmake.conf Change-Id: I792cdcb53c271d64f58cd25e6541665daa6efcac
2014-06-21Add missing copy assignment operator to QXmlSchemaThiago Macieira2-0/+12
Found by MSVC 2013 when. Change-Id: I09c23afca4c9045523ae0722751fb27737b1b5f8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2014-06-18Bump versionOswald Buddenhagen1-1/+1
Change-Id: I3d915197872fbeda076ac4118ce66e856a678acc
2014-05-22Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2-3/+3
Conflicts: .qmake.conf Change-Id: Ia4376114da086f0e01c5e0833a222d5fb06e33fd
2014-05-16Fix copy and paste errorupstream/5.3.1upstream/5.3.0Frederik Gladhorn1-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>
2014-05-14Fix copy and paste errorFrederik Gladhorn1-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>
2014-04-22Bump MODULE_VERSION to 5.3.1upstream/5.2.96+rc2upstream/5.2.95+rc1Sergio Ahumada1-1/+1
Change-Id: Ib01b7b81f4b154910595a5eacd5fa502241097fa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-04-11Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2-2/+2
Change-Id: I600107f9b564a5eddac5a1e9a346e3ae3d8bbd6e
2014-04-01Fix typoSergio Ahumada2-2/+2
Change-Id: I4754f1bc1f9fb3e099fc7c7135ca0a933d9b7475 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2014-03-24Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn4-4/+4
Change-Id: If9e2f5b518a9078488a7df537d306d495da4672a
2014-03-03Fix some typosupstream/5.2.90+alphaSergio Ahumada4-4/+4
Change-Id: Ic387dac14f664fd01700142ca303d01d2fe09168 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2014-02-20Bump module version to 5.4.0Thiago Macieira1-1/+1
Change-Id: Id44380d8e5fe73ef63a6517637de53cbd6700c8a Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-11Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2-3/+21
Change-Id: I60405f79dbe590e2f598d57f80794364f415c566
2014-02-11test: Don't fail *all* tests if the network test server is not set upupstream/5.2.2Sergio Ahumada2-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>
2014-01-24Compile fix for WinRTMaurice Kalinowski1-1/+1
Change-Id: I1c9a9027ac4a592aaf6f34450ab6fbcf3224e47f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-01-22whitespace fixesOswald Buddenhagen27-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>
2014-01-17Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2-7/+5
Conflicts: .qmake.conf Change-Id: I8a745d75ab994164aa861f5d5082e493b02eaea4
2014-01-16Bump MODULE_VERSION to 5.2.2Sergio Ahumada1-1/+1
Change-Id: Ibf702ab35725578d4f72f4959b1bcca9d8332ce0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-01-15Minor optimization, use QStringRef over QStringJędrzej Nowacki1-3/+3
That way we avoid some unnecessary memory allocations Change-Id: I597443393671d57b1a47b37eb15c3eca54ee4168 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2014-01-14fix conditionals in DayTimeDuration::stringValue()Joerg Bornemann1-4/+2
Task-number: QTBUG-35479 Change-Id: If385bd85f5c20871a0248c828626deea2d72e0a2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
2014-01-10Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2-8/+0
Change-Id: I220517794f3427f9f1746981e8dc7256bb482285
2014-01-10Remove unused variable, found by ICC 14Thiago Macieira1-2/+0
qxslttokenizer.cpp(700): warning #177: variable "val" was declared but never referenced const QStringRef val(m_currentAttributes.value(CommonNamespaces::XML, QLatin1String("space"))); ^ Change-Id: Ic806bf1e9c22ead8680907b0e22794d7b07dcc90 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2014-01-09Remove unused static functions in QtXmlPatternsThiago Macieira1-6/+0
Found by Clang 3.4. Change-Id: I60f78b62d2ecacf58d534623eced537ca62a2405 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-06Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn1-0/+1
Change-Id: I918b255b204a5246fa9cdc9ed3f8c7d71ab01e35