Skip to content
This repository was archived by the owner on Sep 23, 2019. It is now read-only.

Commit 52b80c3

Browse files
committed
QJson is statically linked.
1 parent cb2c8d6 commit 52b80c3

25 files changed

+36
-123
lines changed

QTweetLib.pro

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
TEMPLATE = subdirs
2-
SUBDIRS = sub_qjson sub_src sub_examples
3-
4-
sub_qjson.subdir = qjson
2+
SUBDIRS = sub_src sub_examples
53

64
sub_src.subdir = src
7-
sub_src.depends = sub_qjson
85

96
sub_examples.subdir = examples
10-
sub_examples.depends = sub_src

qjson/qjson.pro

-34
This file was deleted.

qjson/src.pro

-70
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

qjson/qjson_export.h renamed to src/qjson/qjson_export.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222

2323
#include <QtCore/qglobal.h>
2424

25-
#ifndef QJSON_EXPORT
26-
# if defined(QJSON_MAKEDLL)
27-
/* We are building this library */
28-
# define QJSON_EXPORT Q_DECL_EXPORT
29-
# else
30-
/* We are using this library */
31-
# define QJSON_EXPORT Q_DECL_IMPORT
32-
# endif
33-
#endif
25+
//#ifndef QJSON_EXPORT
26+
//# if defined(QJSON_MAKEDLL)
27+
// /* We are building this library */
28+
#define QJSON_EXPORT
29+
//# else
30+
// /* We are using this library */
31+
//# define QJSON_EXPORT Q_DECL_IMPORT
32+
//# endif
33+
//#endif
3434

3535
#endif
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/src.pro

+26-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ QT += network
22
QT += gui
33

44
TEMPLATE = lib
5-
TARGET = QTweetLib
5+
TARGET = qtweetlib
66
DESTDIR = ../lib
7-
win32:LIBS += ../lib/qjson.lib
8-
unix:LIBS += -L../lib -lqjson
97
CONFIG += create_prl
108
INCLUDEPATH += ..
119

@@ -86,7 +84,20 @@ HEADERS += \
8684
qtweetblocksdestroy.h \
8785
qtweetblocksexists.h \
8886
qtweetblocksblocking.h \
89-
qtweetblocksblockingids.h
87+
qtweetblocksblockingids.h \
88+
qjson/stack.hh \
89+
qjson/serializerrunnable.h \
90+
qjson/serializer.h \
91+
qjson/qobjecthelper.h \
92+
qjson/qjson_export.h \
93+
qjson/qjson_debug.h \
94+
qjson/position.hh \
95+
qjson/parserrunnable.h \
96+
qjson/parser_p.h \
97+
qjson/parser.h \
98+
qjson/location.hh \
99+
qjson/json_scanner.h \
100+
qjson/json_parser.hh
90101

91102
SOURCES += \
92103
oauth.cpp \
@@ -160,4 +171,14 @@ SOURCES += \
160171
qtweetblocksdestroy.cpp \
161172
qtweetblocksexists.cpp \
162173
qtweetblocksblocking.cpp \
163-
qtweetblocksblockingids.cpp
174+
qtweetblocksblockingids.cpp \
175+
qjson/serializerrunnable.cpp \
176+
qjson/serializer.cpp \
177+
qjson/qobjecthelper.cpp \
178+
qjson/parserrunnable.cpp \
179+
qjson/parser.cpp \
180+
qjson/json_scanner.cpp \
181+
qjson/json_parser.cc
182+
183+
OTHER_FILES += \
184+
qjson/json_parser.yy

0 commit comments

Comments
 (0)