summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-057-200/+87
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Port QX11GLPixmapData & QX11GLWindowSurface to new QEgl API Make QEgl::createSurface store the surface in the pixmapdata too Make QEgl::ConfigOptions use QFlags
| * Port QX11GLPixmapData & QX11GLWindowSurface to new QEgl APITom Cooksey2010-03-055-196/+74
| | | | | | | | | | | | | | It's still just as buggy, but at least it allows us to remove a lot of crud from qgl_x11egl.cpp. Reviewed-By: TrustMe
| * Make QEgl::createSurface store the surface in the pixmapdata tooTom Cooksey2010-03-051-3/+5
| | | | | | | | | | | | | | This means the same surface can then later be used to bind the pixmap as a texture using eglBindTexImage2D. Reviewed-By: TrustMe
| * Make QEgl::ConfigOptions use QFlagsTom Cooksey2010-03-051-1/+8
|/ | | | Reviewed-By: Trustme
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-057-13/+83
|\ | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix for torn off menus that were way too big Compile fix for Windows Mobile and OpenGLES2 Fixed failure to store certain image formats as jpeg Fixa few warnings on mingw Added QImage::bitPlaneCount().
| * Fix for torn off menus that were way too bigThierry Bastian2010-03-051-4/+5
| |
| * Compile fix for Windows Mobile and OpenGLES2ninerider2010-03-051-2/+1
| | | | | | | | The native device is now the default screen device.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-0529-195/+407
| |\
| | * Fixa few warnings on mingwThierry Bastian2010-03-052-1/+7
| | |
| * | Fixed failure to store certain image formats as jpegaavit2010-03-051-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | In contrast to other image format handlers, the jpeg handler would not convert a QImage of an "unusual" format to a format it could handle when asked to write it. Now it does. Task-number: QTBUG-7780 Reviewed-by: Trond
| * | Added QImage::bitPlaneCount().aavit2010-03-042-5/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the image format contains unused bits (e.g. Format_RGB32), depth() does not give the true number of bits of color information per pixel. This new function does. Task-number: QTBUG-7982 Reviewed-by: Trond
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-055-6/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix spelling in enumeration. Fixed compiler warning QuickTime movie view output: emit the natural size changes
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-055-6/+10
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix spelling in enumeration. Fixed compiler warning QuickTime movie view output: emit the natural size changes
| * | | Fix spelling in enumeration.Justin McPherson2010-03-054-5/+5
| | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * | | Fixed compiler warningDmytro Poplavskiy2010-03-051-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: Justin McPherson
| * | | QuickTime movie view output: emit the natural size changesDmytro Poplavskiy2010-03-051-1/+4
| | | | | | | | | | | | | | | | Reviewed-by: Justin McPherson
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-0515-9/+8905
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Change WINSCW include paths to use same rules as ARMCC Create 4.7 def files for Symbian
| * | | | Change WINSCW include paths to use same rules as ARMCCShane Kearns2010-03-041-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
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-0414-8/+8899
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Create 4.7 def files for Symbian
| | * | | | Create 4.7 def files for SymbianShane Kearns2010-03-0414-8/+8899
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New QtDeclarative module New APIs in existing modules Reviewed-by: Trust Me
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-05115-10800/+12888
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits) Doc: Enabled the context menu in the spreadsheet demo. Updated URLs. Doc: Applied suggestion for an improvement to the foreach documentation. Doc: Added a note about the lack of standard file copy/paste on X11. Doc: Fixed the row number for a widget in two parts of the tutorial. Doc: Fixed typos. Reduce compiling time of QScriptValue autotest suite on Windows. Optimize QScriptValue autotest generator. Set database write behavior to synchronous=OFF and increase page cache. doc: Fixed some qdoc errors. Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text. Allow building documentation without all of Qt Added a documentation for the new enum value in gesture api. Remove the OBJECTS_DIR variable assignment from some projets in Qt. Fix compile qmake/MinGw: Link statically for Qt Creator to be able to detect it. Enable two fast path for blend_tiled_rgb565 Avoid QString reallocation for smallcaps fonts in Itemizer::generate() Make QLabel::text a reloadable property remove non wifi interfaces from being handled. ...
| * | | | | | Doc: Enabled the context menu in the spreadsheet demo.David Boddie2010-03-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5522 Reviewed-by: Trust Me
| * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-03-04288-13375/+15663
| |\ \ \ \ \ \
| | * | | | | | Updated URLs.Robert Loehning2010-03-044-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
| | * | | | | | Reduce compiling time of QScriptValue autotest suite on Windows.Jedrzej Nowacki2010-03-048-10223/+11412
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QScriptValue autotest suite compiles about 24 min with MSVS2008, which is unacceptable. Tests were splited into a few files for better use of distributed compilation. Repeated calls to insert() and operator<<() where replaced by loops, that should reduce time of code optimizing. Reviewed-by: Kent Hansen
| | * | | | | | Optimize QScriptValue autotest generator.Jedrzej Nowacki2010-03-043-173/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QScriptValue autotest suite compile 24 minutes on MSVS2008 which is unacceptable. Modification tries to reduce the compilation time. Temples were changed to use static arrays of data; instead of inserting values directly, they are inserted in a loop (less code to optimize). Generated code were separated into several files (better usage of distributed compiling). Reviewed-by: Kent Hansen
| | * | | | | | Set database write behavior to synchronous=OFF and increase page cache.kh12010-03-042-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the INSERT performance dramatically, since we won't wait anymore until all data is written back to the database. Should not have any impact on the database consistency in case of an app crash, only in case the whole OS crashes, but then you might be in trouble anyway. Reviewed-by: ck
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0494-392/+1196
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (63 commits) doc: Fixed some qdoc errors. Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text. Allow building documentation without all of Qt Added a documentation for the new enum value in gesture api. Remove the OBJECTS_DIR variable assignment from some projets in Qt. Fix compile qmake/MinGw: Link statically for Qt Creator to be able to detect it. Enable two fast path for blend_tiled_rgb565 Avoid QString reallocation for smallcaps fonts in Itemizer::generate() Make QLabel::text a reloadable property remove non wifi interfaces from being handled. Disable auto-uppercasing and predictive text for password line edits. Avoid QString reallocation in QTextEngine::itemize() Remove the Qt 4.7 #if guards that were needed for 4.6 Always redraw the complete control when an input event comes in. Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5) Fix compilation: include QString in order to use QString. Fix compile Block the Maemo5 window attribute values from being assigned to something else on other platforms. be more verbose when warning about incompatible libraries ...
| | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-0415-23/+33
| | | |\ \ \ \ \
| | | | * | | | | Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still ↵Robert Griebl2010-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | way better than fully visible text. Reviewed-by: axis
| | | | * | | | | Allow building documentation without all of QtDenis Dzyubenko2010-03-041-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added a new make target 'sub-qdoc3' which builds qdoc3 and it's dependencies only, so that when running "make docs" we don't build all of sub-tools (including declarative module), but qdoc3 only Reviewed-by: David Boddie Reviewed-by: Joao
| | | | * | | | | Added a documentation for the new enum value in gesture api.Denis Dzyubenko2010-03-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7400 Reviewed-by: David Boddie
| | | | * | | | | Remove the OBJECTS_DIR variable assignment from some projets in Qt.Jocelyn Turcotte2010-03-045-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevent debug and release object file to be mixed up when linking these application in a debug_and_release configured Qt. Reviewed-by: Marius Storm-Olsen
| | | | * | | | | Fix compileJarek Kobus2010-03-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing header added
| | | | * | | | | qmake/MinGw: Link statically for Qt Creator to be able to detect it.Friedemann Kleint2010-03-042-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>
| | | | * | | | | Enable two fast path for blend_tiled_rgb565Benjamin Poulain2010-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blending ARGB8565 and RGB16 on top of RGB16 is common on system with 16 bits color depth. The faster blending functions can be used instead of blend_tiled_generic. Reviewed-by: Tom Cooksey
| | | | * | | | | Avoid QString reallocation for smallcaps fonts in Itemizer::generate()Andreas Kling2010-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann
| | | | * | | | | Make QLabel::text a reloadable propertyJarek Kobus2010-03-043-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this way we can correctly load / reload a label in case it contains a rich text with a reference to the image taken from resources. Since QLabel::setText() ignores the call in case we try to set the same text, we force the reload by setting the empty string in between. For performance reasons we do it only in cases when the text value contains :/ (only in this case it might have a reference to the resources). Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-8347
| | | * | | | | | doc: Fixed some qdoc errors.Martin Smith2010-03-042-1/+4
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtMultimedia module needed to have its own \page unique name so that the QtMultimedia \module would not conflict with the QtMultimedia \namespace.
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0480-368/+1159
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (53 commits) remove non wifi interfaces from being handled. Disable auto-uppercasing and predictive text for password line edits. Avoid QString reallocation in QTextEngine::itemize() Remove the Qt 4.7 #if guards that were needed for 4.6 Always redraw the complete control when an input event comes in. Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5) Fix compilation: include QString in order to use QString. Fix compile Block the Maemo5 window attribute values from being assigned to something else on other platforms. be more verbose when warning about incompatible libraries Introduce a setAttribute_internal helper Do not reset state too early on RMB click Fix for QRadioButtons and QCheckBoxes drawn incorrectly when a style sheet is set. Speed up creation of the pixmap cache key Optimize QGtkStyle fix qmake -project mode test qlist some more fix include Don't print a warning when passing an empty string to QColor Stabilize QWidget ...
| | | | * | | | | remove non wifi interfaces from being handled.Lorn Potter2010-03-041-22/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handled by generic engine. also fix release crash
| | | | * | | | | Disable auto-uppercasing and predictive text for password line edits.Robert Griebl2010-03-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: axis
| | | | * | | | | Avoid QString reallocation in QTextEngine::itemize()Andreas Kling2010-03-031-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling QString::utf16() will cause reallocation (for null-termination) if the string was created via fromRawData(). Reviewed-by: Benjamin Poulain
| | | | * | | | | Remove the Qt 4.7 #if guards that were needed for 4.6Robert Griebl2010-03-032-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | * | | | | Always redraw the complete control when an input event comes in.Robert Griebl2010-03-032-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here is that a pre-edit string won't be detected by updateDisplayText(), so the control thinks nothing has changed when a new pre-edit string is set. Reviewed-By: Simon Hausmann (cherry picked from commit 16f30906f6eea3e00351478555f153697a6e186d)
| | | | * | | | | Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5)Robert Griebl2010-03-031-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Harald Fernengel
| | | | * | | | | Fix compilation: include QString in order to use QString.Thiago Macieira2010-03-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't happen on my system, but the CI system complains, so I guess it's a namespace issue.
| | | | * | | | | Fix compileJens Bache-Wiig2010-03-031-0/+1
| | | | | | | | |
| | | | * | | | | Block the Maemo5 window attribute values from being assigned to something ↵Robert Griebl2010-03-031-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | else on other platforms. Reviewed-By: Harald Fernengel
| | | | * | | | | be more verbose when warning about incompatible librariesHarald Fernengel2010-03-031-1/+2
| | | | | | | | |
generated by cgit v0.12 at 2024-12-28 02:49:37 (GMT)