summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-136-9/+9
|\ | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix compile error Don't try to use so much permissions, use something a lot more sane A bit saner suggestion Remove not needed permissions Make compile on Symbian
| * Fix compile errorShane Kearns2010-04-122-5/+6
| | | | | | | | Reviewed-by: Jason Barron
| * Don't try to use so much permissions, use something a lot more saneThomas Zander2010-04-121-1/+1
| |
| * A bit saner suggestionThomas Zander2010-04-121-1/+1
| | | | | | | | | | The docs should probably not suggest a permission level has so many permissions that in practice nobody needs it (or can get it)
| * Remove not needed permissionsThomas Zander2010-04-121-1/+0
| |
| * Make compile on SymbianThomas Zander2010-04-121-1/+1
| |
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-04-1233-175/+383
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (54 commits) Improved support for OPTION and LINKEROPTION statements in MMP files Fix crash with QTextEdit::textChanged() when deleting a character econd half of the crash fix for codecs on Symbian Autotest: Use the file in the non-writeable area Autotest: moved these to the qtest/ dir Fix problem with accessibility clients not getting info from QFileDialog Fix a crash with global static objects Autotest: same as previous commit Autotest: fix network test failure Doc: we don't ship a qconfig executable in the Windows CE packages Enable preserved swap behavior when surface is created due to resize. Fixed possible data corruption in the triangulating stroker. Generate triggered signal even the action launches menu in Symbian. Symbian emulator: unload file server so apps can be recompiled. Clear QFontCache TLS content before nullifying TLS pointer. Fixed focus and window activation events on Symbian when opening menu. Fixed caching of QPainter patterns in the GL 2 engine. Fixes CursorChange and TooltipChange events delivery for QGraphicsWidget QTableView: fix spans corruption when removing spans. Fixes painting artifacts when scaling a QGraphicsProxyWidget. ...
| * \ Merge commit 'v4.7.0-tp1' into qt-4.7-from-4.6Thiago Macieira2010-04-120-0/+0
| |\ \
| | * | Update def files for latest QtDeclarative APIv4.7.0-tp1Shane Kearns2010-03-102-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QDeclarativeBinding API is new since last week's freeze. Froze the def files again, so that applications that use this API will be able to link. Task-number: QTBUG-8909 Reviewed-by: Trust Me (cherry picked from commit c0eeb2af8f6a023ac1c67f3cf955be3e4b13f998)
| | * | Change WINSCW include paths to use same rules as ARMCCShane Kearns2010-03-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default rules applied by symbian cause problems with headers included from within other headers. This only affects WINSCW builds, so the headers always need to be specially fixed up to be compatible, which is wrong. Instead, use CXXFLAGS to change the include path rules to be the same as Reviewed-by: Iain (cherry picked from commit 778b9dcb5ad6aba8b0548719c2674e3e6ad66c58)
| | * | Create 4.7 def files for SymbianShane Kearns2010-03-1014-8/+8899
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New QtDeclarative module New APIs in existing modules Reviewed-by: Trust Me (cherry picked from commit bd1325b892be6c8a57044268fd7b6a66a01e4bf7)
| | * | Introduces a crash on start-up regression for several apps (designer, etc) ↵Jesper Thomschutz2010-03-093-262/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on MinGW. Reverted for the alpha. Revert "Implement the blend functions with SSE2" This reverts commit f25099f400e7379f0a6e00500e990948b9785e63.
| | * | Revert "Replace the inline blend function by #define"Jesper Thomschutz2010-03-091-60/+67
| | | | | | | | | | | | | | | | This reverts commit c1fe9ae25aebc8d1b9c4a7f3e67fa25ecdcbadc8.
| | * | doc: Fixed building documentationThorbjørn Lindeijer2010-03-091-0/+0
| | | | | | | | | | | | | | | | | | | | qml.qdocconf wasn't renamed yet. (cherry picked from commit c14e9bb7d8bb86129983df96dc5f8926190f5b06)
| | * | Fixed declarative examples not being installed.Rohan McGovern2010-03-0814-1/+107
| | | | | | | | | | | | | | | | (cherry picked from commit 69a3c7fc51fcab07a6a0a18a753546b45cf522c3)
| | * | Adapted example to use the import mechanismmae2010-03-085-31/+40
| | | | | | | | | | | | | | | | (cherry picked from commit 7fd5ade07bd05ff6cb6f4e7cfa7a74081b803809)
| | * | Use a better method for installing declarative demos.Rohan McGovern2010-03-087-76/+16
| | | | | | | | | | | | | | | | | | | | Simply copy the demo directories, instead of writing a stub .pro file. (cherry picked from commit c97e1e29aedaceead92cd231b3a77d60bab2af50)
| | * | Make compile following QDeclarativeMetaProperty renamingBea Lam2010-03-084-8/+8
| | | | | | | | | | | | | | | | (cherry picked from commit a7856e3a5f6b9e5e2fd10690574b5f44ca50ba73)
| | * | Fixed declarative demos not being installed.Rohan McGovern2010-03-088-0/+93
| | | | | | | | | | | | | | | | (cherry picked from commit 23440d84ddf78755e77cea75956cd7445647230a)
| | * | Rewrite Minehunt demo to use the runtime.Jesper Thomschutz2010-03-0818-151/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit f56893bbffd5eb26dd77e56707615cbb11a26c9b) Conflicts: demos/declarative/minehunt/minehunt.cpp
| | * | Updated URLs.Robert Loehning2010-03-054-5/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com> (cherry picked from commit 364ba2bfeeab574d2ae940e4387d3c90b2a46dcd)
| | * | qmake/MinGw: Link statically for Qt Creator to be able to detect it.Friedemann Kleint2010-03-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt Creator detects Qt versions by running qmake. This fails if no MinGw setup is in the path as is usually the case when starting it from the menu. Make it possible to run qmake without setup. Strip executable. Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com> Reviewed-by: mariusSO <qt-info@nokia.com> (cherry picked from commit 52da988db3a03bce5513bc5e2efa3d69f3664f24)
| | * | fix qmake -project modeOswald Buddenhagen2010-03-051-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the mode is a big hack, and consequently needs hacks to get started as well ... Reviewed-by: mariusSO (cherry picked from commit a1b0dba9971ef88dc1e079d1ea49230a4dd3c514)
| | * | don't have every generator duplicate the QMAKE_QMAKE logicOswald Buddenhagen2010-03-0510-25/+12
| | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO (cherry picked from commit 375edf788be3f51d6bebc438142642ce53004170)
| | * | make the fallback value of QMAKE_QMAKE absoluteOswald Buddenhagen2010-03-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inspired by the pbx generator. currently this has no effect, as all generators build their own fallbacks anyway. Reviewed-by: mariusSO (cherry picked from commit f006691acc45a57e011e5827163c0b3759864bf7)
| | * | make the value of QMAKE_QMAKE somewhat less magicOswald Buddenhagen2010-03-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the generators change the value of QMAKE_QMAKE, so it is unwise to "redirect" it to a hidden builtin which is reset each time. in particular, this fixes qmake generating makefiles without an absolute path to qmake itself - the initial quoting of the filename will make the variable "real", so contains() will start working for it. (cherry picked from commit 31e1fb9103e6d6657c1153f5c30e149087568042)
| | * | Fix visibility of classes in private headers upon which Bauhaus/Creator relies.Warwick Allison2010-03-052-3/+3
| | | | | | | | | | | | | | | | | | | | Author: Erik Verbruggen (cherry picked from commit b67d5d90a306534a1ea2fcb333981c6b1126105c)
| | * | Don't return QDeclarativeDeclarativeData for a deleting objectAaron Kennedy2010-03-052-2/+6
| | | | | | | | | | | | | | | | | | | | This was causing crashes in the qmldesigner. (cherry picked from commit 3b8cad8be96d7791e8ca8305609d1155ec093b80)
| | * | Add config.test for multimedia/qmlJørgen Lind2010-03-054-9/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | using pkg-config from pri file is not good for cross-compiling Reviewed-by: paul (cherry picked from commit 9957e85e37345e946ecc67196d65fbca867a2001)
| | * | QDeclarativeView: Add a Designer plugin.Friedemann Kleint2010-03-054-0/+220
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Acked-by: akennedy <qt-info@nokia.com> (cherry picked from commit 13f23b71cee682ccaaec455d72b1578afc2800ee)
| | * | QDeclarativeView: Make usable in DesignerFriedemann Kleint2010-03-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make source a designable property, add missing declarations for enumerations. Reviewed-by: akennedy <qt-info@nokia.com> (cherry picked from commit 0998fc069512d0ae2853929489b80f35e0d9d4ae)
| | * | typo for windows ce exclusion ruleMaurice Kalinowski2010-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Paul Olav Tvete (cherry picked from commit a7196feb11d701dd486e66fd06cbc50d84c9b1bb)
| | * | build fix for WinCEMaurice Kalinowski2010-03-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | only use xmlpatterns if Qt is configured to build it Reviewed-by: Paul Olav Tvete (cherry picked from commit 454d4fa2fbefabb54f7f567aaf01f2c1faa165f4)
| | * | compile fix for WinCEMaurice Kalinowski2010-03-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | do not include headers of disabled modules Reviewed-by: Paul Olav Tvete (cherry picked from commit 4795583b42577259499b34da07077f501e45ce42)
| | * | compile fix for WinCEMaurice Kalinowski2010-03-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | need to add the win32 file to get copy and friends included Reviewed-by: Simon Hausmann (cherry picked from commit 57686d28fed85c9f8fbb340cd05f3fb6322332f7)
| | * | Added static method isValidColor to QColor.Erik Verbruggen2010-03-022-3/+28
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Gunnar Sletta (cherry picked from commit 72da039e54a62bf3a481fefc753e0e50ba75df57)
| | * | Doc: brief Qt Quick introduction on "What's New" page.Volker Hilsheimer2010-03-021-1/+24
| | | | | | | | | | | | | | | | (cherry picked from commit 45d91603e65f78cb749bcc2c8949ef24048761df)
| | * | Fix minehunt demoAlan Alpert2010-03-012-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | Game works again, and the issue with X11 native rendering being abysmally slow has been 'fixed'. (cherry picked from commit bcb2ed5667bd957476e3b62ef3a479a26f1252f3)
| | * | Make Minehunt demo compile.Alan Alpert2010-03-011-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It still isn't working though. Investigations continue. Task-number: QTBUG-8549 (cherry picked from commit 3a4dc08d08ce0388dd183a24923871e3e03ba531)
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-1233-175/+383
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/gui/image/qimage.cpp src/openvg/qwindowsurface_vgegl.cpp
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-123-111/+63
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Improved support for OPTION and LINKEROPTION statements in MMP files
| | * | | Improved support for OPTION and LINKEROPTION statements in MMP filesMiikka Heikkinen2010-04-123-111/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VERSION_FLAGS.<keyword> can now be used for all compilers and not just armcc, and version flagging can now be used with QMAKE_LFLAGS as well as QMAKE_CXXFLAGS. Also, MMP_OPTION_KEYWORDS variable is used to define supported keywords for OPTION and LINKEROPTION statements, which are defined via QMAKE_CXXFLAGS.<keyword> and QMAKE_LFLAGS.<keyword> variables. This improves flexibility in the future if new keywords need to be supported. Task-number: QTBUG-8685 Reviewed-by: Janne Koskinen
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-121-2/+4
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix crash with QTextEdit::textChanged() when deleting a character
| | * | | Fix crash with QTextEdit::textChanged() when deleting a characterEskil Abrahamsen Blomfeldt2010-04-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextEdit::textChanged() will be emitted from a function called from within QTextCursorPrivate. If the code connected to textChanged() makes a local copy of the current text cursor and then causes it to detach, we will crash when returning to QTextCursorPrivate and trying to access the now-deleted data. To avoid this, we make a local reference to the current text cursor that gives us a guarantee that it will be valid throughout the delete-call. Task-number: QTBUG-9599 Reviewed-by: Gunnar
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-122-2/+37
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: econd half of the crash fix for codecs on Symbian
| | * | | | econd half of the crash fix for codecs on SymbianLars Knoll2010-04-122-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that we do not try to use any codecs if we don't have a cleanup stack available on Symbian. Task-number: QT-3255 Reviewed-by: Iain
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-115-8/+44
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Autotest: Use the file in the non-writeable area Autotest: moved these to the qtest/ dir Fix problem with accessibility clients not getting info from QFileDialog
| | * | | | | Autotest: Use the file in the non-writeable areaThiago Macieira2010-04-111-3/+3
| | | | | | |
| | * | | | | Autotest: moved these to the qtest/ dirThiago Macieira2010-04-112-4/+3
| | | | | | |
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-112-1/+38
| | |\ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix problem with accessibility clients not getting info from QFileDialog
generated by cgit v0.12 at 2024-12-28 04:28:00 (GMT)