| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
no need to extract the realm from the user; with digest authentication
the realm is an attribute of its own.
Reviewed-by: Markus Goetz
Task-number: QTBUG-15070
|
| |
|
| |
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
| |
Use QElapsedTime instead of QTime for performance gain. See QT-2965 for
more info.
Task-number: QTBUG-16468
Reviewed-by: Markus Goetz
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (53 commits)
trivial: fix build
Fix crash
fix isLikelyToBeNfs usage
Export isLikelyToBeNfs only if we have an internal build
Fixed QGraphicsView autotest to use a dummy toplevel widget
Fixed QMdiArea autotest to use a dummy toplevel widget.
Fixed QMenuBar autotest. Changed window activation order.
Fixed QStyleSheetStyle autotest to use a dummy toplevel widget
Fixed QPathCliper autotest, to skip a test when qreal != double
Fixed QComboBox autotest to use a dummy toplevel widget
Fixed QColumnView autotest. Added an QApplication::processEvents
Fixed QAccessability autotest to use a dummy toplevel widget
Fix QListWidget test
Fix QGraphicsItems autotest
Fixed QGraphicsScene autotest to use a dummy toplevel widget
Fixed QGraphicsItem autotest to use a dummy toplevel widget
Fixed QListView autotest to use a dummy toplevel widget
Fixed QMenu autotest to use a dummy toplevel widget
Fixed QMenuBar autotest. Added mainwindow activation
Fixed QString autotest when QT_QLOCALE_USES_FCVT is set
...
|
| | |
|
| |
| |
| |
| |
| |
| | |
check the global network proxy for 0 before dereferencing
Reviewed-by: Robert Griebl
|
|/
|
|
|
|
|
| |
Reset authenticator and fix operator=(...) of QAuthenticator.
Task-number: QTBUG-6792
Reviewed-by: ogoffart
|
|
|
|
|
|
|
|
|
|
| |
QNetworkAccessManager used the user() function for caching
the credentials when doing HTTP authentication with NTLMv2. For that
to work it needs to return the same value as was put in with setUser().
Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
|
|
|
|
|
|
|
| |
This way both synchronous and asynchronous lookups are cached, resulting
in more reliable behavior: this issue was detected by kde's ktcpsockettest
where state() was sometimes HostLookupState and sometimes ConnectedState,
depending on whether the previous lookups were done by the thread or by
the blocking lookup in QAbstractSocket::waitForConnected.
Merge-request: 829
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
| |
The loop looking for posponedLookup in the lookup thread wasn't locking
the mutex before trying to access/modify the list.
Reviewed-by: Andreas Kling
|
|
|
|
| |
Reviewed-by: Markus Goetz
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/Makefile.win32
src/corelib/io/qfsfileengine_win.cpp
src/corelib/kernel/qeventdispatcher_win.cpp
src/gui/dialogs/qfiledialog_win.cpp
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/text/qfontdatabase_win.cpp
src/gui/util/qsystemtrayicon_win.cpp
src/script/utils/qscriptdate.cpp
tests/auto/qinputcontext/tst_qinputcontext.cpp
tests/auto/qscriptengine/tst_qscriptengine.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This was a security hole that has been there for a while, but the
public awareness have recently rised so the threat is more imminent
now.
The solution is to fix all places where we dynamically load system
libraries. More specifically, we now load all system libraries with
an absolute path that points to a library in the system directory
(usually c:\windows\system32).
We therefore introduce a small class named QSystemLibrary that only loads
libraries located in the system path. This shares some of the API with
QLibrary (in order to make the patch as small as possible).
We don't fix QLibrary due to risk of regressions. In
addition, applications can fix the code that calls QLibrary themselves.
The problem does not apply to Windows CE, since the search order is
documented as not searching in the current directory.
However, it touches some CE-specific code - therefore QSystemLibrary
is sometimes used on WinCE (however, it will just do a normal
LoadLibrary() since its safe anyway).
This change does not affect the testability plugin (it is not clearly
documented where that plugin is located, and the plugin should never
be used in production code anyway)
Loading OpenSSL libraries
The ssl libraries are handled specially, and searched in this order
(we cannot expect them to always be in the system folder):
1. Application path
2. System libraries path
3. Trying all paths inside the PATH environment variable
Task-number: QT-3825
Reviewed-by: Thiago Macieira
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes extraction of time from the server, and saves the domain
information properly.
Patch by subcontractor
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-12608, QTBUG-12243
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| | |
Reviewer: David Boddie
Task number: QTBUG-11938
|
| |
| |
| |
| | |
Task-number: QTBUG-12106
|
| | |
|
| |
| |
| |
| |
| | |
Task-number: QT-3573
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| | |
Task-number: QT-3573
Reviewed-By: Markus Goetz
|
| |
| |
| |
| | |
Reviewed-by: Markus Goetz
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge branch '4.7-upstream' into 4.7
Conflicts:
doc/src/declarative/advtutorial.qdoc
src/declarative/graphicsitems/qdeclarativeloader.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/util/qdeclarativexmllistmodel.cpp
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-12004
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This also fixes a long-standing bug in handling usernames of type
"domainname\username", typical of Windows domains, that didn't work
with the previous NTLMv1 code.
Patch by subcontractor.
Task-number: QTBUG-9408, QTBUG-2421, QT-3248
Reviewed-By: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| | |
Only try auto config retrieval once.
Patch by Kai Koehne.
Task-number: QTBUG-10106
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/plugins/phonon/mmf/mmf.pro
|
| |
| |
| |
| |
| |
| |
| | |
The fix is based on 9897aece975e0a4a77e0cc6b8590305baba1fccb.
Task-number: QTBUG-8687
Reviewed-by: TrustMe
|
| | |
|
| |
| |
| |
| |
| | |
Reviewed-by: Markus Goetz
Task-number: QTBUG-10106
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/tools/qlocale_symbian.cpp
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
| | |
| | |
| | |
| | | |
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It may fail but threads become available the next instant. Instead,
simply use our own currentLookups count.
Reviewed-by: Markus Goetz
|
|/ / |
|
| |
| |
| |
| |
| |
| | |
Thanks rittk!
Reviewed-by: Olivier
|
| |
| |
| |
| | |
Reviewed-by: Thiago
|
| |
| |
| |
| | |
Reviewed-by: Thiago
|
| |
| |
| |
| |
| |
| |
| | |
It may fail but threads become available the next instant. Instead,
simply use our own currentLookups count.
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| | |
Ensure that one test won't interfere with the next
Reviewed-by: Markus Goetz
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Ensure that the threadpool QHostInfo uses internally has cleanup its
threads when the application exits. This avoids the warning from
QWaitCondition on Windows (which happens due to thread termination at
application exit).
Task-number: QTBUG-7691
Reviewed-by: mgoetz
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: joao
|
| |
| |
| |
| |
| |
| | |
By default enabled, but it can be disabled via a compile flag.
Reviewed-by: Thiago
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|