| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix autotest on windows
Test for absent qmldir
Allow objectName to be used in QML bindings
Install the declarative objectNameChanged callback
Don't give focus to a FocusScope that has had focus explicitly cleared.
Add a declarative callback for when a QObject's objectName changes
Ensure GridView header is visible at the top of the view.
Allow aliases to value type properties
Image.sourceSize is incorrect after changing Image.source
Test for QTBUG-13685
Don't forward keys to invisible items.
Disable Text {} image caching by default
Check plugin and QML file case on Mac and Windows
Add test for QTBUG-14279
Ensure that onRelease is called for doubleClick events.
emit currentSectionChanged when section changes in ListView.
Remove some unnecessary includes in cpp files
Ensure Flickable.contentX and Flickable.contentY return correct values.
Don't allow multiple values to be assigned to a singular property
Fix dragging items within a PathView
|
| | | | |
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-13051
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-13999
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-13999
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
If focus was explicitly cleared on a non-visible FocusScope, and then it
was made visible, it would incorrectly grab focus.
Task-number: QTBUG-13380
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-13999
Reviewed-by: Martin Jones
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Ensure GridView header is visible at the top of the view.
Allow aliases to value type properties
Image.sourceSize is incorrect after changing Image.source
Test for QTBUG-13685
Don't forward keys to invisible items.
Disable Text {} image caching by default
Check plugin and QML file case on Mac and Windows
Add test for QTBUG-14279
Ensure that onRelease is called for doubleClick events.
emit currentSectionChanged when section changes in ListView.
Remove some unnecessary includes in cpp files
Ensure Flickable.contentX and Flickable.contentY return correct values.
Don't allow multiple values to be assigned to a singular property
Fix dragging items within a PathView
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Ensure GridView header is visible at the top of the view.
Allow aliases to value type properties
Image.sourceSize is incorrect after changing Image.source
Test for QTBUG-13685
Don't forward keys to invisible items.
Disable Text {} image caching by default
Check plugin and QML file case on Mac and Windows
Add test for QTBUG-14279
Ensure that onRelease is called for doubleClick events.
emit currentSectionChanged when section changes in ListView.
Remove some unnecessary includes in cpp files
Ensure Flickable.contentX and Flickable.contentY return correct values.
Don't allow multiple values to be assigned to a singular property
Fix dragging items within a PathView
|
| | | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Ensure GridView header is visible at the top of the view.
Allow aliases to value type properties
Image.sourceSize is incorrect after changing Image.source
Test for QTBUG-13685
Don't forward keys to invisible items.
Disable Text {} image caching by default
Check plugin and QML file case on Mac and Windows
Add test for QTBUG-14279
Ensure that onRelease is called for doubleClick events.
emit currentSectionChanged when section changes in ListView.
Remove some unnecessary includes in cpp files
Ensure Flickable.contentX and Flickable.contentY return correct values.
Don't allow multiple values to be assigned to a singular property
Fix dragging items within a PathView
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Making the hybrid allocator change compatible across all 4.7.x
Spectrum demo: only use --rpath for linux-g++* mkspecs
Spectrum demo: put binaries into correct locations on Windows
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The hybrid allocator introduced a new export to qtcore.dll and made
all apps link to it when they linked with the corresponding qtmain.lib.
However, this made all apps depend on this new export, and since that
export is not present in early 4.7.x release, these apps would not run
with the Qt DLLs from those releases, which breaks Qt's compatibility
guarantees for patch releases. This change makes apps compatible with
all 4.7.x releases again.
For export frozen Qt builds (the sort that should be compatible across
all 4.7.x releases), qtmain.lib no longer forces a static import link
to qt_symbian_SetupThreadHeap(). Instead it dynamically loads
qtcore.dll, looks up qt_symbian_SetupThreadHeap(), and calls it if
present. If the function is not present, or on emulator builds where we
know that qtcore will use the system allocator creation function, we
call the system allocator creation function.
For export unfrozen builds, there is no compatibility between builds or
releases, so we do use a static import link to
qt_symbian_SetupThreadHeap(), as we have to use the qtcore dll we have
built with it anyway.
This has been tested as follows:
S60 3.1 SDK, def files not frozen. App compiled against latest code
runs on the corresponding DLLs, and does not start with 4.7.0, which
is what we expect.
S60 3.2 SDK, def files frozen. App compiled against latest code runs
on the corresponding DLLs with the new allocator, and runs on 4.7.0
DLLs with the old allocator. Which demonstrates compatibility.
S60 5.0 SDK, def files not frozen, debug build. Same result as for
the 3.1 SDK, which demonstrates debug build working too (all other
tests are release build tests).
S60 5.0 SDK, def files frozen, debug build. Same result as on S60 3.2
SDK, which demonstrates debug build working with def files.
Symbian^3 SDK, def files frozen. Same result as on S60 3.2 SDK,
demonstrating Symbian^3 compatibility.
Symbian^4, code and tests compile and does not affect running.
*** This change is only required for 4.7. It is not needed for 4.8+ ***
*** If this change appears in 4.8+, it can be reverted. ***
Task-number: QT-4080
Reviewed-by: Shane Kearns
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-13940
Reviewed-by: Martin Pejcoch
|
| | | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-13483
Reviewed-by: Miikka Heikkinen
|
| | |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Designer: Fix a crash when copying empty page-based containers.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTBUG-14208
|
| | |\ \ \ \ \
| | |/ / / /
| | | / / /
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add missing data for the autotest of in-place conversion for Pixmap
Avoid in-place convertion of images with multiple references
Fix infinite loop when justifying undisplayable Arabic text
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The commit 4d974ff0a748b22e668a4cb7ef38101122c85b3b uses an new image
which was not commited with the patch.
|
| | | |\ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Avoid in-place convertion of images with multiple references
Fix infinite loop when justifying undisplayable Arabic text
|
| | | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Avoid in-place convertion of images with multiple references
Fix infinite loop when justifying undisplayable Arabic text
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The decoding from image reader was assuming the image reader do not
keep the image internally. This is not true for the GIF plugins because
the previous image can be used to compose the current image.
This was causing crash on ARM because the 16 bits color depth causes
the image memory to be reduce by half. When the plugin was accessing
the memory, it assumes the images has not changed and is on 32 bits.
This patch disable the in-place conversion if a detach is required.
Regular conversion is the correct solution in this case, and it can
also be made faster by converting while copying.
Reviewed-by: Andreas Kling
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If the Arabic text is for some reason undisplayable, e.g. because of
QTBUG-13132, the font engine will be unable to find the tatweel character
and the kashida width may be returned as 0. This would potentially cause
an infinite loop, as "need" would remain >= minKashida forever because
x - 0 is still >= 0.
Task-number: QTBUG-13130
Reviewed-by: Lars
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Account for native child widgets when handling focus events
Added support for using inputMethodHints in QInputDialog edit widget.
Fixed some preprocessor parameters for Mac support.
Fixed missing QMAKE_MOC definition in certain mkspecs.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The code previously contained an implicit assumption that the
control which received the FocusChanged event was a top-level
widget. This meant that focus events delivered to native
child widgets could cause unexpected changes in visibility of
the statusbar and CBA.
Task-number: QTBUG-13761
Reviewed-by: Jason Barron
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
AutoTest: Included
Task: QTBUG-13200
RevBy: Denis Dzyubenko
|
| | | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Liang Qi
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Also removed the use of DIR_SEPARATOR. It does not get defined until
after symbian.conf has finished parsing.
RevBy: Miikka Heikkinen
|
| | |\ \ \ \
| | |/ / /
| | | / /
| | |/ /
| |/| |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix memory leak in QPixmap::toSymbianRSgImage() when an error occurs.
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In the cases where an error occured while converting a QPixmap to a
VGImage this function would return without deleting the RSgImage
pointer that it created. Fix is to use a QScopedPointer instead. Also
don't use q_check_ptr() since this isn't a CBase derived class.
In case you are wondering why I didn't use a custom deleter here so
that Close() was also called, we need to make sure that Close() is
called on the RSgImage instance before calling Close() on the driver.
Reviewed-by: mread
|
| | |/
|/|
| |
| |
| |
| |
| |
| | |
We didn't handle the section property changing, e.g. due to asynchronous
model.
Task-number: QT-4093
Reviewed-by: Aaron Kennedy
|
| |\ \ |
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Allow aliases to value type properties
Image.sourceSize is incorrect after changing Image.source
Test for QTBUG-13685
Don't forward keys to invisible items.
Disable Text {} image caching by default
Check plugin and QML file case on Mac and Windows
Add test for QTBUG-14279
Ensure that onRelease is called for doubleClick events.
emit currentSectionChanged when section changes in ListView.
Remove some unnecessary includes in cpp files
Ensure Flickable.contentX and Flickable.contentY return correct values.
Don't allow multiple values to be assigned to a singular property
Fix dragging items within a PathView
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-14254
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-14303
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix crash when using Q_GLOBAL_STATIC(QWidget...)
Removed the need for S60main.rsc resource file in Symbian.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If Q_GLOBAL_STATIC is used with a QWidget (or subclass) then the
destructor of QWidget will be executed after the destructor of
QApplication. Since ~QApplication() destroys the S60 environment and
the trap handler, we need to be sure that if QApplication is destroyed,
we do not attempt to use anything from the S60 environment. This
includes RWsSession and the trap handler.
The fix is to avoid flushing the WSERV buffer if QApplication has been
deleted already.
Reviewed-by: axis
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Qt upgrade was failing since the s60main.rsc is being locked by
S60 application framework. And when installer detects that
old version of Qt has already been installed it first tries to
uninstall the old one and then install the new one. The uninstallion
failed since the file was locked by the running Qt application.
It should be noted that this patch fixes the Qt upgradibility only
for Qt versions where patch is included. I.e. the versions before
4.7.2 need a different mechanism to be upgradable. This different
mechanism is based on partial upgrade SIS packages as described in
QT-4052.
Task-number: QT-3471
Reviewed-by: Axis
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix build with cups 1.5 snapshots
|
| | | |\ \ \ |
|
| | | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix build with cups 1.5 snapshots
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Without this patch, Qt CUPS support fails to build with current
CUPS snapshots:
In file included from ../../include/QtGui/private/qcups_p.h:1:0,
from painting/qpdf.cpp:47:
.../qcups_p.h:78:11: error: 'ppd_file_t' does not name a type
.../qcups_p.h:80:11: error: 'ppd_file_t' does not name a type
.../qcups_p.h:81:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:84:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:87:34: error: ISO C++ forbids declaration of 'type
name' with no type
.../qcups_p.h:87:47: error: template argument 1 is invalid
.../qcups_p.h:103:56: error: 'ppd_group_t' does not name a type
.../qcups_p.h:103:77: error: ISO C++ forbids declaration of 'group'
with no type
.../qcups_p.h:104:62: error: 'ppd_group_t' does not name a type
.../qcups_p.h:104:75: error: ISO C++ forbids declaration of 'group'
with no type
.../qcups_p.h:108:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:110:5: error: 'ppd_file_t' does not name a type
Merge-request: 835
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
Live texture updates to meegographicssystem helper.
Live texture updates to meegographicssystem plugin.
Revert the integration of the merge request 2286.
Fix text rendering in GL when using the broken-fbo-fallback
ActiveQt: also make the designer plugin for qaxwidget build in the opensource versions
Fix compilation
Code cleaning with the merge request 2286
Fix a pending issue with the merge request 2286
Doc: fix description of the expected behavior for QGraphicsItem::cursor
Fixed the build error in qtconfig
Resolved a little code style issue in qtconfig
Renamed controls in qtconfig's MainWindow
Removed inheritance from UI file in qtconfig's MainWindow
Fixed a bug and resolved some translation issues in qtconfig
Fixed some problems in qtconfig's PreviewWidget
Removed the inheritance from ui file in qtconfig's PaletteEditorAdvanced
Replaced the unnecessary include with declaration
Resolved some code style issues and fixed the broken copyright year
Finally removed the qtconfig dependency from qt3support
Modified previewwidget's ui file in qtconfig
...
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Merge-request: 848
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Merge-request: 848
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The merge request 2286 will be integrated in master.
This should let an angry developer calm down and
resume his work.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This is a backport of 3874cd95e203da40d5205ef6455d7f56cba6923a which
was committed to qt:master. Since the patch that originally exposed
the bug was added to 4.7.2, this patch is required there as well.
Bug is visible when resizing the glyph cache on devices where
QGLContext::brokenFBOReadback defaults to true, or by setting this to
true on desktop.
Reviewed-by: Gunnar
|
| | | |\ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (22 commits)
ActiveQt: also make the designer plugin for qaxwidget build in the opensource versions
Fix compilation
Code cleaning with the merge request 2286
Fix a pending issue with the merge request 2286
Doc: fix description of the expected behavior for QGraphicsItem::cursor
Fixed the build error in qtconfig
Resolved a little code style issue in qtconfig
Renamed controls in qtconfig's MainWindow
Removed inheritance from UI file in qtconfig's MainWindow
Fixed a bug and resolved some translation issues in qtconfig
Fixed some problems in qtconfig's PreviewWidget
Removed the inheritance from ui file in qtconfig's PaletteEditorAdvanced
Replaced the unnecessary include with declaration
Resolved some code style issues and fixed the broken copyright year
Finally removed the qtconfig dependency from qt3support
Modified previewwidget's ui file in qtconfig
Fixed some code style issues in qtconfig
Refactored the MainWindow in qtconfig
Refactored PaletteEditorAdvanced in qtconfig
Removed more legacy code from qtconfig and fixed codestyle issues
...
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
opensource versions
Reviewed-by: Olivier Goffart
Merge-Request: 843
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
after merge request 2286
|
