| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Zeno Albisser
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
the qlocalexml2cpp.py script takes a path to the Qt source tree and patches all
files with newly generated data automatically.
Reviewed-by: Zeno Albisser
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Moc was failing on the string constructed using multiple quoted strings.
The following fails to parse: "foo""bar".
Reviewed-by: trustme
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This is a temporary commit and meant to be removed before merging the branch
into Qt as we don't want to bloat the repository size by updating CLDR every
time we make a small change to QLocale, but do that only once when we are done.
Reviewed-by: trustme
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Zeno Albisser
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
REMARK: This commit is missing updated static cldr data in
src/corelib/tools/qlocale_data_p.h that has been left out
intentionally to avoid repository bloating.
Before compiling make sure to update that file using the scripts
util/local_database/cldr2qlocalexml.py and
util/local_database/qlocalexml2cpp.py.
Otherwise you will most likely experience segmentation faults.
Task-number: QTBUG-17100
Reviewed-by: Zeno Albisser
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
If the data that was requested is missing from CLDR, then we do not need
to try to create QString out of empty data, but return a shared_empty
QString instead.
i.e.
QString::fromRawData(data, 0/*length==0*/) - instead of doing that just
return a default constructed QString.
Reviewed-by: Zeno Albisser
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
REMARK: This commit is missing updated static cldr data in
src/corelib/tools/qlocale_data_p.h that has been left out
intentionally to avoid repository bloating.
Before compiling make sure to update that file using the scripts
util/local_database/cldr2qlocalexml.py and
util/local_database/qlocalexml2cpp.py.
Otherwise you will most likely experience segmentation faults.
Reviewed-By: Denis Dzyubenko
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
qvariant_cast_QObject_data was creating the QVariant wrong,
The QVariant(int, void*) constructor take a pointer to the value
of the type ObjectStar (hence a pointer to a pointer)
Task-number: QTBUG-18257
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Marius Storm-Olsen
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This does not belongs inside Qt, but inside the webkit repository.
Acknowledged-by: Alan Alpert and Andreas Kling
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The filters for files in the non flat projects will start with the
base filter name and then the path to the file. So the detection of
the filter needs to be done by the start of the filter namse so that
we correctly add the compile commands for the added files.
Task-number: QTBUG-13928
Reviewed-by: Joerg Bornemann
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This commit adds two new classes, QHttpPart and QHttpMultiPart, and
two new overloads to QNetworkAccessManager:
post(const QNetworkRequest &request, QHttpMultiPart *multiPart) and
put(const QNetworkRequest &request, QHttpMultiPart *multiPart).
With those classes, it is possible to do a HTTP POST with a multipart
message in a memory-saving way: The data from the parts is not copied
when read from a file or another QIODevice.
Reviewed-by: Markus Goetz
Task-number: QTBUG-6222
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
In the case of a response with e.g content-encoding "gzip" and
content-length "0", the HTTP backend would incorrectly fall back to
the "unspecified length" code path and wait for readyRead() forever.
Task-number: QTBUG-18232
Reviewed-by: Markus Goetz
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
otherwise the host name and the name we send in the SNI header (the IP)
would not match.
Reviewed-by: Thiago Macieira
Reviewed-by: Richard J. Moore
Task-number: QTBUG-18258
|
| |\ \ \ \ \ \ \ \ |
|
| | |_|_|/ / / / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
QNetworkAccessHttpBackend::replyDownloadData could possibly be called
recursivly as it will emit downloadProgress. In the case of this test
the progress dialog calls progressEvents() which will cause the
recursion.
Reviewed-by: Markus Goetz
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
We need to set the state properly after we have been disconnected.
Also fix the HTTP layer, it needs to handle the disconnect
when reading.
Reviewed-by: Peter Hartmann
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The cache ends up dog-slow because of poor distribution in hashing
of QStrings, and even with a better hashing function, computing the
result on the fly is still faster.
Tested with WebCore.pro, on Linux processing time goes from 58 to
8 seconds, and on Windows from 105 to 65 seconds.
Reviewed-by: Marius Storm-Olsen
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Oswald Buddenhagen
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Oswald Buddenhagen
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Peter Hartmann
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QT-4658
Task-number: QT-3494
Reviewed-by: Peter Hartmann
|
|\ \ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
Remove autotest code related to old Qt versions
Fix missing equality and inequality operator docs for QPointer.
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: Rohan McGovern
|
|/ / / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-18565
Reviewed-by: Rohan McGovern
|
|\ \ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
into master-integration
* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (94 commits)
Lighthouse: Fix license headers
Remove hasOpenGL. This changes breaks binary compatibillity
Lighthouse: Fix license headers
Compile fix for shared context change.
Some virtual keyboard text input for uikit.
Wayland: Conform with the api change in the frame callback
Fix configure for Lighthouse
Remove DefaultSharedContext from Lighthouse API.
Make readEvents() non-blocking
Wayland: Show what backend is being used
Wayland: Tell what backend we use for xcomposite glx
Wayland: compile fix after making the event handling
Make the xcomposite the default gl integration backend
Make sure the global listener gets registered even when using drm.
Wayland: Rename XPixmap GL integrations to Readback
Adapt drag distance for uikit.
Prevented crash due to dangling pointer in QWaylandInputDevice.
Fixed logical error in XCB backend.
Set the _NET_WM_WINDOW_TYPE property in the XCB backend.
Added _NET_WM_PID in XCB backend.
...
|
| | | | | | | | | | |
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
so you will need to use $QTBUILDDIR/bin/syncqt and recompile all
applications
|
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
|/| | | | | | | | | |
|
|\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Remove a race condition in SIGCHLD handler.
Fix warnings about && inside ||
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
If the SIGCHLD is delivered *just* as we're installing our handler,
there's a race condition in the setting of the old handler. So instead
rely on the OS to set it properly before it calls our handler.
Reviewed-by: Olivier Goffart
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Reviewed-By: Trust Me
|
|\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Allow enum values to be used as signal parameters
ListModel::clear() should not clear roles
Make sure removed QTextBlock is invalid
Cocoa: Fixup wrong code in patch baaa5ae
|
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Allow enum values to be used as signal parameters
ListModel::clear() should not clear roles
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
The fix does not work for enums declared outside of the class that
emits the signal, since in this case it is not possible to access
the metaobject of the class that declared the enum. However the
fix makes a special case for the Qt namespace to allow enums in this
namespace to be used.
Task-number: QTBUG-15983
Change-Id: I6f72255b07010311a20fe068bd97c7db7b294d9b
Reviewed-by: Aaron Kennedy
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
Clearing a model and then appending a new object with a subset of the
previous roles was causing a crash since ListModel cleared the roles
and VisualDataModel did not, so VisualDataModel was requesting invalid
roles. This could have been fixed by clearing the meta object and
its property cache in in VisualDataModel but this is less efficient,
and also the general use case is for model data to always have the same
roles.
Task-number: QTBUG-18587
Change-Id: Ib11d2292888ab7a41e772b1e11700cd665e94ae7
Reviewed-by: Michael Brasser
|
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: Fixup wrong code in patch baaa5ae
|
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
Sort of imbarassing, but baaa5ae went in before I checked
that the old-behaviour-flag also worked. Which is didn't.
This patch will make things good.
Task-number: QTBUG-11481
Reviewed-by: jbache
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make sure removed QTextBlock is invalid
|
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
If the block is removed from document block map, we will mark the
right node to the current head->freelist index, but it shouldn't
be accessed directly, otherwise it can cause crash because of
uninitialized node.
Hence we need to check if a node index is equal to current freelist
index. If so, it cannot be a valid block.
Task-number: QTBUG-18500
Reviewed-by: Eskil
|
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Update XCreateWindow in qgl_X11egl.cpp
Lancelot: support for custom keys added to protocol. API cleanup.
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
XCreateWindow should provide mask and colormap, or this may load XCreateWindow error in the server side.
Merge-request: 1183
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (119 commits)
Lancelot: support for custom keys added to protocol. API cleanup.
Designer: Allow promoted QWidget's to be buddies.
Designer: Specify 'notr' attribute for buttongroup name.
[QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)
HTTP cacheing: do not store the date header with the resource
Let's not write to the source buffer when blending argb32 on rgb16.
Add support for -unset <prop> option to qmake.
make -markuntranslated work without -idbased
fix conditional on shell type
Cocoa: p1 bug fix: fix auto test regressions
Ensure shared network session deleted from correct thread
Revert "Remove SIGBUS emission from QNetworkSession destruction."
Image w/ PreserveAspectFit has its width changed once more than needed.
fix QLocalSocket::isValid() on Windows
Cocoa: p1 bug fix: revert use of subWindowStacking
Not possible to enter negative values to widgets with numeric fields
QmlViewer: Enable remote qml debugging
QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug
Fix typos in QSharedPointer documentation.
Improve Flickable dynamics and allow platform specific tweaking.
...
|
| | | | | | | | | | | | | | | | | |
|
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
Updated QtOpenGL DEF file
Updated QtOpenVG DEF file
Updated QtGui DEF file for ARMV5
Updated DEF files
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|