Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix parsing from QIODevice #98

Closed
wants to merge 8 commits into from
Closed

Fix parsing from QIODevice #98

wants to merge 8 commits into from

Commits on Jan 19, 2017

  1. Fix parsing from QIODevice 

    [*] Move parsing to private class;
[*] Use same entry point for both parse() API;
    @gooseensky
    gooseensky committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    940a1d9 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2017

  1. Fix static linking on Windows 

    CMake can mistakenly think that installed Qt4 is shared and add
-DQT_DLL to QT_DEFINITIONS. Need to be sure that with static QJson
will be used static Qt4.
    @drizt
    drizt committed Jul 14, 2017
    Configuration menu
    Copy the full SHA
    141da7d View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2017

  1. Merge pull request flavio#100 from drizt/win-static 

    Fix static linking on Windows
    @flavio
    flavio committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    eecad30 View commit details
    Browse the repository at this point in the history

  2. Update README to include contributio guidelines

    @flavio
    flavio committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    7760268 View commit details
    Browse the repository at this point in the history

  3. Add travis support 

    Support building with Qt4 and Qt5
    @flavio
    flavio committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    a998881 View commit details
    Browse the repository at this point in the history

  4. Add travis badge

    @flavio
    flavio committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    e78cf9e View commit details
    Browse the repository at this point in the history

  5. Fix parsing from QIODevice 

    [*] Move parsing to private class;
[*] Use same entry point for both parse() API;
    @gooseensky
    gooseensky committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    fb5d732 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'issue#52' of https://github.com/selumin/qjson into issu… 

    …e#52
    @gooseensky
    gooseensky committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    f73e5bf View commit details
    Browse the repository at this point in the history