Skip to content

Commit 999683e

Browse files
fix compilation errors.
1 parent 02a2c95 commit 999683e

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/actions.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: apt
1515
run: |
1616
sudo apt-get update -qq
17-
sudo apt install -y --no-install-recommends pkg-config qmake6 qt6-base-dev qt6-base-dev-tools qt6-tools-dev-tools qt6-declarative-dev libqt6sql6-mysql libqt6sql6-psql libqt6sql6-odbc libqt6sql6-sqlite libqt6core6 libqt6qml6 libqt6xml6 libpq5 libodbc2 libmongoc-dev libbson-dev gcc g++ clang make cmake yarn
17+
sudo apt install -y --no-install-recommends pkg-config qmake6 qt6-base-dev qt6-base-dev-tools qt6-tools-dev-tools qt6-declarative-dev libqt6sql6-mysql libqt6sql6-psql libqt6sql6-odbc libqt6sql6-sqlite libqt6core6 libqt6qml6 libqt6xml6 libpq5 libodbc2 libmongoc-dev libbson-dev liburing-dev gcc g++ clang make cmake yarn
1818
- name: qmake version
1919
run: |
2020
sudo rm -f /usr/bin/qmake
@@ -69,7 +69,7 @@ jobs:
6969
- name: apt
7070
run: |
7171
sudo apt-get update -qq
72-
sudo apt install -y --no-install-recommends pkg-config qmake6 qt6-base-dev qt6-base-dev-tools qt6-tools-dev-tools qt6-declarative-dev libqt6sql6-mysql libqt6sql6-psql libqt6sql6-odbc libqt6sql6-sqlite libqt6core6 libqt6qml6 libqt6xml6 libpq5 libodbc2 libmongoc-dev libbson-dev liblz4-dev gcc g++ clang make cmake yarn
72+
sudo apt install -y --no-install-recommends pkg-config qmake6 qt6-base-dev qt6-base-dev-tools qt6-tools-dev-tools qt6-declarative-dev libqt6sql6-mysql libqt6sql6-psql libqt6sql6-odbc libqt6sql6-sqlite libqt6core6 libqt6qml6 libqt6xml6 libpq5 libodbc2 libmongoc-dev libbson-dev liblz4-dev liburing-dev gcc g++ clang make cmake yarn
7373
- name: qmake version
7474
run: |
7575
sudo rm -f /usr/bin/qmake
@@ -124,7 +124,7 @@ jobs:
124124
- name: apt
125125
run: |
126126
sudo apt-get update -qq
127-
sudo apt install -y --no-install-recommends pkg-config qmake6 qt6-base-dev qt6-base-dev-tools qt6-tools-dev-tools qt6-declarative-dev libqt6sql6-mysql libqt6sql6-psql libqt6sql6-odbc libqt6sql6-sqlite libqt6core6 libqt6qml6 libqt6xml6 libpq5 libodbc2 libmongoc-dev libbson-dev liblz4-dev gcc g++ clang make cmake yarn
127+
sudo apt install -y --no-install-recommends pkg-config qmake6 qt6-base-dev qt6-base-dev-tools qt6-tools-dev-tools qt6-declarative-dev libqt6sql6-mysql libqt6sql6-psql libqt6sql6-odbc libqt6sql6-sqlite libqt6core6 libqt6qml6 libqt6xml6 libpq5 libodbc2 libmongoc-dev libbson-dev liblz4-dev liburing-dev gcc g++ clang make cmake yarn
128128
- name: qmake version
129129
run: |
130130
sudo rm -f /usr/bin/qmake

src/thttprequest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ class T_CORE_EXPORT THttpRequest {
8181
QIODevice *rawBody();
8282
bool hasJson() const { return d->jsonData && !d->jsonData->isNull(); }
8383
const QJsonDocument &jsonData() const;
84+
QJsonDocument &jsonData();
8485

8586
static THttpRequest generate(QByteArray &byteArray, const QHostAddress &address, TActionContext *context);
8687
static QList<QPair<QString, QString>> fromQuery(const QString &query);
@@ -93,7 +94,6 @@ class T_CORE_EXPORT THttpRequest {
9394
QList<QPair<QString, QString>> &queryItemList();
9495
const QList<QPair<QString, QString>> &formItemList() const;
9596
QList<QPair<QString, QString>> &formItemList();
96-
QJsonDocument &jsonData();
9797

9898
static bool hasItem(const QString &name, const QList<QPair<QString, QString>> &items);
9999
static QString itemValue(const QString &name, const QString &defaultValue, const QList<QPair<QString, QString>> &items);

0 commit comments

Comments
 (0)