summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/lib/http.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2024-01-311-173/+160
* Merge branch 'upstream-curl' into update-curlBrad King2023-12-121-129/+107
* Merge branch 'upstream-curl' into update-curlBrad King2023-10-121-12/+12
* Merge branch 'upstream-curl' into update-curlBrad King2023-09-221-43/+133
* Merge branch 'upstream-curl' into update-curlBrad King2023-08-011-15/+17
* Merge branch 'upstream-curl' into update-curlBrad King2023-05-301-26/+563
* Merge branch 'upstream-curl' into update-curlBrad King2023-03-201-76/+99
* Merge branch 'upstream-curl' into update-curlBrad King2023-02-211-130/+64
* Merge branch 'upstream-curl' into update-curlBrad King2023-01-271-166/+88
* Merge branch 'upstream-curl' into update-curlBrad King2022-10-311-46/+155
* Merge branch 'upstream-curl' into update-curlBrad King2022-05-161-15/+15
* Merge branch 'upstream-curl' into update-curlBrad King2022-04-281-169/+153
* Merge branch 'upstream-curl' into update-curlBrad King2022-01-071-48/+41
* Merge branch 'upstream-curl' into update-curlBrad King2021-09-241-5/+5
* Merge branch 'upstream-curl' into update-curlBrad King2021-09-151-122/+157
* Merge branch 'upstream-curl' into update-curlBrad King2021-05-271-71/+150
* Merge branch 'upstream-curl' into update-curlBrad King2021-02-031-1128/+1328
* Merge branch 'upstream-curl' into update-curlBrad King2020-12-091-33/+50
* Merge branch 'upstream-curl' into update-curlBrad King2020-08-191-3/+0
* Merge branch 'upstream-curl' into update-curlBrad King2020-07-011-4/+6
* Merge branch 'upstream-curl' into update-curlBrad King2020-06-241-470/+355
* Merge branch 'upstream-curl' into update-curlBrad King2020-03-041-117/+185
* Merge branch 'upstream-curl' into update-curlBrad King2019-05-221-174/+318
* Merge branch 'upstream-curl' into update-curlBrad King2018-10-311-107/+138
* Merge branch 'upstream-curl' into update-curlBrad King2018-10-221-70/+156
* Merge branch 'upstream-curl' into update-curlBrad King2018-05-181-82/+141
* Merge branch 'upstream-curl' into update-curlBrad King2018-01-241-84/+43
* Merge branch 'upstream-curl' into update-curlBrad King2017-10-101-204/+240
* Merge branch 'upstream-curl' into update-curlBrad King2017-06-141-41/+48
* Merge branch 'upstream-curl' into update-curlBrad King2017-05-111-54/+69
* Merge branch 'upstream-curl' into update-curlBrad King2017-02-071-56/+29
* Merge branch 'upstream-curl' into update-curlBrad King2016-12-051-132/+150
* Merge branch 'upstream-curl' into update-curlBrad King2016-08-031-164/+197
* Merge branch 'curl-upstream' into update-curlBrad King2015-08-121-152/+226
* Merge branch 'curl-upstream' into update-curlBrad King2014-10-291-1264/+2506
* curl: Move sources back into upstream layoutBrad King2014-10-291-0/+2422
generated by cgit v0.12 at 2024-09-24 20:36:40 (GMT)
fromUtf8(prop->name.constData())));
}
return true;
diff --git a/src/declarative/qml/qdeclarativemetatype_p.h b/src/declarative/qml/qdeclarativemetatype_p.h
index 1a36f10..d41323d 100644
--- a/src/declarative/qml/qdeclarativemetatype_p.h
+++ b/src/declarative/qml/qdeclarativemetatype_p.h
@@ -136,7 +136,7 @@ public:
int index() const;
private:
friend class QDeclarativeTypePrivate;
- friend class QDeclarativeMetaTypeData;
+ friend struct QDeclarativeMetaTypeData;
friend int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterInterface &);
friend int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterType &);
QDeclarativeType(int, const QDeclarativePrivate::RegisterInterface &);
diff --git a/src/gui/dialogs/qwizard_win_p.h b/src/gui/dialogs/qwizard_win_p.h
index fe01587..5f3b6c2 100644
--- a/src/gui/dialogs/qwizard_win_p.h
+++ b/src/gui/dialogs/qwizard_win_p.h
@@ -82,7 +82,6 @@ class QWizard;
class QVistaHelper : public QObject
{
- Q_OBJECT
public:
QVistaHelper(QWizard *wizard);
~QVistaHelper();
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 1a649ea..1d8eb4c 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -2282,7 +2282,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa
case WM_GETOBJECT:
{
// Ignoring all requests while starting up
- if (QApplication::startingUp() || QApplication::closingDown() || (DWORD)lParam != OBJID_CLIENT) {
+ if (QApplication::startingUp() || QApplication::closingDown() || (LONG)lParam != OBJID_CLIENT) {
result = false;
break;
}
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 71e2e3b..1f75ec7 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -3884,8 +3884,8 @@ inline void interpolate_pixel_unaligned_2(DST *dest, const SRC *src,
template <class DST, class SRC>
inline void interpolate_pixel_2(DST *dest, const SRC *src, quint16 alpha)
{
- Q_ASSERT((long(dest) & 0x3) == 0);
- Q_ASSERT((long(src) & 0x3) == 0);
+ Q_ASSERT((quintptr(dest) & 0x3) == 0);
+ Q_ASSERT((quintptr(src) & 0x3) == 0);
const quint16 a = eff_alpha_2(alpha, dest);
const quint16 ia = eff_ialpha_2(alpha, dest);
@@ -3958,8 +3958,8 @@ template <class DST, class SRC>
inline void interpolate_pixel_2(DST *dest, quint8 a,
const SRC *src, quint8 b)
{
- Q_ASSERT((long(dest) & 0x3) == 0);
- Q_ASSERT((long(src) & 0x3) == 0);
+ Q_ASSERT((quintptr(dest) & 0x3) == 0);
+ Q_ASSERT((quintptr(src) & 0x3) == 0);
Q_ASSERT(!SRC::hasAlpha());
@@ -4007,8 +4007,8 @@ inline void interpolate_pixel_2(qrgb444 *dest, quint8 a,
template <class DST, class SRC>
inline void interpolate_pixel_4(DST *dest, const SRC *src, quint32 alpha)
{
- Q_ASSERT((long(dest) & 0x3) == 0);
- Q_ASSERT((long(src) & 0x3) == 0);
+ Q_ASSERT((quintptr(dest) & 0x3) == 0);
+ Q_ASSERT((quintptr(src) & 0x3) == 0);
const quint32 a = eff_alpha_4(alpha, dest);
const quint32 ia = eff_ialpha_4(alpha, dest);
@@ -4411,7 +4411,7 @@ void QT_FASTCALL blendUntransformed_dest16(DST *dest, const SRC *src,
{
Q_ASSERT(sizeof(DST) == 2);
Q_ASSERT(sizeof(SRC) == 2);
- Q_ASSERT((long(dest) & 0x3) == (long(src) & 0x3));
+ Q_ASSERT((quintptr(dest) & 0x3) == (quintptr(src) & 0x3));
Q_ASSERT(coverage > 0);
const int align = quintptr(dest) & 0x3;
@@ -4479,8 +4479,8 @@ void QT_FASTCALL blendUntransformed_dest16(DST *dest, const SRC *src,
}
while (length >= 2) {
- Q_ASSERT((long(dest) & 3) == 0);
- Q_ASSERT((long(src) & 3) == 0);
+ Q_ASSERT((quintptr(dest) & 3) == 0);
+ Q_ASSERT((quintptr(src) & 3) == 0);
const quint16 a = alpha_2(src);
if (a == 0xffff) {
@@ -4511,7 +4511,7 @@ template <class DST, class SRC>
void QT_FASTCALL blendUntransformed_dest24(DST *dest, const SRC *src,
quint8 coverage, int length)
{
- Q_ASSERT((long(dest) & 0x3) == (long(src) & 0x3));
+ Q_ASSERT((quintptr(dest) & 0x3) == (quintptr(src) & 0x3));
Q_ASSERT(sizeof(DST) == 3);
Q_ASSERT(coverage > 0);
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp