| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |\
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Labs (experimental) Gesture support.
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix regression on Symbian
Fix broken test case
Cleanup the deployment code
Fix 'make sis' finding the dll on symbian
Re-add line that was lost during webkit update.
Work around bad naming of exported class in symbian sdk causing conflict
Fix building on public symbian SDK.
Fix qmake with the symbian makespec failing when project has a dash in it
Make s60main static lib not depend on QtCore
Remove stray non-latin1 character
Fix out-of-source symbian build for external apps
Update EABI def files for 4.7
Exporting QFontDatabase::removeAllApplicationFonts()
Adding QFontDatabase::removeAllApplicationFonts()
|
| | | | | |
|
| |_|_|/
|/| | |
| | | |
| | | | |
(pass parser status up to QDeclarativeItem)
|
| |_|/
|/| |
| | |
| | | |
By popular demand.
|
|\ \ \ |
|
| |/ / |
|
|/ / |
|
|/
|
|
| |
Task-number: QTBUG-9372
|
|
|
|
|
|
|
| |
The old pro files did not actually install the qmldir files in clean
builds. These ones should work.
Reviewed-by: Harald Fernengel
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-9364
Reviewed-by: jbarron
|
| |
|
|\
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/minehunt/minehunt.cpp
src/declarative/qml/qdeclarativecompiler.cpp
|
| |
| |
| |
| | |
Currently, this feature too prone to accidental misuse and abuse.
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Initialize variable.
Setting stacking order from top to bottom seems to work better.
Don't crash if an out of bounds model index is accessed.
|
| | | |
|
| | | |
|
|/ /
| |
| |
| | |
HP-UX has a #define somewhere for m_volume
|
|\ \
| |/
|/|
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Add autoLoad property to multimedia declarative elements.
Fix; QML Video item is sensitive to property assignment order
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-8947
Reviewed-by: Andrew den Exter
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-8605
Reviewed-by: Andrew den Exter
|
| | |
|
| |
| |
| |
| |
| | |
This qmake script had wrong logic as a result of a bad copy and paste
(probably from translations\translations.pro)
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
Task-number: QT-2846
|
| |
| |
| |
| | |
This commit removes the obsolete QML_REGISTER_TYPE macros.
|
| |
| |
| |
| | |
Reviewed-by: Roberto Raggi
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/declarative/util/qdeclarativestateoperations.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (74 commits)
Assistant: Fix compile warning for empty header.
Doc: mark QEasingCurve support functions as new in 4.7.
Modify the XML test suite not to use non-characters.
Autotest: Fix failing QTextCodec tests
Doc: mark methods as internal (as they were in previous releases)
Doc: add image for Qt Quick to "What's New" page.
qdoc: Clear a static multimap after each qdocconf file.
qdoc: Added some debug output to track down a crash
Fixed mouse wheel handling in scrollareas.
Added two missing keys for X11
Carbon: usage of menu bars can cause exceptions to be thrown
Mac: compile fix
Fix build
JPEG plugin: Use switch() instead of if()
don't try to build corewlan plugin when corewlan was not found at configure
Avoid conversion to/from QChar in the cn codec to unicode
Avoid memory allocations in conversion from Gb2312/Gb18030 to unicode
fix corewlan detection error when building for 10.5 when 10.6 is also
fixed treatment of zlib on Mac when crossbuilding
Partial overloading support for qdbus cli tool.
...
|
| | | |
|
|/ /
| |
| |
| |
| | |
Task-number: QTBUG-7193
Reviewed-by: akennedy
|
|/
|
|
| |
... even when -prefix is set
|
| |
|
|
|
|
|
| |
Conflicts:
src/src.pro
|
| |
|
|
* Fix export macro used in webkit
* Fix dependencies on declarative/mutlimedia
* Copy qmldir files into the build tree
|