| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| |
| | |
Task-number: http://bugs.meego.com/show_bug.cgi?id=7777
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-14213
Reviewed-by: David Boddie
|
|/
|
|
|
|
| |
Don\t use \i for italics. Use \e.
Task: QTBUG-14133
|
|
|
|
|
|
|
|
|
|
| |
... by only reading in a certificate once. Before, we were adding all
files from all directories; since they often contained symlinks, the
same certificate was added several times.
Reviewed-by: Markus Goetz
Reviewed-by: Thiago Macieira
Task-number: QTBUG-14013
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
This way it will be available to all modules, not just selected ones.
RevBy: Miikka Heikkinen
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
Resources do not need network access and can be quicker
loaded with QFileNetworkReply.
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
|
|
| |
This one happened especially more often on amazon.de.
While one channel was taken by one request, but postponed because it
was still in disconnecting mode, another request would come, pick
the same channel, and overwrite the request/reply assignment of this
channel. The first request would be left unhandled eternally.
Reviewed-by: Markus Goetz
|
|
|
|
| |
Reviewed-by: Thomas Hartmann <thomas.hartmann@nokia.com>
|
| |
|
|
|
|
| |
Reviewed-by: Markus Goetz
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Editable QComboBox popup immediately closes itself after a click
Change RLibrary handle in QS60PluginResolver to be process wide
Cursor is misplaced in the editors text area
QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The patch fixes the hanging issues on some Symbian devices that occurs while
retrieving certificates from the Symbian certificate store. The hanging was
caused by the certificate info array not being closed before exiting the
thread. This alone wouldn't make the existing implementation work, so the patch
replaces it with a pure Symbian style implementation which doesn't seem to be
affected (probably some OpenC threads issue).
Merge-request: 808
Reviewed-by: Shane Kearns
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Task: QTBUG-13033
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
Work around a compiler bug on 64-bit.
Fix handling of braces/no-braces in QUrl::host / setHost.
Changes (and minor corrections) to QByteArray documentation.
QtWebKit: Update tag files to match the same content on qtwebkit.git
QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.
QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.
uic: Fix compile breakage in case QT_NO_QT3_SUPPORT.
uic: Improve messages.
Tools (uic/rcc): Improve warning messages.
QDir: Removed checks for existance of fileEngine
QDir and QFileInfo shouldn't lose properties when detaching
Another bug-o introduced in fixing QDirPrivate refactoring
Reverting QDir::detach introduced earlier
QFileInfo: Prepare for engine-less implementation
Removed QFileInfoPrivate::initFileEngine
Simplify QDir::cd
QDir::makeAbsolute could self-destruct on failure
QDir::operator= simplification
QDirPrivate refactoring
QDirPrivate refactoring
...
|
| |\
| | |
| | |
| | | |
integration
|
| | |
| | |
| | |
| | |
| | | |
The signal provides qint64, which cannot be connected to
QProgressBar::setValue(int).
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-12285
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes Westpoint Security issue with Advisory ID#: wp-10-0001.
Before, we would allow wildcards in IP addresses like *.2.3.4 ; now,
IP addresses must match excatly.
Patch-by: Richard J. Moore <rich@kde.org>
Task-number: QT-3704
|
| | |
| | |
| | |
| | |
| | | |
QString::lower() is QT3_SUPPORT, the correct method is
QString::toLower().
|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge-request: 731
Task-number: QTBUG-4455
Reviewed-by: Peter Hartmann
|
| | |
| | |
| | |
| | |
| | | |
Reviewed-by: Markus Goetz
Task-number: QT-3567
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The order of global static destruction is not well defined. Ensure that
the QNetworkConfigurationManager global static is destroyed from the
QCoreApplication destructor before its dependencies are destroyed with
the rest of the global statics.
Task-number: QTBUG-13304
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixes extraction of time from the server, and saves the domain
information properly.
Patch by subcontractor
Reviewed-by: Thiago Macieira
|
| |/
|/| |
|
| |
| |
| |
| |
| |
| |
| |
| | |
We were accessing the d-pointer of a QSslConfiguration which is
initialized lazily.
Reviewed-by: Markus Goetz
Task-number: QTBUG-13265
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-12608, QTBUG-12243
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| | |
Defer initialisation and changing thread affinity until after the
global static is constructed.
Task-number: QTBUG-12686
|
|\ \ |
|
| | | |
|
| | |
| | |
| | |
| | | |
Wrap new APIs in ifndef QT_MOBILITY_BEARER.
|
|/ / |
|
| |
| |
| |
| | |
Task-number: QTBUG-12285
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported
update Russian translations for Qt and tools
Updated Slovenian translations for Qt 4.7
doc: The QML Qt element was missing from the documentation.
64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256
QXmlStreamReader: avoid unnecessary detaching
QSslCertificate: support expiration dates > 2049
Doc: Fixing typo
Doc: Fixing bug involving header misplacement in Creator style
qdoc: Added list of all members (including inherited) page to QML elements.
qdoc: Ensured that text is encoded correctly.
qdoc: Fixed non-well-formed markup.
Doc: Fixed typo in a shortcut string.
Remove useless QString::clear() from QSharedData example snippet.
Move note on connectToBus() not actually being able to reconnect to
Doc: Added more license information.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
X509 has two time formats: UTC, where the year is in two-digit format,
and generalized time with four-digit years.
This patch allows dates specified generalized time.
Reviewed-by: Thiago Macieira
Task-number: QTBUG-12489
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/index.qdoc
src/declarative/qml/qdeclarativeimageprovider.cpp
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits)
Fix memory leak in QtScript variable object
doc: Changed some titles so lists of contents sort better.
QSslSocket: fix security vulnerability with wildcard IP addresses
doc: Some reorganization of top page topic hierarchy.
Mac: Fix crash when using style to draw on other things than widgets
Doc: Adding radius support for CSS3 and webkit
Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression
add performance comparisons to qregexp benchmark
configure: fix error message when calling config.status
Fix invalid memory write during recursive timer activation
Added comment about calendarPopup in setCalendarWidget function documentation.
doc: Fixed some qdoc errors.
Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.
CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE.
XmlListModel doc fixes
Mention QML_IMPORT_TRACE in Modules docs
Merge sections about when property and default state
Explain Flipable example further
PathView required some diagonal movement before a drag was initiated.
doc: Fixed some qdoc errors.
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This fixes Westpoint Security issue with Advisory ID#: wp-10-0001.
Before, we would allow wildcards in IP addresses like *.2.3.4 ; now,
IP addresses must match excatly.
Patch-by: Richard J. Moore <rich@kde.org>
Task-number: QT-3704
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewer: David Boddie
Task number: QTBUG-11938
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
Added one test for QRegExp
QMetaObject::normalizeSignature avoid reading past the string in case of invalid signature given.
Add text decoration support to QStaticText
Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator
QtDeclarative: get rid of warnings in public header
doc: Clarify documentation of QStaticText
Fix scrollbar randomly popping up in QPlainTextEdit
Remove the definition of QT_HAVE_NEON from qt.prf
Use the fast Neon conversion for converting colors of jpeg images.
Do the conversion from RGB888 to RGB32 using Neon
Move the build of Neon file from painting.pri to gui.pro
QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads
compilation with QT_NO_DEPRECATED
Test we do not have compiler warnings in our headers with more options
QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff
Doc: Fixed qdoc warnings.
Fix QTextEngine overflow caused by extremely long text
Replace the SSE prologues by a macro
QDom: Do not crash on "<a:>text</a:>"
Doc: Fixed typo.
...
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
src/network/bearer/qnetworkconfiguration.h
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/declarative/util/qdeclarativeanimation.cpp
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Andreas Kling
|
| |/ / /
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
Due to a wrong ifdef sequence, the unix code was being compiled instead
of the symbian code for retrieving the system certificates.
Task-number: QTBUG-12718
Reviewed-by: Peter Hartmann
|
| | | |
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QtMobility uses the Qt header when compiling applications which
link against Mobility's Bearer library. Therefore
QNetworkConfiguration::bearerName() cannot be inline and refer to the
new QNetworkConfiguration::bearerTypeName() function (which doesn't
exist in Mobility)
Task-number: QTBUG-12378
Reviewed-by: Rohan McGovern
|