diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-02-06 10:36:48 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-15 17:27:24 +0100 |
commit | 556dd0228aca07dfe8443fd99e9f2ead4e13ab22 (patch) | |
tree | 4778bf8081c8e823ac298c2b3e7c591b787acac4 /src/tools | |
parent | ded417b75a95cb5e3622f95d41f81c024aa532fb (diff) |
Add JSON support to the bootstrap library
The JSON support will get used in moc to support
the creation of plugin metadata that's embedded
into the plugin itself.
Change-Id: I3bc52b16ca0a43bc8bf9141b450045c6183b7823
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 2 | ||||
-rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index 8a368cb228..e34cc5c033 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -60,7 +60,7 @@ hpux-acc*|hpuxi-acc* { else:if(unix|win32-g++*):LIBS_PRIVATE += -lz else:LIBS += zdll.lib } -win32:LIBS += -luser32 +win32:LIBS += -luser32 -lole32 mac { CONFIG -= incremental diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index fdf41c55c2..1d641d2301 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -43,6 +43,7 @@ DEPENDPATH += $$INCLUDEPATH \ ../../corelib/tools \ ../../corelib/io \ ../../corelib/codecs \ + ../../corelib/json \ ../../xml SOURCES += \ @@ -72,6 +73,7 @@ SOURCES += \ ../../corelib/kernel/qmetatype.cpp \ ../../corelib/kernel/qvariant.cpp \ ../../corelib/kernel/qsystemerror.cpp \ + ../../corelib/plugin/quuid.cpp \ ../../corelib/tools/qbitarray.cpp \ ../../corelib/tools/qbytearray.cpp \ ../../corelib/tools/qbytearraymatcher.cpp \ @@ -88,6 +90,13 @@ SOURCES += \ ../../corelib/tools/qvsnprintf.cpp \ ../../corelib/xml/qxmlutils.cpp \ ../../corelib/xml/qxmlstream.cpp \ + ../../corelib/json/qjson.cpp \ + ../../corelib/json/qjsondocument.cpp \ + ../../corelib/json/qjsonobject.cpp \ + ../../corelib/json/qjsonarray.cpp \ + ../../corelib/json/qjsonvalue.cpp \ + ../../corelib/json/qjsonparser.cpp \ + ../../corelib/json/qjsonwriter.cpp \ ../../xml/dom/qdom.cpp \ ../../xml/sax/qxml.cpp |