| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/corelib/io/io.pri
src/corelib/io/qfilesystemwatcher.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/configure/configureapp.cpp
|
| |
| |
| |
| |
| |
| | |
The conditionals were the wrong way round.
Reviewed-By: Samuel
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If you set this flag on an item, and descendant item that gains input
focus will become this item's focus proxy. This simplifies how focus
proxy items are assigned from QML; instead of binding the possible
focusProxy property to a named child widget, this assignment happens
automatically as you set the focus property of a descendant to true.
As part of this change, QGraphicsWidget::focusWidget behavior has been
improved and moved into QGraphicsItem. For example, if you set focus on
an item that it's part of a scene, it can gain focus once the parent
has been assigned (which is how object trees are built in QML).
Autotests are included.
Reviewed-by: Michael Brasser
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
This reverts commit 1368c210ef9976f68eb9fb1c3e4dc14f4fa4edd2, which
accidentially reverted previous commits.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
I don't know exactly why this is needed, but otherwise GCC complains
that there is no default constructor.
|
| |
| |
| |
| |
| | |
No wonder QT_SHAREDPOINTER_TRACK_POINTERS was having no effect:
there was an #include <QtCore/QtCore> before it.
|
| |
| |
| |
| | |
This requires modifying slightl QProcess on Unix to forward stdin too.
|
| |
| |
| |
| |
| | |
Don't use old-style casts in Qt code. And avoid signed/unsigned
comparisons (sizeof returns size_t, which is unsigned).
|
| | |
|
| |
| |
| |
| |
| |
| | |
It is possible to export symbols in template classes, but I
don't think we use any such cases now (template specialisation).
It only works properly with C++0x anyway (extern template).
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We use the same trick as the custom deleter: we allocate memory for an
object of class ExternalRefCountWithContiguousData<T>, but we do that
only to be certain of the alignment requirements for T. We initialise
the d-pointer via placement new and the T object is left for
initialisation by the outermost function.
The reason for that last trick is to support passing parameters in the
future with the least amount of template functions necessary. I still
plan on supporting arguments only with C++0x (maybe up to one
without).
|
| |
| |
| |
| |
| |
| |
| | |
structure in QSharedPointer""
This restores the original implementation of the creating
function. The next commit will make it suitable for use.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This should be binary- and source-compatible, since these
QSharedPointer internal classes aren't exported. The compiler should
generate the symbols in all libraries and applications that used it,
which means removing it from Qt won't affect them.
(In fact, these symbols shouldn't be in QtCore at all, since we don't
use QSharedPointer in it)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Instead of using a template class derived from
QtSharedPointer::ExternalRefCountData, use a non-template class that
has a function pointer. This avoids generating a virtual table for
each QSharedPointer type and custom deleter.
The trick here is that we don't "new" the d pointer anymore, but we
simply allocate memory (via ::operator new, so it may throw an
exception), then we use the placement new to initialise the
non-template d-pointer and the template deleter sub-objects. Then we
store the pointer to a regular function which will execute the user's
custom deleter.
I also added operator delete() to the class to make sure no smarty
compiler decides to delete the d-pointer with a fixed size (I don't
think that happens, but just to be on the safe side).
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QtCore compiled, but of course that means very little since most of
QtConcurrent's problems are in the template code, which isn't
instantiated inside QtCore. Examples and tests all failed to build...
I'm almost done getting it to work with that compiler, but it will
take me a little more time. I'm refactoring a bit of the QtConcurrent
code, so that things compile more smoothly, using partial template
specialisation.
To be on the safe side, re-disable for xlC 7 too.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The problem was that on Windows, we would activate on WM_LButtonUp,
but a double click after activating will also generate a second
WM_LButtonUp. Hence we get three activations. The fix was basically
to filter out the second WM_LButtonUP, something we also do in
qapplication_win.cpp.
Task-number: 205499
Reviewed-by: denis
|
| |
| |
| |
| |
| |
| |
| |
| | |
Don't just assume they're going to be ARGB just because the config has
an alpha channel. This makes QGLWidgets with WA_TranslucentBackground
set work again on the rx71 when running under xcompmgr.
Reviewed-By: Trustme
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When opening a menu by shortcut on Windows, we would loose
the keyboard mnemonic when navigating around. This is incorrect
compared to native applications and somewhat inconvenient.
The fix is basically to enable the keyboard mode when shortcuts
are triggered, not only when the alt-key is pressed.
Task-number: 254496
Reviewed-by: denis
|
| |
| |
| |
| |
| |
| |
| | |
ends up on the right X11 screen.
Merge-request: 987
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| |
| |
| |
| |
| |
| | |
This makes the QPixmapCache autotest link and pass on Windows.
Reviewed-by: Trustme
|
| |
| |
| |
| |
| |
| | |
and link against a regular Qt build.
Reviewed-by: Trustme
|
| |
| |
| |
| |
| |
| |
| |
| | |
add a few more subtests;
fix fileTimes_oldFile test for non-UTC time
Merge-request: 966
Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
GetFileAttributes call can fire at least one more error - ERROR_NOT_READY (21)
since now the fallback code will be executed for basic cases only
Merge-request: 984
Reviewed-by: Joerg Bornemann <joerg.bornemann@trolltech.com>
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Panther was the last reason for having this around. We don't touch this
code anywhere else in Qt. As a result it's orphaned and can be safely
removed. It truly is the end of an era, but it's definitely worth
celebrating. Quartz4Life!
|
| |
| |
| |
| | |
Also rephrase some sentences.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There was an attempt to do this earlier, but it was a bit more complex
than it needed to be. We now do the update on show in Cocoa. Carbon
actually does it all for us, we just need to flip the bit. We may do the
updates to often, but it's better than not enough.
Task-Id: 195445
Reviewed-by: Denis
|
| |
| |
| |
| | |
pages, and update with information relevant for Qt 4.6
|
| |\ |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
The check in QPainter::checkEmulation was just plain wrong.
Reviewed-By: Eskil
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h
src/3rdparty/webkit/WebCore/page/DragController.cpp
src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
src/gui/painting/qpaintengineex_p.h
tools/linguist/lupdate/main.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
eb3afcbfb4006de4015047555cb256fcde93b954 )
Changes in WebKit since the last update:
++ b/WebCore/ChangeLog
2009-05-27 John Sullivan <sullivan@apple.com>
fixed <rdar://problem/6925482> repro crash in WebCore::DragController::dragExited dropping
bookmarks (at least) over Top Sites (at least)
Reviewed by Kevin Decker
* page/DragController.cpp:
(WebCore::DragController::dragExited):
nil check m_documentUnderMouse and take the "local file" case if it's nil
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Polygonal vector paths may have types==null, in which case this
would have crashed.
Reviewed-by: Eskil
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
1535d41a668e5f74f44ff3aa1313a84d5718d2d7 )
Changes in WebKit since the last update:
++ b/WebCore/ChangeLog
2009-07-23 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Holger Freyther.
Fix crashes with the QObject bindings after garbage collection.
There is one QtInstance per wrapped QObject, and that QtInstance keeps
references to cached JSObjects for slots. When those objects get
deleted due to GC, then they becoming dangling pointers.
When a cached member dies, it is now removed from the QtInstance's
cache.
As we cannot track the lifetime of the children, we have to remove
them from QtInstance alltogether. They are not cached and were
only used for mark(), but we _want_ them to be subject to gc.
* bridge/qt/qt_instance.cpp:
(JSC::Bindings::QtInstance::~QtInstance): Minor coding style cleanup,
use qDeleteAll().
(JSC::Bindings::QtInstance::removeCachedMethod): New function, to
clean m_methods and m_defaultMethod.
(JSC::Bindings::QtInstance::mark): Avoid marking already marked objects.
(JSC::Bindings::QtField::valueFromInstance): Don't save children for
marking.
* bridge/qt/qt_instance.h: Declare removeCachedMethod.
* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::QtRuntimeMethod::~QtRuntimeMethod): Call removeCachedMethod
with this on the instance.
2009-05-04 Jakub Wieczorek <faw217@gmail.com>
Reviewed by Simon Hausmann.
As Qtish implementation of MIMETypeRegistry::getMIMETypeForExtension()
returns the application/octet-stream mimetype when it can't associate
extension with any mimetype, it can happen that the application/octet-stream
mimetype will hit the list of supported image formats. For instance,
it is possible when QImageReader or QImageWriter support an extension
that is not in the extensions map.
Make sure that this mimetype is not treated as displayable image type.
* platform/MIMETypeRegistry.cpp:
(WebCore::initializeSupportedImageMIMETypes):
(WebCore::initializeSupportedImageMIMETypesForEncoding):
++ b/WebKit/qt/ChangeLog
2009-07-23 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Holger Freyther.
Added a testcase to verify that cached methods in the QOBject bindings
remain alife even after garbage collection.
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::protectBindingsRuntimeObjectsFromCollector):
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The reason being that there was an assumption that any non-curved path
was a continous polyline. For paths with multiple subpaths in it
we need to split this up into multiple strokePolygonCosmetic calls.
Task-number: 257621
Reviewed-by: Kim Motoyoshi Kalland
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We normally pad the clip rect with the size of the pen and miterlimit
to avoid this, but this didn't handle the case where there was a long
diagonal dash. We also need to multiply the padding with the longest
dash.
Reviewed-By: Tom Cooksey
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is a huge impact on performance whenever this path is
taken.
Reviewed-By: Tom Cooksey
|