| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: p1 bug fix: fix auto test regressions
Cocoa: p1 bug fix: revert use of subWindowStacking
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Ref: 32228c4f2b3419a35d1623377050ef72edf73c92
It seems that the change above broke some auto tests, which
revealed a true problem. When it comes to modal dialog, children
still needs to be stacked on top of modal parents, as they the
user cannot use the mouse to raise it. So rather than removing
subWindowStacking fully, we narrow it even further down to
only be used for children of modal dialogs. All in all, this
is close to removing it, but still us it for certain corner cases.
Task-number: QTBUG-11481
Reviewed-by: msorvig
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 3c2373d7ea9bc91bb537c0725984d19ad0fbab01.
After finding yet another bug related to cocoa child windows
(QTBUG-17738), we have no other option than to admit it was a wrong
move to use the API in the first place. Had we only known how many
side-effects and hidden bugs it would introduce. The original problem
we tried to solve were the cases where a stays-on-top parent window
executed a modal child dialog. This child should always stay on top of
its parent, but Cocoa would insist on pushing the window down to the modal
window level upon activating/deactivating the application. Some window
systems will always stack a window child on top of the parent, while
others (X11) seems to be more selective on this issue. On Mac, we already
stack windows a bit differently, thinking first and foremost on tool
windows.
Since this change is going into a patch release (which is debatable,
since this changes behaviour, but p1 is a p1), we choose to add in a
backdoor for those users who by chance depend on this behaviour. Setting
the env var QT_MAC_USE_CHILDWINDOWS=1 will give you the old code
path, but we plan to remove this for Qt-4.8.
Also, this patch does fix the original bug described above by overriding
the setLevel method in NSWindow, and refuse Cocoa to level down
stays-on-top modal windows.
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fixed the declarative headers and includes within qdoc.
Removed invalid public slots section.
Minor feature fix led to refactoring for i18n's sake.
Fixed string-int concatenation issue.
qdoc: Allowed multiple values for certain metadata tags.
qdoc: modified \include to take a 2nd arg, snippet id.
Doc: Minor fix to title.
Doc: Fixed markup.
Doc: Added a missing command.
Doc: Removed duplicate documentation.
Removed some links and prettified others.
Doc: Squashed commit of Roland Wolf's threading tutorial.
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Also output mainters for classes in the HTML output,
if there are maintainers listed.
|
| | |\ \ \ |
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Not possible to enter negative values to widgets with numeric fields
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Currently it is not possible to enter negative number to QSpinBox (or
to any other QWidget which is handling numeric input only) in touch
devices. This is due to that AVKON virtual keyboards have
negative sign (-) in special character table(s) and it is not
accessible by default from QWidgets, unless you define widget's input
hints as ImhFormattedNumbersOnly AND ImhDialableCharactersOnly
(or non-numeric).
With this fix, default special character table is added for widgets
with numeric input mode AND either ImhFormattedNumbersOnly or
ImhDialableCharactersOnly.
By default user is still unable to enter nagative values to QSpinBox,
but developer can set inputMethodHint to work around the issue:
widget->setInputMethodHints(Qt::ImhFormattedNumbersOnly);
Task-number: QTBUG-17461
Reviewed-by: Miikka Heikkinen
|
| |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Mac: p2 combobox regression fix
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The combobox popup on mac fails to re-highlight the last item in the
list when then mouse leaves the popup, and re-enter. We tried to fix
this in 780b4d84, but is turned out to break the cleanlooks style.
For this second try, we allow the code to set the index under mouse
when the mouse hovers an item in the list, even if the index is
current. It seems to cause low overhead, and should be safe.
Task-number: QTBUG-17738
Reviewed-by: jbache
|
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QGradient stop with NaN position on Symbian.
Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not needed
QApplication does not define flag for "single touch"
Native dialog softkeys are covered by QApplication softkeys
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The qbrush autotest was failing on Symbian, because gradient stops
with NaN position cannot be inserted on Symbian. This is caused by
the pos > 1 || pos < 0 check in setColorAt() which is incorrect
on ARM as NaN > 1 will evaluate to true.
Task-number: QTBUG-17874
Reviewed-by: Samuel Rødal
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Qt application was previously not setting a native framework's flag to
indicate that is supports "single touch" (i.e. activating an item would
only need one tap, instead of one tap to highlight and another to
activate) for Sym^3.
This was causing the native dialogs launched from within the
application to behave as Sym^1 dialogs.
As a fix, set the native flag when running Qt in Sym^3.
Task-number: QT-4569
Reviewed-by: Jani Hautakangas
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Dialog softkeys are covered by Qt Application's Softkeys
Updating softkeys while showing a native dialog, pushes Qt application CBA
on top of dialog CBA. Therefore, native dialog can not be dismissed.
As a workaround, when gaining focus to a window, do not update application
softkeys, if there is a native dialog shown.
Task-number: QTBUG-18486
Reviewed-by: mread
|
| |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: p1 bugfix, add widget flag MacNoCocoaChildWindow
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This problem has been known for a long time, but a good solution has
never been found. The problem is that a child window should always
stay on top of it's parent, if not for anything else than secure that
a modal child does not block input while hiding behind the parent at
the same time. The only sensible solution found to ensure this in the
Cocoa port is to use Cocoa child windows. But this API has a sad side
effect; it will move the child along with the parent when the parent
is moved on screen. This is something it seems we have to live with.
But for those users that wants to handle this issue otherwise, we now
add a widget flag to switch this off.
Task-number: QTBUG-11481
Reviewed-by: msorvig
|
| |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (45 commits)
Removed mobile demos from the Symbian build in demos.pro
Fixed demo subdirs for mobile examples.
qdoc: Updates to the qdoc manual.
Moved a couple of links into one list.
Doc: Work on GettingStartedQt tutorial
Added a link to the Debugging Techniques article.
qdoc: Updates to the qdoc manual.
qdoc: Added a way to exclude directories from receiving default metadata
Edited the Tutorials and Examples pages. Renamed links in index.qdoc.
Doc: Update to QStyledItemDelegate::displayText()
qdoc: Added default values to config file for DITA
Doc: Work on QAudioInput::start() functions.
Avoided the use of hard-coded file names.
Copied the declarative parser into qdoc3 to avoid dependency issues.
qdoc: Don't wrap <image> in <fig> if in an <xref>
Doc: Work on a11y docs
qdoc: Added <copyright>, <copyryear>, and <copyrholder>.
qdoc: Completed metadata handling.
Doc: Small update to QImageReader/Writer::supportedImageFomrmats()
Edited QtWebKit Guide qdoc and added external links.
...
|
| | |\ \ \ \ \ |
|
| | |\ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| | |\ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ |
|
| | | | |_|_|_|_|/
| | | |/| | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Also added the handling of these default values:
dita.metadata.default.author = Qt Development Frameworks
dita.metadata.default.permissions = all
dita.metadata.default.publisher = Nokia
dita.metadata.default.copyryear = 2011
dita.metadata.default.copyrholder = Nokia
dita.metadata.default.audience = programmer
|
| | |/ / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-7567
|
| | |\ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ |
|
| | | | |\ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
doc/src/examples/qml-examples.qdoc
|
| | | |/ / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Task-number: QTBUG-14440
|
| | |/ / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
But not the default values part in the config file.
|
| |\ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/
| | |/| | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add the auto detection for OpenGL in configure for makefile build system on Symbian.
Don't display softkeys/statusbar on FS childs of non-FS windows
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Fullscreen child windows of non-fullscreen main application window
displayed softkeys and status bar when they shouldn't. Fixed it so that
fullscreen windows never display these items (except for softkeys when
explicitly specified to do so.)
Task-number: QTTH-1207
Reviewed-by: Sami Merila
|
| |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Manually amend latin1 change
QGraphicsItem::ItemStops[ClickFocusProgration|FocusHandling] must not interfer with touch event propagation
suppress warnings about ASCII to QString conversion
take the user defined temp dir into account
Compilation break in MSVC2008 and MSVC2005
Remove useless LFLAGS
Add docs for QNetworkConfigurationManager's time-consuming constructor.
rebuild configure
fix configure.exe option -opengl desktop
use mkdir -p for mingw+sh
Ensure the right font is used for rendering text on Mac
QDirIterator returns hidden directories when it should only return files
Update Polish translations
L10n: Update German translations.
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
The result of QLatin1String + QLatin1String is a QStringBuilder object,
not a QString. Fall back to QString.arg(). Patch by Ritt Konstantin.
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
interfer with touch event propagation
Both flags are only supposed to affect focus handling but not the regular touch
event propagation. In this case, touch begin events were not propagated to any
item beneath the one carrying those flags.
Merge-request: 2588
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
and optimize macroses to use string literal concatenation instead of .arg()
Merge-request: 1038
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
use user's QT_QWS_TEMP_DIR rather than hardcoded "/tmp" one
Merge-request: 1038
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |\ \ \ \ \ \ \ \
| | | | |_|_|_|_|/ /
| | | |/| | | | | | |
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
When ATSFontGetName() did not set name to the font name then it would
cause Qt to fall back to a font that was not the right one. Therefore
calling ATSFontFamilyGetName() in this case will help ensure it gets the
right font.
Reviewed-by: Jiang
|
|\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fixed compilation of qpixmap_raster.cpp
Draw graphics item bounding rects drawn when QT_DRAW_SCENE_ITEM_RECTS=1
Put all the declarations of qt_defaultDpi{,X,Y}() in one place
Really avoid compiler warnings on Windows
Made extension resolving work with Core profile.
Avoid some compiler warnings on Windows
Fix positioning in GL2 paint engine with subpixel antialiasing
Update defs files
Doc: Updating 3rdparty license doc
Update .def files
Another compilation fix for WinCE
Updating libjpeg: Add Qt building modifications
Updating libjpeg: Add version 8c.
Updating libjpeg: Removing libjpeg version 8
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
qfont_p.h indirectly includes qdebug.h, which must be included before
any X11 headers (as they define Status).
Reviewed-by: Jiang Jiang
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
It is extremely handy to visualize bounding rects when developing pixel
perfect graphics view based applications. This change makes it possible
to define an environment variable (inspired by QT_FLUSH_PAINT) to enable
drawing of graphics items' bounding rects with random colors. Any
graphics view/declarative example can be used to test the feature.
Merge-request: 981
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Reviewed-by: Samuel Rødal
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
In this case we will use QTextureGlyphCache with FreeType renderer,
which requires the subpixel positition to get correct left bearings,
thus alphaMapBoundingBox is extended to support subPixelPosition.
In QFontEngineFT we also simplify the code a bit by reusing
loadGlyphs for metrics calculation instead of duplicate code. Since
we need to use the glyphs after all, cache them here in
alphaMapBoundingBox shouldn't be a problem.
Reviewed-by: Eskil
|
|\ \ \ \ \ \ \ \ \ \ \ |
|
| |\ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / /
| |/| | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add branch prediction macros
Add methods for traversing and combining QProcessEnvironment.
Handle the HTTP 418 reply properly in QNAM
absorb translations.pri into translations.pro
let generated flag control SQL generation
Add version attributes as per ODF specification
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Merge-request: 1120
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
|
| |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (237 commits)
Fix animation tests after merge
Remove duplicated test.
Add missing test file.
Changing width of RTL positioner doesn't relayout
Fix TextInput auto test failure on mac.
PinchArea and Flickable don't work well enough together
Do not set focus unnecessarily at window activation in Symbian
QS60Style: Regression in drawing dialog background
QS60Style: Support menu separator (pt.2)
Fix auto test failure.
Support for new softkey in Symbian^3
Once Image sourceSize is set there is no way to clear it.
Rotation transform with NaN angle can cause crash
QSoftkeyManager auto test update
Fixed not switching to MeeGo graphicssystem.
Canceling image download while reading causes crash
Fix width of TextInput micro focus rectangle.
Return correct boundaries reasons from QTextBoundaryFinder.
GridView jumps to beginning of list when resized
Fixed rounding of coordinates pre-transformation in CG paintengine.
...
|