| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
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
|
|/ |
|
|
|
|
|
| |
Reviewed-by: joao
Reviewed-by: Peter Hartmann
|
|
|
|
| |
Reviewed-by: joao
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
| |
Instead of sequentially looking up and potentially taking
a long time, we now do work in parallel.
Reviewed-by: ogoffart
Reviewed-by: lars
|
|
|
|
|
|
|
|
| |
Seems like WinHttpGetIEProxyConfigForCurrentUser can return more
than one proxy even if this is not documented.
Task-number: QTBUG-5981
Reviewed-by: Peter Hartmann
|
|
|
|
|
|
|
|
|
|
| |
patch by Warwick Allison. On cleanup in QHostInfoAgent, we were waiting
forever for the thread to terminate, which did not always succeed due to
a Linux kernel bug. Now, we just wait for some time and then return
anyway.
Reviewed-by: Marius Storm-Olsen
Task-number: QTBUG-5296
|
|\
| |
| |
| |
| | |
Conflicts:
src/gui/egl/qegl_symbian.cpp
|
| |
| |
| |
| |
| | |
Task-number: Salesforce 00062670
Reviewed-by: Thiago
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If you try to resolve 10.3.4.6, you're probably going to get that it
doesn't exist. On some systems, getnameinfo will return the IP address
in string form (Linux, without NI_NAMEREQD). On some others, it will
fail (Mac, Windows).
So harmonise by gracefully handling the case in which getnameinfo
fails.
Possible behaviour change: we don't try the forward resolution any
more, after completing the reverse one.
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
| |
| |
| |
| | |
Requested-By: Volker Hilsheimer
|
| |
| |
| |
| |
| |
| | |
Note: Those messages are to be translated in Qt 4.6
for the first time.
Reviewed-by: Kent Hansen <khansen@trolltech.com>
|