summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added QML coding convention for "private" properties.Jerome Pasion2010-12-062-3/+64
| | | | | | Private properties start with two underscores. __property Reviewed-by: David Boddie
* Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc.Jerome Pasion2010-12-062-15/+24
| | | | | | | Link is now linking to the gitorious project site. Task-number: QTBUG-15714 Reviewed-by: David Boddie
* Some whitespace fixes.Jerome Pasion2010-12-061-32/+32
|
* Fixed a bug by changing the id name to lower case.Jerome Pasion2010-12-061-1/+1
|
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-03108-2594/+4587
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-035-28/+81
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: rebuild configure fix misleading uppercasing deprecation warning Enable Phonon on Symbian by default. Disable OpenGL on Symbian only by default instead of always VFP type on ARM option in Linux configure script Adding -dont-process option to Unix configure script Synchronized configure.exe OpenGL options with Unix configure build lrelease as part of the "libs" part. purge vestiges of imageformat-plugins
| | * rebuild configureOswald Buddenhagen2010-12-031-0/+0
| | |
| | * fix misleading uppercasing deprecation warningOswald Buddenhagen2010-12-031-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | don't complain about uppercasing in the function's name if the real problem is that it's not defined at all. this is also slighly more efficient, as we try to lowercase only as a fallback now. Reviewed-by: joerg
| | * Enable Phonon on Symbian by default.Oleh Vasyura2010-12-031-0/+3
| | | | | | | | | | | | | | | | | | Always enable Phonon on Symbian unless it was explicitly disabled. Reviewed-by: ossi
| | * Disable OpenGL on Symbian only by default instead of alwaysOleh Vasyura2010-12-031-2/+4
| | | | | | | | | | | | Reviewed-by: ossi
| | * VFP type on ARM option in Linux configure scriptOleh Vasyura2010-12-031-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | Windows configuration tool uses -fpu option for VFP types. This option is used in Symbian releases but is not supported by Linux configure script. Reviewed-by: ossi
| | * Adding -dont-process option to Unix configure scriptOleh Vasyura2010-12-031-7/+20
| | | | | | | | | | | | | | | | | | This option is supported by Windows configure tool and used in Symbian releases. Reviewed-by: ossi
| | * Synchronized configure.exe OpenGL options with Unix configureOleh Vasyura2010-12-031-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows configure tool and Linux configure script use different options for OpenGL modules. Windows configure tool uses -opengl-es-cm and -opengl-es-2. Linux configure script uses -opengl <api> where <api> can be as "desktop", "es1", "es2" and are more common. Windows configure tool is changed to understand Linux OpenGL configure options as well. The old options are retained for compatibility but not documented any more. Reviewed-by: ossi
| | * build lrelease as part of the "libs" part.Oswald Buddenhagen2010-12-031-2/+2
| | | | | | | | | | | | | | | | | | currently it is a bootstrapped tool like moc, rcc and uic in src/tools/, so just force it into the same group. every qt build includes the libs part, so this will resolve the translation part's dependency.
| | * purge vestiges of imageformat-pluginsMark Brand2010-12-032-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imageformat-plugins variable is never referenced by the .pr[io] for building Qt. Its presence in configure.exe appears to be a vestige of an earlier state of affairs. As a reminder, jpeg, mng, tiff and gif can be built into QtGui or built as plugins. The default is plugin. During configuration, this can be overridden by adding, for example, "no-jpeg" to disable support altogether or "jpeg" to build into QtGui. Merge-request: 961 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-032-12/+19
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Unify epocroot usage in createpackage and patch_capabilities scripts
| | * Unify epocroot usage in createpackage and patch_capabilities scriptsMiikka Heikkinen2010-12-032-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | Some tools calls required epoc32/tools to be in path and some didn't. Now all tools calls will use tools from under %EPOCROOT%epoc32/tools if EPOCROOT env variable is defined. Reviewed-by: Janne Koskinen
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0332-1113/+1119
| |\ \ | | |/ | |/| | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update visual tests for the recent qmlviewer change Do not use openGL on Mac OS X for QML visual tests
| | * Update visual tests for the recent qmlviewer changeAlan Alpert2010-12-0331-1113/+1113
| | | | | | | | | | | | | | | | | | | | | Changing the minimum size of the viewer changes the size of some of the visual test outputs which were really small. Task-number: QTBUG-14792
| | * Do not use openGL on Mac OS X for QML visual testsAlan Alpert2010-12-031-0/+6
| | | | | | | | | | | | | | | | | | It appears to lead to sporadic crashes in the CI system. Task-number: QTBUG-14792
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-031-1/+1
| |\ \ | | |/ | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Give qmlviewer a minimum size if root object has no size.
| | * Give qmlviewer a minimum size if root object has no size.Bea Lam2010-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | de8c9d69fa7c7cc50e9a238e58f6e9370f158fc4 ensured the window was at least partly visible on Windows and Linux but it did not work on Mac. Task-number: QTBUG-15783 Reviewed-by: Alan Alpert
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0390-2210/+4137
| |\ \ | | |/ | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add 'Writing New Components' docs, and document the connect() function. Mention that image providers should be added before loading QML files Update QML visual tests
| | * Add 'Writing New Components' docs, and document the connect() function.Bea Lam2010-12-0330-318/+1296
| | | | | | | | | | | | | | | | | | | | | | | | The 'Writing QML Components' is mainly a restructuring of the 'Extending types from QML' page. It also documents the signal connect() function that was previously undocumented. Task-number: QTBUG-15718, QTBUG-15138
| | * Mention that image providers should be added before loading QML filesBea Lam2010-12-031-0/+3
| | |
| | * Update QML visual testsAlan Alpert2010-12-0359-1892/+2838
| |/ | | | | | | | | | | | | Reintroducing text tests to X11, and updating a few tests where the behaviour of the items has subtly changed (and it was deemed acceptable) Task-number: QTBUG-14792
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-026-51/+87
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-022-48/+45
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Cleaned up sis_targets.prf
| | * Cleaned up sis_targets.prfMiikka Heikkinen2010-12-022-48/+45
| |/ | | | | | | | | | | | | | | | | | | | | Removed the unnecessary checks for the case where pkg file doesn't exist are no longer needed as we now have dependencies to pkg files and no sis creation targets are generated if pkg is not generated. Also improved documentation a bit and added the missing ok_installer_sis target generation. Reviewed-by: Janne Koskinen
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-024-3/+40
| |\ | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Append qml import path individually for each available drive on Symbian Update TextInput when echoMode changes. Ensure semi-transparent rects paint correctly with radius == size/2.
| | * Append qml import path individually for each available drive on SymbianJoona Petrell2010-12-022-2/+33
| | | | | | | | | | | | | | | Task-number: QTBUG-15405 Reviewed-by: Jason Barron
| | * Update TextInput when echoMode changes.Yann Bodson2010-12-021-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-15779 Reviewed-by: Martin Jones
| | * Ensure semi-transparent rects paint correctly with radius == size/2.Martin Jones2010-12-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | The margins could overlap, which caused overpainting. Ensure the margins are always <= width or height /2. Task-number: QTBUG-14657 Reviewed-by: Yann Bodson
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-021-35/+35
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix line endings
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-011-35/+35
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix line endings
| | | * | fix line endingsRobert Loehning2010-12-011-35/+35
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-021-0/+2
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Rectangle should not paint with negative width or height
| | * | Rectangle should not paint with negative width or heightChristopher Ham2010-12-021-0/+2
| |/ / | | | | | | | | | | | | Task-number: QTBUG-15250 Reviewed-by: Martin Jones
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0115-79/+209
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-014-30/+108
| |\ \ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: ListView header is not visible initially.
| | * | ListView header is not visible initially.Martin Jones2010-12-014-30/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the header size was not set explicitly, but determined implicitly from Text height, the view was not positioned so that the header was visible when first shown. Task-number: QTBUG-15599 Reviewed-by: Bea Lam
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-011-34/+47
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Improvement of de30288: handle PNGs having 1 to 4 bytes truncated. Workaround for certain malformed PNGs that lack the final crc bytes
| | * | Improvement of de30288: handle PNGs having 1 to 4 bytes truncated.aavit2010-12-011-1/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QT-4103 Reviewed-by: trustme
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-12-01441-7440/+29137
| | |\ \
| | * | | Workaround for certain malformed PNGs that lack the final crc bytesaavit2010-12-011-34/+46
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-4103 Reviewed-by: gunnar
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-012-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix two minor doc errors
| | * | | | Fix two minor doc errorsAndy Shaw2010-12-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14929, QTBUG-15739 Reviewed-by: TrustMe
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-013-7/+31
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix license header. Change pen correctly when drawing cached text Fix BorderImage painting at sizes less than margin size.
| | * | | Fix license header.Jason McDonald2010-12-011-5/+5
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-012-2/+26
| | |\ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Change pen correctly when drawing cached text Fix BorderImage painting at sizes less than margin size.
generated by cgit v0.12 at 2024-12-30 21:06:17 (GMT)