| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
src/3rdparty/webkit
Also change a bit the demo due to a little API change. The module is not
org.webkit but QtWebKit now.
Reviewed-by:simon hausmann
|
| |
|
|
|
|
|
| |
Merge-request: 657
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
|
|
|
|
|
|
|
| |
This is a very simple approach, I don't know if a more nuanced system
would be appropriate.
Task-number: QTBUG-11025
|
|
|
|
|
| |
Task-number: QTBUG-10834
Reviewed-by: Warwick Allison
|
|
|
|
|
|
|
| |
Added a comment to the class docs, and cleaned up the visual tests a
little. However the visual tests are old and text heavy, and since we
never seem to check them we might wait on updating them for a little
longer.
|
|
|
|
|
| |
Exchanged the use of QDeclarativePaintedItem with the use of QGraphicsWebView
and its tiled backing store.
|
| |
|
|
|
|
|
| |
Task-number:
Reviewed-by: Martin Jones
|
|\
| |
| |
| |
| | |
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()
|
| | |
|
|/
|
|
| |
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
|
|
|
|
| |
Currently, this feature too prone to accidental misuse and abuse.
|
| |
|
| |
|
|
|
|
| |
This commit removes the obsolete QML_REGISTER_TYPE macros.
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-7193
Reviewed-by: akennedy
|
|
|
|
| |
... even when -prefix is set
|
| |
|
|
* Fix export macro used in webkit
* Fix dependencies on declarative/mutlimedia
* Copy qmldir files into the build tree
|