summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix compile on Android.HEADmasterBogDan Vatra2013-10-041-2/+8
| | | | | Change-Id: I1be0423fcda0ddd30550d4a4a25581eb019282a7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Remove unnecessary dependency to qtjsbackend from sync.profileSergio Ahumada2013-10-041-1/+0
| | | | | Change-Id: I88cd4f5df44def04567d130c03121d34f2590e9a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* don't overload operator<(const QVariant& lhs, const QVariant& rhs)Oswald Buddenhagen2013-06-121-2/+2
| | | | | | it introduces ambiguity Change-Id: I55bf26acbafbb4e582cee19f18237a927b692c4e
* put hbtree in a namespaceOswald Buddenhagen2013-03-1316-7/+133
| | | | Change-Id: Ibf9ea22d79b362872075cf219f112bfa5e865b76
* define MODULE_VERSIONOswald Buddenhagen2013-03-131-0/+2
| | | | | Task-number: QTBUG-29838 Change-Id: Ia1f68b4ea2ef72c0ba6b2d05a5ed25dca656a63e
* make use of qtHaveModule()Oswald Buddenhagen2013-01-081-1/+1
| | | | | | Change-Id: Ia89c946c258df179abca7e81a29353b4ee4ae374 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove obsolete DEPENDPATH assignmentsOswald Buddenhagen2012-12-166-6/+0
| | | | | | | | qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: I20c8e552abdc507c3a6a468e7b2740b2c14c0a4b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove unnecessary CONFIG additionOswald Buddenhagen2012-12-161-1/+1
| | | | | | | qt is already added by spec_pre.prf. Change-Id: Ic92c8d107fcb942f1de1951a01074ced9d729a6f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make use of qt_headersclean.prfOswald Buddenhagen2012-12-132-58/+2
| | | | | | Change-Id: I8efef39364a2d2c92cbcfab766831241013abba3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
* point dependencies to stable branchesOswald Buddenhagen2012-12-131-4/+4
| | | | | | Change-Id: I636d8446ed9c50f88b17784f2173ea69a362b2d4 Reviewed-by: Denis Dzyubenko <denis@ddenis.info> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Doc: Added JSON DB QML API to 'qmlmodules'Jerome Pasion2012-10-261-0/+9
| | | | | | | -also made the brief description consistent with other modules. Change-Id: I5d74175144b63f50d97e4b2ece00c3461c4a6086 Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
* use O_BINARY for hbtree files on WindowsJamey Hicks2012-10-161-0/+3
| | | | | Change-Id: I6685f42649feb1234f3254fd34e318e9b983abbb Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
* remove stray debug statementJamey Hicks2012-10-161-1/+0
| | | | | Change-Id: I38cc1e01aca1f9f1100523ff025d53ac8a69e5b9 Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
* Daemon: Use qInstallMessageHandlerKai Koehne2012-10-161-6/+6
| | | | | | | qInstallMsgHandler got deprecated in Qt 5. Change-Id: I789cb34f36564a865f31da65a397d7e6901a3c77 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* handle partial reads/writesJamey Hicks2012-10-141-11/+42
| | | | | Change-Id: I2ab6e1e6b503a2fcada0594d1c12d3a82dccf304 Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
* use qputenv instead of ::setenvJamey Hicks2012-10-142-14/+14
| | | | | Change-Id: I9d24e1d0d0d15da8f4f3995d12ff5b5e793aef12 Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
* adapt jsondb partition to windowsJamey Hicks2012-10-144-2/+10
| | | | | Change-Id: I4c5d5c2d67f1ab8c132020c5f506073becd9f35c Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
* adapt hbtree to windowsJamey Hicks2012-10-122-0/+43
| | | | | Change-Id: I1aef5540cebd859572fb6640e03442e5c2416ee4 Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
* Remove append-only btreeJamey Hicks2012-10-1124-8820/+1
| | | | | Change-Id: I2d08fbbd4971bb980a2ed5fa65d38e53d9ba1c32 Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
* Removed old deprecated c++ api.Denis Dzyubenko2012-10-1143-7685/+5
| | | | | | | This also removed old-style qml api that was using the old c++ api internally. Change-Id: Iee809bfacb4efeb31e625156420542247354dff7 Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
* Add QtJsonDb namespace to Q_PROPERTY as needed for qmlJamey Hicks2012-10-107-19/+19
| | | | | | | | | | | The QML runtime requires that QObject classes defined in other C++ namespaces have their namespace prepended in Q_PROPERTY, Q_INVOKABLE, etc. This change prepends the QtJsonDb in the necessary files in src/imports so that QtJsonDb QML elements that use Partition objects will work again. Change-Id: Id424fefe1fca960807fffc77cc47a4a2fc452a41 Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24279-5992/+5992
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I8e8328d8df56e83f13b19858434aeb6e5f888f30 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Adding documentation templates from qtbaseJerome Pasion2012-09-223-0/+776
| | | | | | Task-number: QTBUG-27293 Change-Id: Ib7844f9b21a6c863800e46dc6650b003b2f173c5 Reviewed-by: Martin Smith <martin.smith@digia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-114-6/+1
| | | | | Change-Id: Id6970fef4e7fca223bac7540da01907068fc64cc Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Update the git-archive export optionsThiago Macieira2012-09-032-0/+4
| | | | | | | | | | | | | | The .gitattributes and .gitignore files do not need to be present in packaged sources, as they are for people using the Git repository. People who download tarballs usually don't reimport into Git -- they should just download the actual repositories. Meanwhile, the .tag file is quite useful. Instead of making Git extract to the useless SHA-1 of the $n string, ask git-archive to store the SHA-1 of the commit being packaged. Change-Id: Ibe813cb99490f7b8a267cd2c0c6eca57fea8b0bd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add some docs to QJsonDbWriteRequestAli Akhtarzada2012-08-271-0/+10
| | | | | Change-Id: I41237c7afefbdf3bb70ccd7379e884191fff9ca6 Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
* Minor doc fixesAli Akhtarzada2012-08-231-2/+2
| | | | | Change-Id: I163389fa10a7d6d2126d82e44d94ed2ba0e12dd2 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* The qt quick imports are build only if qtdeclarative is presentCorentin Jabot2012-08-221-1/+3
| | | | | | | | If the declarative module is not present, the qtquick/qml components will not be build Change-Id: I5106bc85a149df74ced5e2b0aa9510fcf789a3ef Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
* remove stale fileOswald Buddenhagen2012-08-111-35/+0
| | | | | | | should have been part of efece5c88 Change-Id: Id4860aaae8dda6ee538ecd3ef1a85944e27b0e32 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-113-3/+3
| | | | | Change-Id: I858d663ff7ce516fed42bae722d155dd890c6c33 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Update import api to follow changes in qtdeclarative.Toby Tomkins2012-08-101-1/+1
| | | | | | | | Changes in 4a8a8953f70197a7ab7a62fcd01b1bc08051689e made to qtdeclarative require changes to the import api. Follow these changes. Change-Id: I49f8c4b378e640089c88cf82f433878707d3a408 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Doc: Changed HTML filename and qdoc filenameJerome Pasion2012-08-061-1/+1
| | | | | | | -index.html collides with the Qt 5 documentation Change-Id: I6fd948699d90ad5cac4d29311f9b7b81eb5dc111 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* follow s/QT_PRIVATE/QT_FOR_PRIVATE/ in qtbaseOswald Buddenhagen2012-08-062-2/+2
| | | | | Change-Id: I29c546fa441162165dd851d8ffe8893f1a0f4ec1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* don't take addresses of temporary arraysOswald Buddenhagen2012-08-061-3/+5
| | | | | | | for gcc 4.7, this is an error Change-Id: Ia65da9f5547bab983e20e34f02bdc0c5f37e2270 Reviewed-by: Tapani Mikola <tapani.mikola@nokia.com>
* Set the Qt API level to compatibility mode in all tests and in one lib.Thiago Macieira2012-08-0127-0/+31
| | | | | | | | | | | | | Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. In QtJson's case, it's using old itemviews API in one library and those cases haven't been ported yet. Task-number: QTBUG-25053 Change-Id: If732cdc29097fe3a3117b8ed2b392f6f154360ef Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiates.Jerome Pasion2012-07-308-8/+16
| | | | | | | | | -\qmlclass is now \qmltype -\instantiates is for QML types that have C++ implementation. Change-Id: Ice9c29d028753899d82250aaa188846a737fcb81 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Mark JsonDb compat and partition libraries as internal.Stephen Kelly2012-07-242-0/+2
| | | | | | | This causes the avoidance of creation of CMake files. Change-Id: I7a3af18dbee6977fdc71e3cc602a7def2690b5b8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add the CMake directory created during unit testing to .gitignore.Stephen Kelly2012-07-231-0/+1
| | | | | Change-Id: Ifb2b94bef246706a8b4c37a3e868ba350a56aa93 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Test that the package configs for QtJsonDb work.Stephen Kelly2012-07-235-0/+90
| | | | | Change-Id: I739be37d8d9edcd19473d8033ed0fa4879f088ea Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update the export macros in qtjsondb.gitThiago Macieira2012-07-113-6/+18
| | | | | | | Use the new, simpler QT_STATIC macro. Change-Id: Ic7fd86c76c10ebfd27cf3d4629373844dff7c52b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Change CONFIG += staticlib to CONFIG += staticThiago Macieira2012-07-111-1/+1
| | | | | | | That's the targetted, correct way of defining a static library. Change-Id: I4aba5f1a582f29b8f17fa112bdee36663409d0bb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* use centralized qml plugin project handlingOswald Buddenhagen2012-07-114-53/+6
| | | | | | | | note that this removes the qmldir_debug files. no other module has them, either. Change-Id: I359b9c5cb464f06fecb15b287cbf135a1cb31561 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* use centralized handling of QT_BUILD_PARTSOswald Buddenhagen2012-07-111-25/+2
| | | | | Change-Id: I2a9480646f65019e46753a02737ba5032a00883a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Prevent compilation failure when cross compilingDonald Carr2012-07-052-2/+2
| | | | | | | | | | | qmlplugindump is built for the target, and hence should not be executed on the host. To further complicate matters, it has a hard dependency on Qt Declarative internals and hence can't be adjusted to being a host tool since it would effectively require a complete Qt build on the host machine. Change-Id: I979fdd65039664d267f92b79a6791c220fb73b90 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* Merge branch 'buildsystem'Oswald Buddenhagen2012-06-2730-156/+54
|\ | | | | | | Change-Id: Icbc666ef5728194531110a6827870260e67c4147
| * switch to new-style configure testsOswald Buddenhagen2012-06-275-7/+7
| | | | | | | | | | | | | | Change-Id: I6e22f8b74d769315d635738dcdef038e61c80e0f Reviewed-by: Jing Bai <jing.t.bai@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * build system cleanupsOswald Buddenhagen2012-06-2713-49/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - pointless CONFIG+=create_prl - pointless setting of QMAKE_FRAMEWORK_BUNDLE_NAME - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - qmake -project boilerplate Change-Id: I036d7e737b4458309067c383642cddfb90599f62 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * auto-generate module prisOswald Buddenhagen2012-06-277-87/+18
| | | | | | | | | | | | Change-Id: I818eb4900cb6ac4de427e1b7db0c6fdab3f60d0f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * use auto-defined QT_BUILD_*_LIB variablesOswald Buddenhagen2012-06-276-6/+3
| | | | | | | | | | Change-Id: Iee5324ac523e603a25983b8a2581f07e44a5cdef Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * don't place the jsonstream library in a more or less random folderOswald Buddenhagen2012-06-272-3/+2
| | | | | | | | | | | | Change-Id: I0face0224840ed3e87174a01bf0e2df5f1a4e85a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 03:24:27 +0000