diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-15 10:14:11 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-15 10:14:11 +0100 |
| commit | bb0fec8057dd11c359bfcb4aefb66d9b210f52a6 (patch) | |
| tree | 903e3220087ff7a3210390933ba3d8b8f7eb5ea3 /src/network/access/qhttpnetworkheader_p.h | |
| parent | 8920bf32eebe03cfc8a1a5e97f5b34c09c79a11b (diff) | |
| parent | 4ba535616b8d3dfda7fbe162c6513f3008c1077a (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
src/corelib/corelib.pro
src/corelib/global/qrandom.cpp
src/network/access/qhttpnetworkrequest_p.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoansmenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/offscreen/qoffscreenintegration.h
src/widgets/kernel/qaction.cpp
src/widgets/widgets.pro
Done-with: Andy Shaw <andy.shaw@qt.io>
Change-Id: Ib01547cf4184023f19858ccf0ce7fb824fed2a8d
Diffstat (limited to 'src/network/access/qhttpnetworkheader_p.h')
| -rw-r--r-- | src/network/access/qhttpnetworkheader_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkheader_p.h b/src/network/access/qhttpnetworkheader_p.h index f46c259919..3adb0ed7f1 100644 --- a/src/network/access/qhttpnetworkheader_p.h +++ b/src/network/access/qhttpnetworkheader_p.h @@ -92,6 +92,7 @@ public: QByteArray headerField(const QByteArray &name, const QByteArray &defaultValue = QByteArray()) const; QList<QByteArray> headerFieldValues(const QByteArray &name) const; void setHeaderField(const QByteArray &name, const QByteArray &data); + void prependHeaderField(const QByteArray &name, const QByteArray &data); bool operator==(const QHttpNetworkHeaderPrivate &other) const; }; |