| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
dist/changes-4.6.1
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When setting the range, the actual value precision was lost because the min
and max were saved after being formatted to the current precison (decimals
property), thus losing information. We now keep the user original values, and
use these whenever the decimals property is changed. Auto-test included.
Reviewed-by: leo
Task-number: QTBUG-6496
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
It turns out that some of the code executed when synching then menu
bar was already implemented in the function that clears the menu bar.
So this patch makes the code a bit more compact, avoiding implementing
the same code twize.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
In Qt, we allow the menu bar to be enabled if we only have one
exec-ing dialog on screen. That way you can reach the quit menu item to
close down the application. But in order for this to work, some overhaul
of qmenu_mac.mm was need to teach it these rules.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When creating a single dialog in the main function, and tell it
to exec, we run a modal dialog. But there is really no other
window on screen to be modal for. So in that case, since this is
a rather common pattern for Qt applications, we allow users to
quit the application from the dock. But this action is sendt as
an apple event. And and that point in time, cocoa has the the
apple event handler, and refuses to close down the application
because it detects a modal window.
Our solution is to install/overwrite the apple event handler for
kAEQuit _after_ cocoa has finished its own installation. But in
order to do this, we need to wait until [NSApplication run] has
started, otherwise it will not take effect. And that is what this
patch essentially does.
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
...
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-7133
|
| | |/
| |
| |
| | |
Task-number: QTBUG-6992
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
The signal was being emitted both from the carbon event handler and the
platform independent code of QMenu. The one in the event handler is now
removed.
Task-number: 6741
Reviewed-by: Richard Moe Gustavsen
|
| | |
| |
| |
| | |
(Constructors and destructors are not called.)
|
| |\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/fancybrowser/main.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/bookmarkmanager.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( de77f8ee69c434bde9306c8f407ee2e443a00188 )
Drag and drop icon not updated correctly in Cocoa.
Adding missing file.
Warn when calling QFileInfo::absolutePath() on an improper object.
update harfbuzz to 2b78f0d78ad3075fd1657d1260b31219e1a5155
Fixing a problem with xmlpatterns, where code from tools/xmlpatterns was being included by src/xmlpatterns.
Fix for WinCE compilation of QAbstractSpinBox.
|
| | | | |
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently non-touch devices lose edit focus if window switch
happens. I.e. in cases when screensaver activates, an incoming call
occurs, a global notification is shown...
With this fix, edit focus remain active, until user removes the
focus explicitly.
Task-number: 4792
Reviewed-by: axis
|
| | |
| |
| |
| | |
Reviewed-by: TrustMe
|
| | |
| |
| |
| | |
RevBy: Friedemann Kleint
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The mac stlye disables the blinking cursor when there is a selection in
the line edit. The cursor is not shown back when this selection is
removed (either by mouse or key press events).
This patch watches the selection changed signal from the line control
and updates the cursor status accordingly.
Task-number: QTBUG-6378
Reviewed-by: Olivier Goffart
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The hash and the list which stores the references are already cleared
by the delegate function toolbarDidRemoveItem: There is no need to
remove them manually after a call to [NSToolbar removeItemAtIndex].
Task-number: QTBUG-6200
Reviewed-by: Richard Moe Gustavsen
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: (31 commits)
Fixed qstylesheetstyle benchmark for Symbian
Fixed qdiriterator benchmark for Symbian
Fixed events benchmark postEvent function
Fix for QTBUG-4908 SVG transparency rendering problem.
Long informative texts causes messagebox to grow outside of screen area
qreal-ization
qreal-ization
qreal-ization
QS60Style: Remove layouts with mirrored information
Fixed qgraphicsview autotest build for winscw.
Enabled input method update code for all platforms.
(ODBC) Fixes segfault when error string is larger than 256 chars.
Fixed QGraphicsView benchmark for Symbian.
FEP indicator shown in status pane when it should not
Skipped the most memory intensive tests in QByteArray benchmark.
qreal-ization
qreal-ization
QS60Style: Theme graphics for QSlider in 3.1
QS60Style: Groove changes caused build break of S60 3.1
Slow spinbox on N95 when using keys Up/Down
...
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/s60installs/bwins/QtGuiu.def
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Using math wrapper functions instead direct call. This gives us top-level
control to what (single/double) precision we are effectively using.
Task-number: QTBUG-4894
Reviewed-by: janarve
Reviewed-by: Kim Motoyoshi Kalland
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
These don't have to be platform specific.
RevBy: Trust me
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When selection was deleted, the changes where not updated on virtual
keyboard. Added new connection to notify when text has changed.
Task-number: QTBUG-4847
Reviewed-by: Markku Luukkainen
Merge-request: 2149
Signed-off-by: axis <qt-info@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
FEP indicator is shown in few cases in statusbar when it should not be.
Case a)
Application contains item view.
QAbstractItemView is initialized as having WA_InputMethodEnabled on,
irregardless of functionality of each separate cell. So we need
to check the model for the itemview cell about to receive focus,
is it editable. If it isn't then, we'll set the WA_InputMethodEnabled
as false.
This will fix the FEP indicators in a lot of cases: lists with cells,
empty lists, combobox lists, ...
Case b)
Combobox also initializes itself with WA_InputMethodEnabled active.
Even if the fix a) fixed the list inside combobox, the widget itself
when receiving focus needs also fixing. If we check the editable
flag of combobox when initializing the comment, we can set the
flag off.
Task-number: QTBUG-5705
Reviewed-by: axis
|
| | | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
In the style demo, spinbox widget, we noticed that to go from 0 to 99
, with key Up, takes 35 seconds. This was too slow.
It turned out that no acceleration has been implementd when using
keyboard, although acceleration works when mouse used.
We fixed this by using timer events, as it is the case for mouse events.
We also needed to get what is the keyboard repat rate interval from system.
This value is used to set timer intervals in more natural way.
Task-number: QT-927
Reviewed-by: janarve
|
| | |\ \ \ \
| | | |_|/
| | |/| | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
With Qt Creator, we could reproduce scrolling problems when paragraphs
were folded away. Effectively the first "visible" block could be an
invisible one, resulting in firstVisibleBlock() returning something bogus.
The result were drawing errors.
Reviewed-by: con
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The focus frame on mac is a separate widget. The parent of the focus
frame is same as the parent of the widget who has the focus. So if
there is not enough room for a focus frame between the parent and
the widget, it gets clipped to the parent.
This parent is now changed to the nearest (in hierarchy) top level,
toolbar or scrollarea-viewport. A clip area is set on the focus
frame widget based on the visible region of the widget. This
reduces the chances of having clipped focus frames. It is always
better to leave enough margin for widgets which shows focus frames.
Task-number: 6567
Reviewed-by: Richard Moe Gustavsen
Reviewed-by: Jan-Arve
|
| |\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/network/access/qnetworkrequest.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
the focus.
The lineedit has the focus because it becomes focusproxy of the QComboBox.
But the focusInEvent is not called because the combobox has already
the focus when setFocusProxy is called.
Workaround that in the show event.
Task-number: QTBUG-1949
Reviewed-by: Thierry
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If you were selcting the prefix and entering a digit the cursor position
would not be updated correctly
Task-number: QTBUG-6670
Reviewed-by: ogoffart
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It could happen that they grow much more than the movement of the mouse
Task-number: QTBUG-6499
Reviewed-by: gabi
|
| | | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | | |
uses of QT_DEPRECATED must be protected by #ifdef
Task-number: QTBUG-6649
Reviewed-by: João Abecasis
|
| | |\ \ \
| | |/ /
| |/| /
| | |/ |
|
| | | |\
| | | |
| | | |
| | | | |
4.6-staging2
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In Qt invisible actions are disabled by default, and our "Options"
softkey is set to invisible in order that it is not show in context menu.
Thus we need don't want to dim in softkey even it is disabled.
Additionally, QDialogButtonEnabledProxy need to set the initial enabled
state for proxy action from button.
Fixes bugs in commit: 245c9cc0
Reviewed-by: TrustMe
|
| | | | | |
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The gap could be inserted even if the toolbar is very far away.
This is due to the fact that we were only considering the distance
as 1-directional. Now we also check that mouse position is inside
the main window.
Reviewed-by: gabi
|
| | | |\
| | | |
| | | |
| | | | |
4.6-staging2
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If QAction::setEnabled(false) is called, the CBA buttons are dimmed
to have visual indication about disabled state.
Since enabled/disabled state of buttons in QDialogButtonBox is
controlled via QPushButton::setEnabled API, and because button box
content in Symbian is mapped to sofkkeys we also need to have proxy
for button enabled state to forward the information for underlying
QAction.
Reviewed-by: Sami Merila
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When the menu is populated that late, if the menu is to go off-screen,
then it is moved and ends up covering its originating button.
Includes some code cleanup thanks to Thierry's tips.
Reviewed-by: Gabriel
Reviewed-by: Thierry
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-6529
Reviewed-by: Gabi
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
With Qt Creator, we could reproduce scrolling problems when paragraphs
were folded away. Effectively the first "visible" block could be an
invisible one, resulting in firstVisibleBlock() returning something bogus.
The result were drawing errors.
Reviewed-by: con
|
