| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Merge-request: 445
Reviewed-by: João Abecasis <joao@trolltech.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
integration
Conflicts:
examples/dbus/dbus-chat/chat_adaptor.cpp
examples/dbus/dbus-chat/chat_adaptor.h
examples/dbus/dbus-chat/chat_interface.cpp
examples/dbus/dbus-chat/chat_interface.h
examples/dbus/remotecontrolledcar/car/car_adaptor.cpp
examples/dbus/remotecontrolledcar/car/car_adaptor_p.h
examples/dbus/remotecontrolledcar/controller/car_interface.cpp
examples/dbus/remotecontrolledcar/controller/car_interface_p.h
|
| |
| |
| |
| | |
Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
|
| |
| |
| |
| | |
Caching of LinkType and BundleType is independent of other file flags.
|
| |
| |
| |
| |
| |
| | |
methodCount == 0.
Reviewed-by: Bradley T. Hughes
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This avoids a number of reallocations due to appending.
This patch was contributed to us.
Task-number: QTBUG-3242
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| |
| | |
Merge-request: 446
Reviewed-by: João Abecasis <joao@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
`if(' -> `if ('
`for(' -> `for ('
remove needless qhash.h include
Merge-request: 446
Reviewed-by: João Abecasis <joao@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Reduce overhead of the uid/gid to user/group name conversion by caching
results from QAbstractFileEngine::owner().
Merge-request: 446
Reviewed-by: João Abecasis <joao@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| | |
Moved includes into proper place.
Merge-request: 446
Reviewed-by: João Abecasis <joao@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| | |
remove repeated code; improve readability
Merge-request: 446
Reviewed-by: João Abecasis <joao@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Separated testing for permissions flags, in order to speedup QFileInfo
on Windows with qt_ntfs_permission_lookup flag turned on (especially on
network shares).
In QFileInfoPrivate::getFileFlags, avoid multiple calls to the engine,
by concatenating all requests.
Merge-request: 446
Reviewed-by: João Abecasis <joao@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
causes Refresh of file engine's internal cache, since `fileEngine'
member is set before clear() is called. Initialize members with default
values instead.
Merge-request: 446
Reviewed-by: João Abecasis <joao@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| | |
null fileNames returned by fileEngine must be cached too
Merge-request: 446
Reviewed-by: João Abecasis <joao@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| | |
ELF symbol visibility.
Merge-request: 433
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| | |
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
tools/assistant/lib/qhelpsearchquerywidget.cpp
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
1st attempt at USB serial port enumerator for linux
Corrected alphabetic order in the docs for events.
Implemented event filter functions for Symbian.
|
| | | |
| | | |
| | | |
| | | | |
RevBy: Trust me
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
tst_QByteArray is was crashing on linux 64bit.
The memory was freed twice, once by qRealloc, and one by QScopePointer::reset
This patch will leak if qRealloc fails because of OutOfMemory.
But we do not care as it is a corner case.
Reviewed-by: Harald Fernengel
Reviewed-by: Robert Griebl
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Adds a disconnectOne() method that allows a single signal/slot connection
to be disconnected, as required by QTBUG-6781.
Reviewed-by: Warwick Allison
Reviewed-by: Olivier Goffart
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Memory leak in native Toolbar cleanup in Cocoa
Fix copyright year.
Bump version to 4.6.2.
Add skeleton changes file for 4.6.2.
Add released version of 4.6.1 changes file for posterity.
Designer crashes when previewing QMainWindow with native Toolbar on Mac
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make the qWarnings in the animation API more useful.
Fixed y-inverted pixmaps on N900.
Fix X11/EGL builds using OpenGL ES 1.1
Fix Typo
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number:QTBUG-6895
Reviewed-by:Thierry
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Markus Goetz
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Don't try to allocate one for QFile::handle and QFile::flush since
they'll be useless there.
Reviewed-by: Markus Goetz
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Don't repeatedly call the fileEngine virtual function. Instead re-use
the private data member if we know it has been filled.
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 438
Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-6890
Reviewed-by: Thierry
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Error was:
../../include/QtCore/../../src/corelib/arch/qatomic_ia64.h(208):
error: argument of type "QMutexPool *volatile *" is incompatible with parameter of type "void *volatile *"
return (T *)_InterlockedExchangePointer(&_q_value, newValue);
^
detected during instantiation of "T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *) [with T=QMutexPool]"
Patch by Intel Yolanda Chen (relayed by reporter Richard Fleck).
Task-number: QTBUG-7356
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enable surface transparency support on Symbian^4.
Improve the behavior of expose events on Symbian.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
On Symbian^4 systems where the window supports surface transparency, we
use this for the Qt::WA_TranslucentBackground flag instead of the
previous method.
Task-number: QT-2026
Reviewed-by: Iain
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
remove was checking for errors from close, but without clearing the
error state beforehand it ended picking unrelated errors.
Task-number: QTBUG-7285
Reviewed-by: qCaro
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
dist/changes-4.6.1
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QFileInfo().absolutePath() is legal and shouldn't produce a warning.
Reviewed-by: João Abecasis
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (23 commits)
My changes
Significant digits were lost in QDoubleSpinBox range when changing precision
My changelog for 4.6.1.
Added my changes to the 4.6.1 change log.
Put LinesHint into QVectorPath hints to enable further optimizations
Update changes file for 4.6.1
Avoid coordinate limitations in the raster engine.
Update changelog with my 4.6.1 changes.
4.6.1 changes
Fixed bug where QGLPixmapData::toImage() returned too dark image.
Update change log with Yoann Lopes work.
Fix completion in QFileDialog.
Fix point drawing on raster engine for flat and square caps
Update changes file with Rhys Weatherley's work.
warning fixes for platforms, where qreal == float
fix release mode crash in qfont.cpp initFontSubst() on Windows mobile
Fixed justify aligned text drawing with the GL1 engine.
Add odf-writer benchmark.
Fixed subpixel antialiased text drawing with the GL2 engine.
Fixes warning in the QMacStyle
...
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
dist/changes-4.6.1
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: thartman
|
| | |/ /
| |/| |
| | | |
| | | | |
Reviewed-by: axis
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 426
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Replaced the ambiguous "delivered" with the explanation that the
blocking queued connection type blocks the emitter's thread until
the slot finishes executing in the receiver's thread.
Task-number: QTBUG-6392
|
| |\ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is private API for now. For 4.7, decide whether to have a public
method for this.
Also investigate whether to provide a qHash function. Adding one to Qt
would break source- and binary-compatibility with code that already
has that (like Soprano).
Patch-By: Warwick Allison
Reviewed-by: Thiago Macieira
|
| | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Reverted two commits that were pushed to the wrong branch.
Use the new QTextCodec api in the QXmlStreamWriter.
Added new functions to QTextCodec that accept ConversionFlags.
Fix passing of arguments to syncqt
doc: Fixed typos.
Fixes: Fix spinbox with NoButton style in QGtkStyle
doc: Explained parameter value defaults where appropriate.
Cocoa: Fix painting errors on QGLWidget resizing.
Fix broken QGLWidget::renderPixmap on Mac/Carbon
Fixes: Setting any style sheet breaks checkbox positioning
Fixes: MenuItem size fixes and missing separator with Gtk+
Autotest: add a test for QNAM's HTTP cache handling code
QNAM HTTP: just use the expirationDate in the code that validates the cache
QNAM HTTP: change the caching semantics to match documentation
QNAM HTTP: fix the caching algorithm from RFC 2616
Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
improve readability a bit more
fix styling; improve readability
make it possible to retrieve name of the user who owns the file
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
...
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Revert "Use the new QTextCodec api in the QXmlStreamWriter."
This reverts commit fdac6df6d46e6d4f00763365de5a4437ad06ba39.
Revert "Added new functions to QTextCodec that accept ConversionFlags."
This reverts commit 7fb78e7f60ea72e9e471d6cbc4403d490581df17.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Instead of accesing private data, use the QTextCodec::makeEncoder() to pass the
initial conversion flags to the codec.
Also improved the behavior - we shouldn't add BOM in the middle of the data
when dumping xml in all encodings, not only for utf8.
Task-number: QTBUG-7180
Reviewed-by: Thiago
|