summaryrefslogtreecommitdiff
path: root/src/shared/json/json.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fix compiler warnings on windows.David Schulz2016-04-221-14/+15
| | | | | | | | | | | Ignore some warnings inside 3rd party code and fix a lot of conversion warnings. Change-Id: I909f2f31a4639015bf7dd028d2d435ff1d1167bc Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* JSON: Compile fix.Christian Kandeler2016-03-071-1/+1
| | | | | Change-Id: I9dbeff5a70a347efaa88b563a35198258d3c5ecd Reviewed-by: hjk <hjk@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-14/+20
| | | | | | | * Update files in src/share* and src/tools Change-Id: I78aa5d4a1d76212964e467de7676c1fcb2b777d6 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Add missing include.Jake Petroules2015-11-231-0/+1
| | | | | Change-Id: I3ccc9c96a4a4ebc974424cbee7289a8fa0fbc196 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* JSON: Fix MSVC2013 warningsOrgad Shaneh2015-11-111-5/+5
| | | | | | | | | | | json.cpp(221) : warning C4800: 'uint64_t' : forcing value to bool 'true' or 'false' (performance warning) json.cpp(322) : warning C4800: 'uint32_t' : forcing value to bool 'true' or 'false' (performance warning) json.cpp(756) : warning C4244: '=' : conversion from 'int64_t' to 'double', possible loss of data json.cpp(953) : warning C4244: 'return' : conversion from 'const double' to 'int', possible loss of data json.cpp(4408) : warning C4244: 'argument' : conversion from '__int64' to 'int', possible loss of data Change-Id: I2a24f90f7615aeb47f747ecbe3b580f23773ebda Reviewed-by: hjk <hjk@theqtcompany.com>
* Json: Avoid unneeded intermediate copy of key stringshjk2015-11-091-60/+88
| | | | | Change-Id: Ieb2401810e4b47fab77b287e50e13b33160a9297 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Introduce a Qt-free JSON implementationhjk2015-11-091-0/+4928
| | | | | | | | | | | This is essentially QJson with Qt replaced by std:: features. This is useful to have in circumstances where a Qt dependency is undesirable, e.g. for the Qt Creator debugger protocol implementation in our CDB extension. Change-Id: Iec79c6b23b1e717ce1b6f4d38755287d1f479c13 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Remove stale shared/json directoryOrgad Shaneh2012-08-301-549/+0
| | | | | | | | Symbian leftovers Change-Id: I4479113b6f80eb4a667054d72da1b185c315f61d Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-5/+5
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Delegate javascript debugging to Script and V8 debugger clients.Aurindam Jana2011-08-031-0/+551
The appropriate client handles the debugging based on the service available at the server side. Change-Id: I46b66036f700fc7e45e8b38cef7f1ce1445b1122 Reviewed-on: http://codereview.qt.nokia.com/2497 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
View Lorry Controller Status