| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added .condition modifier to SUBDIRS.
Added orientation change support for show/showNormal widgets in S60.
Added fullscreen support to softkeys in Symbian.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In Symbian, it is now possible to set certain subdirs to be built
only when specified define is true when bld.inf is parsed.
For example, compile a subdir only when building for emulator:
SUBDIRS += winscw_lib
winscw_lib.condition = WINSCW
Also improved SUBDIRS variable documentation; the modifiers were
completely undocumented.
Task-number: QT-3017
Reviewed-by: axis
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Earlier the widget normalGeometry was calculated once when widget was
made visible first time. Because geometry was not recalculated
the widget displayed with show/showNormal did not change its location
or size as a result of orientation change. This lead to unefficient
screen usage.
This commit makes widget to recalculate its normalGeometry as a result
of orientation change, if developer has not set the widget position or
size explicitly.
Task-number: QTBUG-8551
Reviewed-by: Jason Barron
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit enables the following two features:
1. Developer can make softkeys visible in fullscreen widget by setting
the Qt::WindowSoftkeysVisibleHint window flag. This flag implememts
intermediate mode for maximized and fullscreen modes. In maximized mode
both statuspane and softkeys are visible, in fullscreen mode with
WindowSoftkeysVisibleHint flag, only the softkeys are visible and
in normal fullscreen mode both statuspane and softkeys are invisible.
This feature was requested by QTBUG-5171.
2. Developer can make softkeys to respond to the key events even the
softkeys are invisible. This means that when widget with
Qt::WindowSoftkeysRespondHint window flag is shown in fullsreen, the
softkey HW key events are routed to invisible softkeys and softkeys
trigger the action associated to pressed softkey button. If the flag
is not set, the key event will be passed to application/focused widget
normally and softkey actions are not triggered. This feature was
requested in QTBUG-4564.
Both new flags are by default off.
In addition, the softkey example is updated to demonstrate the new
window flags. The commit also contains some code style fixes applied by
my editor automatically to changed files.
Task-number: QTBUG-5171
Task-number: QTBUG-4564
Reviewed-by: Jason Barron
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Preparation to enable OpenGLES 2.0 for Windows Mobile.
Test modifications for the Windows Mobile platform.
QAbstractItemView::setIndexWidget: remove the old widget from the QSet of persistent editors
Fixed qgl autotest failures on Maemo.
Skip complex FBO tests if combined depth-stencil isn't supported
|
| |
| |
| |
| |
| |
| | |
As there are no SDKs available for our test device (HTC HD2) that support
OpenGL, we had to construct the libraries by extracting them from the ROM image.
This is still work in progress at this time.
|
| |
| |
| |
| |
| |
| | |
Test were changed to run in reasonable time on Windows Mobile.
Also some test were skipped for instance those using OpenGL.
OpenGL support for Windows Mobile is a forthcoming feature.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QAbstractItemView::setIndexWidget: remove the old widget from the QSet of persistent editors
Fixed qgl autotest failures on Maemo.
Skip complex FBO tests if combined depth-stencil isn't supported
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
persistent editors
Task-number: QTBUG-8422
Reviewed-by: Thierry
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Changed glFBOSimpleRendering and glFBOUseInGLWidget auto tests
to use NPOT sizes. NPOT FBOs are not twiddled, and thus not exposed
to the twiddled glReadPixels() bug in the current drivers.
Skipped glWidgetRenderPixmap as renderPixmap() is not supported under
EGL currently.
Reviewed-by: Tom Cooksey
|
| | |
| | |
| | |
| | | |
Reviewed-By: Trond Kjernåsen
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Symbian file system use optimisation for stat and symlinks
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Symbian implementation of fileFlags calls both doStat and isSymlink
resulting in calls to both stat and lstat. However most of the time,
ie when accessing a normal file rather than a symlink, lstat gives all
the information we require. So this change uses lstat where possible,
and caches its result for both doStat and isSymlink.
During start of DesktopServices app, this cuts calls to stat/lstat by
45%.
Reviewed-by: Shane Kearns
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Crash when dragging an empty URL-list.
Fixed autotest tst_QWidget::translucentWidget() on Windows Vista & above
Remove unwanted code after c027f0ae1967ec1d64cb2c9679c8b57f18faf7f5
ActiveQt Internet Explorer component causes Desktop Icons to flicker.
|
| |\ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Crash when dragging an empty URL-list.
Fixed autotest tst_QWidget::translucentWidget() on Windows Vista & above
Remove unwanted code after c027f0ae1967ec1d64cb2c9679c8b57f18faf7f5
ActiveQt Internet Explorer component causes Desktop Icons to flicker.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
While converting the mime to native CF_ formats, we need to check the
vaildity of the list.
Task-number: QTBUG-8446
Reviewed-by: Thierry
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Grabbing layered windows doesn't work on Vista and above, so instead we
need to grab the corresponding area of the desktop widget.
Reviewed-by: Samuel
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Remove unwanted code after c027f0ae1967ec1d64cb2c9679c8b57f18faf7f5
ActiveQt Internet Explorer component causes Desktop Icons to flicker.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The LockWindowUpdate() was used to reduce the flicker caused when
calling EnableModeless(). After the above commit, no repaints will be
generated by this code path, so we can remove this call.
Task-number: QTBUG-8355
Reviewed-by: Bradley T. Hughes
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This happens only if IE is embedded in an frameless window. The repaint
caused by calling EnableModeless() is making the desktop icons flicker.
This repaint generated via ActiveQt will be ignored by QtGui. This is
done by checking if the window style is already in the required state
or not.
Task-number: QTBUG-8355
Reviewed-by: Denis
|
|\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
fix "configure -fast" on Windows for other maketools than nmake
|
| |\ \ \ \ \
|/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
fix "configure -fast" on Windows for other maketools than nmake
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-8562
Reviewed-by: ossi
|
|\ \ \ \ \ \
| |_|/ / / /
|/| | | / /
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added addMMPRules for adding conditional MMP_RULES
Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Usage:
# Set conditional libraries
LIB.MARM = "LIBRARY myarm.lib"
LIB.WINSCW = "LIBRARY mywinscw.lib"
LIB.default = "LIBRARY mydefault.lib"
# Set conditional Epoc Heap Size
EHZ.WINSCW = "EPOCHEAPSIZE 0x2000 0x2000000"
EHZ.default = "EPOCHEAPSIZE 0x40000 0x400000"
# Add the conditional MMP rules
MYCONDITIONS = MARM WINSCW
MYVARIABLES = LIB EHZ
addMMPRules(MYCONDITIONS, MYVARIABLES)
This will generate the following in the mmp file:
#if defined(MARM)
LIBRARY myarm.lib
EPOCHEAPSIZE 0x40000 0x400000
#elif defined(WINSCW)
LIBRARY mywinscw.lib
EPOCHEAPSIZE 0x2000 0x2000000
#else
LIBRARY mydefault.lib
EPOCHEAPSIZE 0x40000 0x400000
#endif
Task-number: QT-2909
Reviewed-by: axis
|
|/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It is necessary to specify this variable conditionally sometimes,
which requires use of MMP_RULES, so allowed overriding it without
warning.
Task-number: QT-2909
Reviewed-by: Janne Koskinen
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.
Removed an export that shouldn't be exported.
Reduced the code and memory footprint of the keymap.
Enabled Qt key events to work also when native key code is missing.
Crash in QGraphicsScenePrivate::setFocusItemHelper
Improvements to itemview keypad navigation in S60.
Fix SymbianMakefileGenerator::absolutizePath for clean builds
Misc fixes to FLM files
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
RVCT does not like static inline, and variables should not be defined
in case statement without braces. In this case the temp variable was
actually unnecessary.
Reviewed-By: TrustMe
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Removed an export that shouldn't be exported.
Reduced the code and memory footprint of the keymap.
Enabled Qt key events to work also when native key code is missing.
Crash in QGraphicsScenePrivate::setFocusItemHelper
Improvements to itemview keypad navigation in S60.
Fix SymbianMakefileGenerator::absolutizePath for clean builds
Misc fixes to FLM files
|
| | |\ \ \ \
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Removed an export that shouldn't be exported.
Reduced the code and memory footprint of the keymap.
Enabled Qt key events to work also when native key code is missing.
Crash in QGraphicsScenePrivate::setFocusItemHelper
Improvements to itemview keypad navigation in S60.
Fix SymbianMakefileGenerator::absolutizePath for clean builds
Misc fixes to FLM files
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Removed an export that shouldn't be exported.
Reduced the code and memory footprint of the keymap.
Enabled Qt key events to work also when native key code is missing.
Crash in QGraphicsScenePrivate::setFocusItemHelper
Improvements to itemview keypad navigation in S60.
Fix SymbianMakefileGenerator::absolutizePath for clean builds
Misc fixes to FLM files
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This was done by using a static const data structure instead of a
list.
RevBy: Alessandro Portale
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
If it is missing we base the event on the scan code instead.
RevBy: Alessandro Portale
Signed-off-by: axis <qt-info@nokia.com>
|
| | | | |\ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The logic used in this commit is partially taken from sliders.
This commit makes it possible to interact (change row or column)
in itemview even itemview does not have editFocus. Interacting without
editFocus is enabled when it is not possible to keypad navigate to
reuqested direction. In addition if keypad navigation to any direction is
not possible (i.e there is only one listwidget on screen), there is no
sense to add "done" softkey to get out of edit focus.
Task-number: QTBUG-4802
Reviewed-by: Alessandro Portale
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QFileInfo::isDir() will not return correct value if path doesn't exist
like it doesn't in case of clean builds. Turned the check around
and used isFile() instead. If a file is given as origPath, it is
assumed to exist, because it was explicitly given with HEADERS variable
and qmake will give warning if nonexisted file is given there.
Reviewed-by: Janne Koskinen
|
| | | | | |\ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Misc fixes to FLM files
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
1) FLMs should not have more than one phase dependency -> removed extra
dependencies, leaving only what is actually necessary.
2) -include $(FLMHOME)/metaflm.mk statements vere removed as obsolete
3) Added FORCESUCCESS to startrule call in qmake_extra_pre_targetdep.flm
so that unrelated components can continue building instead of
halting the whole build at EXPORT phase.
4) Added .export to qmake_extra_pre_targetdep interface so that it is
actually executed in EXPORT phase where it should be.
Task-number: QTBUG-8513
Reviewed-by: Janne Koskinen
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
QGraphicsScenePrivate::setFocusItemHelper accesses
views.at(i)->inputContext() without checking if it is null.
This leads to a crash if it really is null.
Fixed by adding a null pointer check.
Task-number: QT-3008
Reviewed-by: axis
|
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | /
| | |_|_|_|_|_|/
| |/| | | | | |
| | | | | | | |
| | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix for cetest.
|
|/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Recent refactorings of qmake caused cetest not to compile.
This patch updates cetest to fix this issue.
|
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Speed up compilation of this test with MSVC.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This test includes a source file which is almost half a megabyte
in size. When compiling with -O2, MSVC2008 can take over 20
minutes to link this test!
Turn off optimization, just for this test.
|
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
New benchmark for QDirIterator
Backporting auto-test utility header from master.
Fix a signed/unsigned comparison compiler warning
Cleaning of the patch to QTBUG-3168
Patch to QTBUG-3168
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Test creates a known directory tree (mimicking the v4.6.0 src/ tree in
the repository) for deep traversal and file search based on the
file names.
Reviewed-by: Olivier Goffart
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Removing trailing whitespace from qurl.cpp
Removing a debug() output from the test.
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|