| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
| |
The problem here is caused by a boolean flag used to prevent recursion.
The flag was set and never reset. This patch resets the flag the moment
open is called.
Task-number: QTBUG-7825
Reviewed-by: Richard Moe Gustavsen
|
| |
|
|
|
|
| |
Forgot to add some #ifdef's.
Reviewed-by: Richard Moe Gustavsen
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QFontDialog::exec() never returns on OSX
QNetworkRequest: Doc enhancement
Port http example to QNetworkAccessManager
loopback network example: Make use of bytesToWrite()
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
The problem is the fact that this dialog is never meant to be used this
way. Instead it should be called through the static function ::getFont(...).
I reimplemented this code path and made sure that this works.
Task-number: QTBUG-7769
Reviewed-by: Richard Moe Gustavsen
|
| |/
|
|
|
|
|
|
|
|
|
|
| |
QColorDialog creates own instance of S60Data and fetches touch support
value from that. Unfortunately, newly created S60Data is populated
with default values that claim no support for touch.
As a fix, QColorDialog uses the global variable "S60" to fetch touch
support information.
Task-number: QTBUG-8322
Reviewed-by: Shane Kearns
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix crash in Phonon::DS9 backend
Don't crash when running Qt on KDE with Oxygen style.
Fixes missing update when setting opacity on an item that had opacity 0.0
Avoids missing opacity updates by not propagating the ignoreOpacity flag
Cleanup in graphicsitem autotest
Adds convenience functions QGraphicsItemPrivate::isOpacityNull
Fixed a crash when QPixmaps are destroyed after the ~QApplication.
Fix GL texture leaks when pixmaps are deleted
Doc fix. No need to put something deprecated if it's not.
Warn if the plugin seems to not exist instead of simply passing.
|
| | |
| |
| |
| | |
Reviewed-by:TrustMe
|
| |/
|
|
|
|
|
|
| |
should be documented as QT3 support member
Task-number: QTBUG-7786
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (23 commits)
Implement QDirectFBPixmapData::scroll
Potential crash when adding items from QGraphicsWidget::polishEvent().
QGraphicsWidget is painted twice on the inital show.
Fix QPainter::redirection() to pass autotest.
Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.
revert parts of 10392eef4fd4f9
Fix y-inverted pixmaps properly.
Fix rendering with simple shader in GL2 engine
removed a debug trace
Fix documentation bug in QColor
Don't use a mutex lock in QPainter::redirection unless strictly required
Only send QGraphicsItem::ParentChange(d) notifications from setParentItem.
Pass value as const void *const to QGraphicsSceneIndex::itemChange.
Optimize QGraphicsItem::setFlags.
Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helper
Improve performance of QGraphicsItem::setParentItem.
Make sure cursor is painted at the correct position when we are using IM.
Purely cosmetic (formatting) changes to GL2 engine's GLSL
Use an attribute value for the PMV matrix rather than a uniform
Remove unnecessary depth uniform from GL2 engine's GLSL
...
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Modal Mac/Carbon dialogs do not have the close, minimize and resize
window title buttons enabled, which makes it very hard to close modal
dialogs.
Task-number: QTBUG-7481
Reviewed-by: Kim
|
| | |
| |
| |
| | |
Reviewed-by: Sami Merila
|
| |/
|
|
|
|
|
| |
If Avkon components support transparency then dialog background is transparent
enabling rounded corners.
Reviewed-by: Sami Merila
|
| |
|
|
| |
Reviewed-By: Jason Barron
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QFileDialog shows a customized version of the native file dialog
on Mac. When user changes the fileMode, the corresponding
options needs to be updated in the native dialog as well. Some
options like mode, filters, button text, dialog title etc needs
to be updated for this.
This patch also address the changing of 'acceptMode'. When user
changes this, for e.g. the native dialog needs to switch from an
open panel to save panel. It is easier to recreate the internal
QNSOpenSavePanelDelegate than changing options individually.
Task-number: QTBUG-7086
Reviewed-by: Richard Moe Gustavsen
|
| |
|
|
|
|
|
|
| |
... to display the extra text content. This works well on Maemo
and on S60, and has the added benefit that external URLs (like in
aboutQt) are opened correctly.
Reviewed-By: Jason Barron
|
| |\
| |
| |
| |
| | |
Conflicts:
dist/changes-4.6.1
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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 )
...
|
| | | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/multimedia/audio/qaudioformat.cpp
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Completing under the root directory was "eating" the first letter. On
windows under C:\ the completion was not working at all.
Task-number: QTBUG-4933
Reviewed-by:janarve
Reviewed-by:gabi
|
| | |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is purely an optimization for fullscreen-only apps.
Task: QTBUG-6098
RevBy: Jason Barron
RevBy: mread
AutoTest: Included
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
examples/multimedia/audiodevices/audiodevices.cpp
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (42 commits)
QBoxLayout::setGeometry would not respect the widget min/max width
Revert "QStyleSheetStyle: Fixed some text croped when having padding with native border."
Use QFile:rename when moving items in QFileystemModel.
Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"
Fix default filter selection when using HideNameFilterDetails option.
Don't write out fo:word-spacing if its the default value.
Improved initial startup time for a QGLWidget ontop of EGL/X11.
Document the QGraphicsView::IndirectPainting flag
Display broken symlinks in the filesystem model.
Fix typo in autotest testcase name.
Fixed a bug with distribution of spans.
Make unit test more robust
Compile with QT_NO_DOCKWIDGET
Removed temporary QGLWidget created during QGLWidget/X11 initialization.
Fix test: The bug is now fixed
Fix auto-test failure on Windows
QScript: Lookup the native setter from the prototype
Implement QScript::QObjectDelegate::getOwnPropertyDescriptor
fix compilation in GL2 paint engine for Windows
Move QGLTextureGlyphCache into it's own file
...
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We got for free the recursive move if the directory that we move has
subdirectories. Unfortunately copying a directory to an another is
not easy in Qt so the copy still doesn't work if the directory contains
directories.
Task-number:QTBUG-5855
Reviewed-by:ogoffart
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When you have HideNameFilterDetails on, comparing the default filter
given in parameter for selectNameFilter has to be done with the striped
version of the filter, i.e. without the details.
Task-number:QTBUG-4842
Reviewed-by:gabriel
Reviewed-by:olivier
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
A broken symlink has a -1 size so we need to special case that.
Task-number:QTBUG-7119
Reviewed-by:olivier
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
This option was simply not implemented at all so it didn't work.
Task-number:QTBUG-6558
Reviewed-by:ogoffart
|
| | |/
| |
| |
| |
| |
| |
| | |
I removed a line as an optimization a while ago. Luckily, the
autotest cought a failure doing so. So we put the line back in.
Reviewed-by: Prasanth
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Added discussion on connecting signals that have default arg values.
Stack overflow when closing a Color panel in Cocoa.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The QCocoaColorPanelDelegate was going into an infinite recrusion in this
particular case. The patch guards the delegate from calling accept() or
reject() more than once.
Task-number: QTBUG-6636
Reviewed-by: Richard Moe Gustavsen
|
| | |\ \
| | |/ |
|
| | | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/macx-g++40/qplatformdefs.h
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
[NSFontManager setTarget] is not available on 10.4.
Rev-by: Richard Moe Gustavsen
|
| | |\ \ \
| | |/ / |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Currently if we launch QMessageBox::aboutQt(), the dialog grows
too large to fit into any kind of device display.
To fix this, we have added a QTextEdit instead of QLabel into
QMessageBox. QTextEdit automatically adds scrollbars to its content,
if the text won't fit into the designated area.
This change causes error QTBUG-6853. This is due to that QTextEdit
does not support activating external links.
Task-number: QTBUG-3232
Reviewed-by: Alessandro Portale
|
| | |/ /
|/| |
| | |
| | | |
Reviewed-by: Rhys Weatherley
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qfontdialog_mac.mm needs to handle exceptions thrown by Cocoa,
even if Qt is configured with if -no-exceptions.
This ads a bit of qmake logic for the benefit of a single file,
but I would like to keep -no-exceptions working. The savings
are significant (around 10-15%).
Revby: Richard Moe Gustavsen
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The crash occured since d->cancelAction is child of d->cancelButton,
which is essentially same as d->cancel pointer. Due to parent/child
relationship, deleting d->cancel deleted also chilren including
cancelAction. Then explicitly deleting already deleted
d->cancelAction (dangling pointer) caused KERN-EXEC 3 crash.
There is no need to delete d->cancelAction since it is deleted via
parent/child relationship.
Task-number: QTBUG-6109
Reviewed-by: Miikka Heikkinen
|
| |\ \ \ |
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: denis
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If you passed in a QFont with a family name that did not resolve to
QFontDialog::getFont(), it would not select any font in the panel,
and it would always return the default font, regardless of what you
actually selected in the dialog. This was because it would try to
resolve the requested family name, rather than the actual family name
of the initial font. That in turn caused the NSFont* returned by the
system to be null, which, when set on the font manager, caused the
manager to always return 0 for selectedFont.
Task-number: QTBUG-6071
Reviewed-by: Trond
|
| | | |
| | |
| | |
| | |
| | |
| | | |
The line removed in the patch is done so as a result of
change 639b9c0286f0f2d5e50121df8d4125f029074510. That change
made the interrupt do an extra round in the event dispatcher.
|
| | | |
| | |
| | |
| | | |
Over src/ tools/ examples/ and demos/
|
| | | |
| | |
| | |
| | | |
Reviewed-by: prasanth
|
| |\ \ \ |
|
| | |\ \ \ |
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/painting/qblendfunctions.cpp
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Basically, QFileDialog on Desktop performs heavy event handling tweaks
on the lineedit and listview to make them ultra keyboard friendly.
We added many "anti"-hacks for Keypadnavigation to restore the native
behavior of the widgets. The result is pure unmaintainability.
(I admit that most of these "anti"-hacks were my fault, since I
participated in some and reviewed all of them)
This commit has results in the same native behavior for Keypad
navigation but without having the #ifdefs inside the event handling
switches.
Only one of these switch-#ifdefs was there before and still is.
embeddedlinux and wince should still be fine and without unintended
behavioural changes compared to Qt 4.5, since the
Qt::NavigationModeKeypadTabOrder case stays unchanged.
Reviewed-by: axis
Reviewed-by: Sami Merila
modified: src/gui/dialogs/qfiledialog.cpp
|
| |\ \ \ \ \ \
| | |_|/ / /
| |/| | | |
| | | | | |
| | | | | | |
Conflicts:
dist/changes-4.6.0
|
