Permalink
Switch branches/tags
Nothing to show
Commits on Feb 12, 2018
  1. Merge pull request #46 from gitantonio/builders

    gaudecker committed Feb 12, 2018
    Added Builders + Pretty-print serialization
  2. FIX readme

    gitantonio committed Feb 12, 2018
Commits on Feb 9, 2018
Commits on Nov 11, 2016
  1. Merge pull request #44 from GitFuture/master

    gaudecker committed Nov 11, 2016
    Update json.h
  2. Update json.h

    BriFuture committed Nov 11, 2016
Commits on Apr 18, 2016
  1. Merge pull request #39 from george-hopkins/reduce-spaces

    gaudecker committed Apr 18, 2016
    Reduces spaces
  2. Merge pull request #40 from george-hopkins/fix-readme

    gaudecker committed Apr 18, 2016
    Fix README
Commits on Apr 17, 2016
  1. Reduces spaces

    george-hopkins committed Apr 17, 2016
  2. Fix README

    george-hopkins committed Apr 17, 2016
Commits on Mar 16, 2016
  1. Merge pull request #38 from milabs/feature/json-object

    gaudecker committed Mar 16, 2016
    Add QtJson::Object class implementation
Commits on Mar 15, 2016
  1. Update AUTHORS file

    Ilya Matveychikov
    Ilya Matveychikov committed Mar 15, 2016
  2. Add QtJson::Object class usage example (compile-only test)

    Ilya Matveychikov
    Ilya Matveychikov committed Mar 15, 2016
  3. Add QtJson::Object class implementation

    Ilya Matveychikov
    Ilya Matveychikov committed Mar 15, 2016
Commits on Dec 2, 2015
  1. Merge pull request #37 from martinrotter/master

    gaudecker committed Dec 2, 2015
    Added QStringList inclusion.
  2. Added QStringList inclusion.

    martinrotter committed Dec 2, 2015
    This should fix problems with compilation on OS/2 + Qt4.
    
    [ 34%] Building CXX object CMakeFiles/rssguard.dir/src/gui/dialogs/formdatabasecleanup.cpp.obj
    H:/rssguard/src/qt-json/json.cpp: In function 'QVariant QtJson::clone(const QVariant&)':
    H:/rssguard/src/qt-json/json.cpp:120:37: error: invalid use of incomplete type 'class QStringList'
          cloneList(v, data.toStringList());
                                         ^
    In file included from C:/usr/include/QtCore/qdatetime.h:45:0,
                     from C:/usr/include/QtCore/QDateTime:1,
                     from H:/rssguard/src/qt-json/json.cpp:23:
    C:/usr/include/QtCore/qstring.h:94:7: error: forward declaration of 'class QStringList'
     class QStringList;
           ^
    CMakeFiles/rssguard.dir/build.make:714: recipe for target 'CMakeFiles/rssguard.dir/src/qt-json/json.cpp.obj' failed
    make[2]: *** [CMakeFiles/rssguard.dir/src/qt-json/json.cpp.obj] Error 1
    make[2]: *** Waiting for unfinished jobs....
    CMakeFiles/Makefile2:128: recipe for target 'CMakeFiles/rssguard.dir/all' failed
    make[1]: *** [CMakeFiles/rssguard.dir/all] Error 2
    Makefile:146: recipe for target 'all' failed
    make: *** [all] Error 2
Commits on Nov 19, 2015
  1. Merge pull request #36 from milabs/feature/cloning

    gaudecker committed Nov 19, 2015
    Feature/cloning
Commits on Nov 18, 2015
  1. Add test for the cloning.

    milabs committed Nov 18, 2015
  2. Added support of JSON object cloning

    milabs committed Nov 18, 2015
    Now it's possible to make a deep copy (clone) of the object.
Commits on Apr 10, 2015
  1. Merge pull request #34 from naihil/serialization

    gaudecker committed Apr 10, 2015
    Change conversion to double in serialization
  2. Check that conversion to double is ok

    naihil committed Apr 10, 2015
    Remove unnecessary else-block
Commits on Sep 13, 2014
  1. Merge pull request #32 from AlekseyDurachenko/master

    gaudecker committed Sep 13, 2014
    .pri added for ease of use within the project
Commits on Jun 9, 2014
  1. Updated email address.

    gaudecker committed Jun 9, 2014
Commits on Jan 28, 2014
  1. Merge pull request #30 from me21/master

    da4c30ff
    da4c30ff committed Jan 28, 2014
    Added configurable formats for QDate and QDateTime representation.
Commits on Jan 21, 2014
  1. Fixed braces placement.

    me21 committed Jan 21, 2014
    Signed-off-by: Alexandr Zarubkin <me21@yandex.ru>
Commits on Jan 20, 2014
  1. Added configurable formats for QDate and QDateTime representation.

    me21 committed Jan 20, 2014
    Signed-off-by: Alexandr Zarubkin <me21@yandex.ru>
Commits on Dec 10, 2013
  1. Merge pull request #29 from cydside/master

    da4c30ff
    da4c30ff committed Dec 10, 2013
    Update json.cpp
  2. Update json.cpp

    cydside committed Dec 10, 2013
    Double value conversion fixed.
Commits on Jul 3, 2013
  1. Update README.md

    Eeli Reilin
    Eeli Reilin committed Jul 3, 2013
Commits on Jul 1, 2013
  1. Update README.md

    Eeli Reilin
    Eeli Reilin committed Jul 1, 2013
  2. Update README.md

    Eeli Reilin
    Eeli Reilin committed Jul 1, 2013
Commits on Jun 29, 2013
  1. Update README.md

    Eeli Reilin
    Eeli Reilin committed Jun 29, 2013
  2. Moved example program into its own directory.

    Eeli Reilin
    Eeli Reilin committed Jun 29, 2013
  3. Added an example program.

    Eeli Reilin
    Eeli Reilin committed Jun 29, 2013
  4. Changed license to GPLv3. Fixed non-uniform indentation and formattin…

    Eeli Reilin
    Eeli Reilin committed Jun 29, 2013
    …g. Added typedefs JsonObject and JsonArray.