Commit Graph

19 Commits

Author SHA1 Message Date
Volker Hilsheimer 8725479702 Fix warning in test from QFile::open being [[nodiscard]]
Change-Id: I5bf4d1479490b52cdfd11b8b17e2a89cda41ead7
Reviewed-by: Magdalena Stojek <magdalena.stojek@qt.io>
Reviewed-by: Matthias Rauter <matthias.rauter@qt.io>
Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io>
2025-03-12 13:37:18 +01:00
Lena Biliaieva ff870498f9 QHttpServerResponse: make API simpler by removing duplicating methods
Replaced all headers-related methods with only setter and getter to make
the class interface simpler and more consistent with other classes
consuming QHttpHeaders.

Resulted from API-review

Task-number: QTBUG-125859
Pick-to: 6.8
Change-Id: Ic41b471813969711bb07302a8929784bc425c84e
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2024-08-06 15:41:45 +02:00
Volker Hilsheimer 6e16fb068e QHttpServerResponse test: don't hardcode mime types
Following 74ad4cbeef40b1f51a59b3168f8c0b62eb0b29c8, QMimeDatabase no
longer recognizes an SVG data stream as anything but XML.

Replace the hardcoded mime types. We can only promise that
QHttpServerResponse recognizes mime types as per QMimeDatabase, so
compare with what we get from it.

Fixes: QTBUG-127333
Pick-to: 6.8 6.7 6.5
Change-Id: I902561518c903b7b3e0e57937d472cdbf9c56858
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2024-07-19 08:04:19 +00:00
Lena Biliaieva 1379fc628d Rename QHttpServerResponse headers method
Resulted from API-review

Task-number: QTBUG-125859
Pick-to: 6.8
Change-Id: I653b24836fc18d17c77fc4c450f6ac46310f4276
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2024-07-01 15:18:46 +02:00
Lena Biliaieva 2c91877b7f Use QHttpHeaders in QHttpServerResponse
Added withHeaders() method to pass headers to the QHttpServerResponse object.
Removed methods using QHttpServerResponder::HeaderList because it will be also replaced by QHttpHeaders.
Added headers() method for convenience.
Updated tests and examples.

Fixes: QTBUG-107749
Change-Id: Ia9ce631a17b1b60e84ffc85e09215ac262407144
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
2024-02-13 13:03:08 +01:00
Lucie Gérard 0d8bb0465e Change the license of all CMakeLists.txt and *.cmake files to BSD
Task-number: QTBUG-105718
Change-Id: I6817ba90abea4ea72ad9d58bd17c825a38abb07f
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-08-25 16:10:12 +00:00
Ievgenii Meshcheriakov 1e8551ca16 QHttpServerLiterals: Inline literals in tests and unexport them
Also make tst_qhttpserverresponder and tst_qhttpserverresponse
public.

Pick-to: 6.4
Change-Id: I1b95d20c86799a6f1088e54599128b07f8290f6f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-08-09 11:04:58 +02:00
Ievgenii Meshcheriakov 2cd9c66a25 tests: Use _ba instead of QByteArrayLiteral
Pick-to: 6.4
Change-Id: I8d41e169cd3dd489d8de54aeed052ff6a9e3edc3
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-08-08 18:01:00 +02:00
Ievgenii Meshcheriakov aa0c7a54f9 Unexport private classes and functions
Use Q_AUTOTEST_EXPORT for stuff used by the tests.

Mark tst_qhttpser, tst_qhttpserverresponder and
tst_qhttpserverresponse as private because they are using
private APIs.

Task-number: QTBUG-100868
Pick-to: 6.4
Change-Id: I6ecee7ae76fe7e9dc9ab7eceb1ae1c74cc07ef79
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-08-08 13:09:01 +02:00
Alexandru Croitor ed52c50fa0 CMake: Don't use PUBLIC_LIBRARIES for tests and test helpers
Change-Id: I7c6e4128b49afba63592462eaed56cbc668f6d9c
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-07-28 14:42:45 +02:00
Lucie Gérard c8392f2655 Add license headers to cmake files
CMakeLists.txt and .cmake files of significant size
(more than 2 lines according to our check in tst_license.pl)
now have the copyright and license header.

Existing copyright statements remain intact

Task-number: QTBUG-88621
Change-Id: I4463e3d03c18748e9a03320261b7f6efcdbd43f8
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
2022-07-07 11:45:42 +02:00
Lucie Gérard 57b0db0896 Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.

Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: I657c36f679b9448ec68d411a492171bc39df1411
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
2022-06-22 17:35:22 +02:00
Ievgenii Meshcheriakov dcd336b679 Remove most QMake project files
Remove most of the .pro files used by QMake (except those for examples).
QMake build of Qt modules is not supported anymore.

Also remove .qmake.conf that is not useful anymore.

Change-Id: I3f0af9f09144f3c9ac92d228a318cd515644d48b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-04-27 12:19:42 +02:00
Alexandru Croitor 8740e7b9d9 CMake: Fix build with Qt 6.1/6.2
Change-Id: I7f10d37a347b982d904024ebb583ad4d9628769c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-08-12 13:30:05 +02:00
Mikhail Svetkin 4b2790aa6d Add cmake support for Qt6/dev branch
Change-Id: Icca0edab01d6028d786b76f99fba388565bd6e76
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-05-05 19:43:56 +02:00
Mikhail Svetkin 73175545e6 QHttpServerResponse: Extend the API
Add new API for HTTP headers manipulations.
Add QHttpServerResponse::write function which will
allow to write custom response objects in a future.

Fixes: QTBUG-76933
Change-Id: I744303be1b517c07f698c4a3dd2c4296f77e3b03
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@tqcs.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-10-03 19:40:22 +02:00
Mikhail Svetkin f46cb8832f Add QHttpServerLiterals
Currently we have a lot of duplication of most common HTTP headers and their
values.
This patch moves them to one place.

Change-Id: Idf9ddc5164e81649b4cc37ed92a516eb1eedab3a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qbc.io>
2019-08-21 22:07:26 +02:00
Tasuku Suzuki fc7908e628 Introduce QHttpServerResponse::fromFile()
This is a shortcut for static file contents.

Change-Id: I54d97c60822e661c1405f27ea8d4598f0363b144
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-06-14 15:19:29 +09:00
Tasuku Suzuki 4f64330b39 Find proper mime type for QByteArray data
QByteArray can be used for any data that QMimeDatabase understands

Change-Id: I17d8f0060065c0a93fc4a8cf6450bdd11aed49d0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
2019-04-26 16:41:53 +00:00