| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Task-number: QTBUG-12608, QTBUG-12243
Reviewed-by: Markus Goetz
|
|
|
|
|
| |
Reviewer: David Boddie
Task number: QTBUG-11938
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
src/3rdparty/* is left untouched and not merged from 4.6. The corresponding
changes in Harfbuzz and WebKit are already in the 4.6 staging areas.
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.qrc
tests/auto/qtextlayout/tst_qtextlayout.cpp
tests/auto/qwidgetaction/tst_qwidgetaction.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If we're connected to a name pipe which is in message mode, we have to
handle the following case: ReadFile() or GetOverlappedResult() return
FALSE and GetLastError() returns ERROR_MORE_DATA.
This just means, that the message didn't fit into the pipe's internal
buffer. We must not handle this as error.
Task-number: QTBUG-11490
Reviewed-by: ossi
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
In waitForReadyRead we didn't check for synchronous connection loss.
Autotest added: tst_QLocalSocket::syncDisconnectNotify
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If we notice a broken pipe via _q_notified, we should call close
in case the internal read buffer is empty.
Auto test added: tst_QLocalSocket::asyncDisconnectNotify
Reviewed-by: ossi
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
src/3rdparty/webkit merged with checkout --ours
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/platform/text/qt/TextBreakIteratorQt.cpp
src/gui/kernel/qt_s60_p.h
src/gui/text/qfontdatabase_s60.cpp
src/script/api/qscriptengine.cpp
|
| |
| |
| |
| | |
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| | |
QLocalSocketPrivate::bytesAvailable has been renamed to
QLocalSocketPrivate::checkPipeState to match the purpose of this method.
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Reading from a socket with a broken connection didn't work, even if
there were still bytes to read in the internal read buffer.
Autotest: tst_QLocalSocket::writeToClientAndDisconnect
Task-number: QTBUG-10921
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Don't call GetOverlappedResult if ConnectNamedPipe connects instantly.
Autotest: tst_qlocalsocket::threadedConnection
Task-number: QTBUG-8477
Done-with: ossi
Reviewed-by: ossi
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/spectrum/app/app.pro
src/gui/egl/qegl.cpp
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qmenu/tst_qmenu.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
qt_safe_write and and qt_safe_read already contain EINTR_LOOP.
It seems that this loop has been added to code due to
merge/clean-up errors in commits:
4aafbd6222e7aeafd59a4a4356ba8c53b2bfa1d1
f0a8feed9e9b4de10df76faa350201edaef98f1d
Reviewed-by: Aleksandar Sasha Babic
Reviewed-by: Markus Goetz
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (158 commits)
qdoc: Yet another revision of the top doc page.
Doc: Update on web template
Added QDateTime::msecsTo()
Doc: Fixed tables and images for the new docs
qdoc: Yet another revision of the top doc page.
Revert "Improve QUrl handling of local file paths"
Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"
Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to"
Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs."
qdoc: Another revision of the top doc page.
Doc correction to css
Doc: Updates to the html template and javascript
tst_SuiteTest: Fix a meaningless switch statement
My 4.7.0 changelog entries.
qdoc: Fixed annotated list generation to use <td>, not <th>.
Doc: Tuning search script
qdoc: Reorganized examples panel.
Doc: Chages to search feature, css and table order
QtDeclarative: avoid waiting for a network load on URIs with empty schemes.
QtDeclarative: RFC 3986 requires schemes to be considered case-insensitively
...
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (132 commits)
Make QCompleter cope with restricted screen real estate (mobile devices)
Don't initialize Wintab if QT_NO_TABLETEVENT is defined.
QDBusXmlGenerator: get the true name from QMetaType for the return type
Add missing newline to static XML snippet
Fix compilation in C++0x mode (narrowing of constants)
My changelog entries for core and network
Doc: updating html and search feature
my changelog
Doc - mention vcsubdirs as a possible value for TEMPLATE
doc: Second attempt to begin reorganizing the top doc page.
Fix syntax error in configure script
fix qmake project file following msvc2010 addition
remove extraneous return statement
cosmetics: change enum value
isOnActiveSpace is available from 10.6.
QTcpServer: Fix documentation for previous commit
Keep support for maximum pending connections in derived QTcpServer
[QNAM FTP] Check for the "ftp" scheme case-insensitively
Use QUrl::isLocalFile and fix the scheme checking in local URLs.
Improve QUrl handling of local file paths
...
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
By adding a new function to the class QTcpServer it's now possible to
extend QTcpserver functionality with for instance SSL capabilities and
still keep the support for maximum pending connections.
Task-number: QTBUG-1875
Reviewed-by: Peter Hartmann
Reviewed-by: Markus Goetz
Merge-Request: 568
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Socket connect in Symbian may return non-standard EPIPE error,
after which the connection is terminated. Added Symbian specific
workaround to set socket to UnconnectedState if EPIPE errno is
received. In addition a bug report for Open C is created:
http://developer.symbian.org/bugs/show_bug.cgi?id=2676
Task-number: QT-3362
Reviewed-by: Aleksandar Sasha Babic
Reviewed-by: Markus Goetz
|
|\ \ \
| |/ /
|/| /
| |/
| | |
Conflicts:
translations/translations.pri
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If _q_onNewConnection failed, then QLocalServer got into a bad state.
QLocalServer::isListening() still returned true and
QLocalServer::close() crashed.
Task-number: QTBUG-10388
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| | |
If we're not even going to connect, there's no point in trying to get
the host resolution
Reviewed-By: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| | |
If we're not even going to connect, there's no point in trying to get
the host resolution
Reviewed-By: Markus Goetz
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (55 commits)
Revert "Removed double setting of _WIN32_WINNT"
Revert "removed a few warnings on wince builds"
removed a few warnings on wince builds
Removed double setting of _WIN32_WINNT
QTreeView: remove dead code.
doc: Clarify effect of QFont::NoFontMerging
Revert "Implement heightForWidth support for QTabWidget and QStackedLayout."
build fix for S60
Improve handling of QAction in soft key manager
Remove useless assert
qdrawhelper: fix optim in 2245641ba
QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage
accelerate QWindowsPipeWriter for bigger chunks of data
Fix antialiasing with transformed text in OpenGL2 paint engine
Fix flattening of largely scaled, thin, dashed beziers.
Increased the precision used to flatten beziers
Fix QT_NO_MOVIE
Fix compile error with QT_NO_ACTION in QtGui
Fix QT_NO_COMPLETER
Fix QT_NO_FSCOMPLETER
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Don't put pipes into message mode.
This makes it possible to not split data into 2k chunks.
Reviewed-by: ossi
|
|\ \ \
| |/ /
|/| /
| |/ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed app freeze if switching to offline in middle of HTTP transaction.
Document Symbian platform security requirements on Qt APIs
Fixed app freeze if switching to offline in middle of HTTP transaction.
Removed QtDeclarative.dll deployment from qt.iby in 4.6 branch.
Don't build QtXmlPatterns' command line tools on Symbian.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Work done jointly by Gareth and me. Yields no qdoc errors.
Task-number: QTBUG-9342
Task-number: QTBUG-9120
Reviewed-by: Gareth Stockwell
Reviewed-by: David Boddie
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When active socket is disconnected by swithcing to offline mode, native
RSocket completes the active socket operations with KErrCancel (-3).
Open C maps this error code to POSIX errno EINTR (4). Normally in Posix
EINTR is only used to indicate that some operation was interrupted by
POSIX signal. Qt has a while loops in network operations to handle
operations interrupterd by signals. These while loops will be
effectively forever loops in Symbian due to Open C error code mapping.
Because Symbian does not have native support for signals, i.e. the
network operations can never be really interrupted by POSIX signal,
it is ok to remove these while loops completely on Symbian platform.
This fix is a workaround to Open C incorrect error mapping, and
should be removed once Open C has fixed their error mapping.
Task-number: QT-3274
Reviewed-by: Aleksandar Sasha Babic
|
| |/
| |
| |
| |
| |
| |
| |
| | |
When closing a QLocalSocket, which has unwritten data, the pipe writer
was never deleted. Thus writing after a reconnect didn't work.
Task-number: QTBUG-9681
Reviewed-by: ossi
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Use qt_qhostinfo_lookup which avoids the event loop when the DNS
result is already cached.
Reviewed-by: Thiago
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
|
| |
| |
| |
| | |
Reviewed-by: Thiago
|
|/
|
|
|
| |
Task: QTBUG-7054
Reviewed-by: Peter Hartmann
|
|
|
|
| |
Reviewed-by: ossi
|
|
|
|
|
|
|
|
|
| |
Destroying a QLocalSocket with unwritten data left unclosed handles
behind. The connection wasn't closed properly, such that the other
end didn't get notified about the connection loss.
Task-number: QTBUG-7815
Reviewed-by: ossi
|
|
|
|
|
|
|
|
| |
We had some bugreports and support requests related to
misunderstandings about this.
Reviewed-by: Peter Hartmann
Reviewed-by: David Boddie
|
|
|
|
|
| |
Reviewed-by: joao
Reviewed-by: Peter Hartmann
|
|
|
|
| |
Reviewed-by: thiago
|
|
|
|
|
|
| |
Task-number: QTBUG-7316
Task-number: QTBUG-7317
Reviewed-by: thiago
|
|
|
|
| |
Reviewed-by: thiago
|
|
|
|
| |
Reviewed-by: joao
|
|
|
|
|
|
|
|
| |
We had an hack in the code that chunked writes. Try to avoid
this since the hack is probably only needed for older windows versions.
Task-number: QTBUG-7344
Reviewed-by: Peter Hartmann
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
There was a buffer that is always empty since it was only used for
parsing the HTTP proxy protocol, not the actual socket data.
Reviewed-by: Peter Hartmann
|