diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-21 19:43:04 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-21 19:43:04 +1000 |
| commit | 2cf3c7e47f9f4963989f5270b7930fc9382670a6 (patch) | |
| tree | 8a035b339590e8d9cee1d6d8956800e0a4d5c3cd /examples/declarative/cppextensions/qwidgets/qwidgets.pro | |
| parent | 41bb458f095bf796d3a083eaa1c9d547f3fed745 (diff) | |
| parent | 67dd642ca7cd7f61ba5de83218a3933ffe12f10e (diff) | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (40 commits)
Doc: adding link to the Qt Quick Components for Symbian page.
Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
Workaround to VideoCore III scissor bug.
Fix to QGLWidget crash
Update def files
Fix crash on exit when overriding signal handlers in states.
Typo fix
Add new signals to indicate GPU resource usage.
symbian - search drives for translation files
symbian - search drives for translation files
Cannot flick to the end of a horizontal list view width LayoutMirroring
Backport more imports directory caching changes.
Symbian - fix deleteLater not working from RunL
Doc updates to installation, platform notes and symbian introduction.
Do not let QGLContext get out of sync when doing mixed VG-GL rendering
Fix more test DEPLOYMENT statements for Symbian
Create auto test for http HEAD request
QNAM - fix poor performance of HEAD request with authentication
Fix deployment for declarative tests, examples on Symbian
symbian - add support for ELangKazakh and ELangEnglish_India
...
Diffstat (limited to 'examples/declarative/cppextensions/qwidgets/qwidgets.pro')
| -rw-r--r-- | examples/declarative/cppextensions/qwidgets/qwidgets.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro index 2e610f9914..3353a8daeb 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro @@ -20,5 +20,5 @@ symbian:{ importFiles.sources = QWidgets/qmlqwidgetsplugin.dll QWidgets/qmldir importFiles.path = QWidgets - DEPLOYMENT = importFiles + DEPLOYMENT += importFiles } |