| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Instead of iterating over children, when network session state changes.
|
|
|
|
|
|
| |
Move QDisabledNetworkReply to more appropriate source files.
Return -1 from QDisabledNetworkReply::readData().
Always allow local access (via QNetworkAccessFileBackend).
|
| |
|
|
|
|
| |
Enables network access via QNAM to be enabled/disabled.
|
|
|
|
|
|
| |
Automatically migrate in-progress transfers after roaming to a new
access point for backends that support it. Currently only works for http
transfers that do not upload data (i.e. HTTP GET).
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Only create a network session when a valid configuration is available.
Don't execute session code if a network session has not been created.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Default network interface was not always being set when the active
network configuration changed.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Perform application level roaming when all pending QNetworkReplys have
completed.
Emit temporary network failure error when connection to network is lost
but is possibly recovering due to roaming.
Don't save downloads in cache if they are not complete.
|
| |
|
| |
|
|\
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/qnetworksession/lackey/lackey.pro
tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
|
| | |
|
|\ \ |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure
src/gui/painting/qpainter.cpp
src/s60installs/s60installs.pro
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix a regression: icons with slightly wrong ICO header did not load.
Fixed an endless loop if printing web pages.
don't build unneeded QtDesigner parts on Windows CE
Better support for user-generated binary shaders
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Entering a page range which is valid, but outside of the printable
range would result in an infinite loop.
Task-number: QTBUG-6051
Reviewed-by: Simon Hausmann
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If the user provided their own shader with glShaderBinary(),
QGLShaderProgram::addShader() would refuse to add it because
it wasn't marked as "compiled". According to the OpenGL/ES 2.0
specification:
"It is permissible to attach a shader object to a
program object before source code has been loaded into the
shader object or before the shader object has been compiled."
Based on this, the compile check has been removed from addShader()
which should make supporting binary shaders easier.
Similarly, link() and programId() have been modified to support
applications that use glProgramBinaryOES() to specify program binaries.
Task-number: QTBUG-7490
Reviewed-by: Tom Cooksey
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Regression was introduced by commit
fd9cdaa55da455b90eacec571aeb2c84fa55f7e0.
Also fix a completely broken autotest that didn't actually test
anything.
Task-number: QTBUG-7688
Reviewed-by: Alexis
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (70 commits)
doc: Fixed the last qdoc errors.
doc: Document the "Type" enum value as a const in variable.
Designer: Add lower/raise to context menu.
Compile with no-webkit - add missing semi-colons.
Fixes visibility update missing when doing setParentItem on graphicsitem
Stabilize tst_QGraphicsScene::polishItems2 (new test)
Fixed an infinite loop that could occur when reading invalid BMP images.
Updated docs regarding QGLWidget::renderText() limitations.
Added optimization flag to QGraphicsItemPrivate.
Fixed child items with graphics effects not inheriting opacity.
Made the trace replayer handle limited resolution cases better.
Small optimization in raster paint engine.
Another ASSERT while deleting spans
Implement QDirectFBPixmapData::scroll
Potential crash when adding items from QGraphicsWidget::polishEvent().
QGraphicsWidget is painted twice on the inital show.
Fix QPainter::redirection() to pass autotest.
Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.
revert parts of 10392eef4fd4f9
Fix y-inverted pixmaps properly.
...
|
| | | |\ \ \ \ |
|
| | | | |\ \ \ \
| | | | | | |/ /
| | | | | |/| |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
|
| | | |/ / / / |
|
| | | |\ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Calling setParentItem is causing the previous opacity/visible updates
to be discarded because the dirty flags were not propagated to the new parent.
Also removed some unnecessary 'markDirty' and 'update' calls.
Task-number: QTBUG-6738
Reviewed-by: bnilsen
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-7530
Reviewed-by: Kim
|