summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-0822-107/+201
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Fix compilation of QMutableSetIterator::value() with QT_STRICT_ITERATORS Fix the compilation error that the previous fix didn't fix Use the thread-default glib context for the DBus connection in the ICD bearer manager. Check that _POSIX_THREAD_SAFE_FUNCTIONS is larger than zero. Use an increasing size for the getpwuid_r buffer. Make sure we use at least 1024 bytes when calling getpwuid_r. Fix compilation error: symbol is namespaced. Don't crash when creating backtrace for built-in JS function (2nd try) Revert "Improved performance of mapFromGlobal/mapToGlobal on X11" QtDBus: do not wait for reply for AddMatch and RemoveMatch Make qdbus show all types, even those that it doesn't know about Doc: Fix the docs saying what the locale codec is used for Autotest: simple improvements Autotest: Use QElapsedTimer for timings directfb: Pixmap creation always premultiplied the alpha even when it is already premultiplied in the image. Don't crash when BMP color table is broken Designer: Fix a crash in the Signal-Slot-Editor. complain about unmatched quotes/parens use const ref move multiple inclusion check for feature files to correct location ...
| * Fix compilation of QMutableSetIterator::value() with QT_STRICT_ITERATORSDavid Faure2011-02-082-1/+12
| | | | | | | | | | Merge-request: 1078 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Fix the compilation error that the previous fix didn't fixThiago Macieira2011-02-081-1/+1
| |
| * Use the thread-default glib context for the DBus connection in the ICD ↵Jocelyn Turcotte2011-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | bearer manager. This allows the bearer management plugin to be ran on a thread different than the main one. Task-number: QTBUG-17199 Reviewed-by: Kranthi <kranthi.kumar-kuntala@nokia.com>
| * Check that _POSIX_THREAD_SAFE_FUNCTIONS is larger than zero.Thiago Macieira2011-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | POSIX allows this symbol to be defined to -1 to indicate that the interfaces aren't present. On FreeBSD 8, it's defined to -1, but the functions are present (supposedly, they don't work -- just stubs). Guessing that OpenBSD is the same. Also removing the QT_NO_THREAD, since Qt can't be built without threading support. It's only used by our bootstrapped tools, which in turn use QCoreApplication only (no QApplication). Reviewed-By: Bradley T. Hughes
| * Use an increasing size for the getpwuid_r buffer.Thiago Macieira2011-02-081-1/+12
| | | | | | | | Reviewed-by: Bradley T. Hughes
| * Make sure we use at least 1024 bytes when calling getpwuid_r.Thiago Macieira2011-02-081-1/+1
| | | | | | | | | | | | | | On some systems, sysconf may return -1 to indicate that there's no such limit (limitless), so don't create a buffer of size -1. Reviewed-by: Bradley T. Hughes
| * Fix compilation error: symbol is namespaced.Thiago Macieira2011-02-081-0/+2
| | | | | | | | Reviewed-by: Rohan McGovern
| * Don't crash when creating backtrace for built-in JS function (2nd try)Kent Hansen2011-02-086-5/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 147df10403ba280b3f04c1e3d6c4b1cf386abe5d did not quite fix the issue; other places need the same checks. When the JIT is enabled, frames for built-in JS host calls (such as Array.prototype.forEach) are not fully initialized. In particular, the CodeBlock register of such frames is not set (see comment in JITCall.cpp). We need to check if the codeBlock is actually valid before we start using it. This fixes the crash(es) but not the problem of actually getting the arguments for such frames through the API. There's also a related problem when a QtScript function (newFunction()) is called as a callback of a built-in JS host function (QTBUG-17287). These problems will go away once JavaScriptCore is updated to a more recent version (4.8 at the earliest), since the native-vs-script frame handling has been unified. Task-number: QTBUG-17137 Reviewed-by: Olivier Goffart
| * Revert "Improved performance of mapFromGlobal/mapToGlobal on X11"Denis Dzyubenko2011-02-071-28/+0
| | | | | | | | | | | | | | This change introduced regressions with some window managers (for example with metacity when you maximize the window) This reverts commit cdd776a91e65bf5c30cea1bab9823134a3f797d0.
| * QtDBus: do not wait for reply for AddMatch and RemoveMatchThiago Macieira2011-02-061-24/+14
| | | | | | | | | | | | | | | | We can't recover from these functions failing anyway, so don't ask for an error condition. The D-Bus library will set the no-reply flag under these conditions. Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
| * Make qdbus show all types, even those that it doesn't know aboutThiago Macieira2011-02-062-3/+26
| |
| * Doc: Fix the docs saying what the locale codec is used forThiago Macieira2011-02-061-2/+1
| |
| * Autotest: simple improvementsThiago Macieira2011-02-061-2/+4
| |
| * Autotest: Use QElapsedTimer for timingsThiago Macieira2011-02-061-2/+2
| |
| * directfb: Pixmap creation always premultiplied the alpha even when it is ↵Denis Oliver Kropp2011-02-041-18/+4
| | | | | | | | | | | | | | | | | | already premultiplied in the image. This also avoids the temporary surface and blitting. Merge-request: 990 Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
| * Don't crash when BMP color table is brokenHarald Fernengel2011-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | If the BMP's number of color table entries is out of bounds, we would resize our color table vector to a silly value, leading to crashes later on. If the number of color table entries is larger than 256, just stop processing the BMP since it's most probably corrupt. Task-number: QT-4534 Reviewed-by: Robert Griebl
| * Designer: Fix a crash in the Signal-Slot-Editor.Friedemann Kleint2011-02-042-13/+11
| | | | | | | | | | | | | | | | | | Object search found deleted widgets by name when searching on the form window. Search main container instead, do not assert. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-17179
| * complain about unmatched quotes/parensOswald Buddenhagen2011-02-031-1/+12
| | | | | | | | | | | | | | | | using WarnDeprecated instead of WarnParser is a bit backwards, but we need something which is on by default and i don't feel like introducing a second parser warning mode for that. Reviewed-by: mariusSO
| * use const refOswald Buddenhagen2011-02-031-1/+1
| | | | | | | | Reviewed-by: mariusSO
| * move multiple inclusion check for feature files to correct locationOswald Buddenhagen2011-02-031-3/+3
| | | | | | | | | | | | | | | | | | | | previously, features specified with an absolute path would not be covered by the multiple inclusion guard, unlike the one specified just by a name. this is of theoretical value only, as nobody specifies features via absolute path anyway ... Reviewed-by: mariusSO
| * Don't crash when creating backtrace for built-in JS functionKent Hansen2011-02-032-1/+17
| | | | | | | | | | | | | | | | | | | | | | When the JIT is enabled, NativeFunctionWrapper (used for built-in functions such as Array.prototype.forEach) inherits JSFunction, so we must check whether the function is actually a JS (script) function before we start accessing script-specific properties. Task-number: QTBUG-17137 Reviewed-by: Olivier Goffart
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-0812-31/+57
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed compilerwarnings regression in public headers. Fix duplicate definition error Fix namespace error Fix the broken QPixmap::fromSymbianRSgImage(). Fix native child window Symbian decoration handling. Fixed "not a valid preprocessing token" on GCCE. Avoided the Linux version of the --no-undefined switch. Added missing edllstub.lib for GCCE. symbian/linux-gcce: Use -u _E32Dll when linking DLLs Revert "Implement Symbian support for enable_backup CONFIG value" Implement Symbian support for enable_backup CONFIG value Fix deployment issues with networkselftest Fix random crashes when bearer suddenly goes down Fixed a bug where the softkeys would leave a see-through "hole".
| * | Fixed compilerwarnings regression in public headers.axis2011-02-081-2/+2
| | | | | | | | | | | | RevBy: Trust me
| * | Fix duplicate definition errorShane Kearns2011-02-071-4/+0
| | | | | | | | | | | | | | | | | | | | | As the metatype declaration is now in the qnetworksession header file, it is not needed in the test code (and causes compile error on some platforms) Reviewed-By: Markus Goetz
| * | Fix namespace errorShane Kearns2011-02-071-3/+3
| | | | | | | | | | | | Reviewed-by: Olivier Goffart
| * | Fix the broken QPixmap::fromSymbianRSgImage().Laszlo Agocs2011-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The retrieved VGImage handle was accidentally assigned to a local variable instead of the member with the same name so it always ended up creating an empty pixmap. Reviewed-by: Jani Hautakangas
| * | Fix native child window Symbian decoration handling.Jani Hautakangas2011-02-062-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | Resizing native child window like QVideoWidget caused S60 cba and status pane to appear. Task-number: QTBUG-17040 Reviewed-by: Gareth Stockwell
| * | Fixed "not a valid preprocessing token" on GCCE.axis2011-02-041-1/+1
| | | | | | | | | | | | | | | | | | It seems to be fixed upstream already. RevBy: Gareth Stockwell
| * | Avoided the Linux version of the --no-undefined switch.axis2011-02-041-1/+1
| | | | | | | | | | | | RevBy: Trust me
| * | Added missing edllstub.lib for GCCE.axis2011-02-041-0/+1
| | | | | | | | | | | | RevBy: Trust me
| * | symbian/linux-gcce: Use -u _E32Dll when linking DLLsMartin Storsjo2011-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required when using older binutils versions (CodeSourcery 2009q1 requires it, while CodeSourcery 4.4-172 doesn't require it) with the linux-gcce mkspec. The -u option is already used in the same way for exe files, and the abld build system invokes ld with -u _E32Dll, too. Signed-off-by: axis <qt-info@nokia.com> Merge request: 2560
| * | Revert "Implement Symbian support for enable_backup CONFIG value"Miikka Heikkinen2011-02-043-41/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit 10c7730877d314ec4eda6728e2d66c38beff8d62. Maemo/Meego support for this needs to be verified before this can be added so reverting this for now.
| * | Implement Symbian support for enable_backup CONFIG valueMiikka Heikkinen2011-02-043-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The enable_backup CONFIG value can be used to generate deployment for backup registration file for an application. BACKUP_REGISTRATION_FILE variable can be used to specify a custom backup registration file. Task-number: QTBUG-17214 Reviewed-by: axis
| * | Fix deployment issues with networkselftestShane Kearns2011-02-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Changed deployment in the .pro file from = to += so that the default executable deployment is not removed. Also added required symbian capabilities Reviewed-by: Markus Goetz
| * | Fix random crashes when bearer suddenly goes downShane Kearns2011-02-044-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. QNetworkSession being deleted from the closed signal caused data abort or E32User-CBase 49 panics. (both observed) 2. Potential E32User-CBase 46 panic in ConnectionProgressNotifier::StartNotifications() Reviewed-by: Aaron Tunney Reviewed-By: Markus Goetz Task-Number: QTBUG-17196
| * | Fixed a bug where the softkeys would leave a see-through "hole".axis2011-02-041-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where the widget was created from the event loop instead of main(), the middle three softkeys would not get the right visibility and would leave a "hole" in the application where one could see what was beneath it. It could also be clicked, which would bring the app to the background which was really annoying. Fixed by setting the visibility manually upon creation. It should still be possible to alter the visibility of the toolbar manually after the widget creation, if someone requires that. Task: QTBUG-16578 RevBy: Gareth Stockwell AutoTest: N/A, but tested with various combinations of fullscreen, non-fullscreen and softkey visibility modes. No regressions.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-02-0828-210/+578
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc: Fixed warnings and other problems found while fixing markup. Doc: Adding documentation on configure options for Qt configure Ensured that trailing newlines are quoted and correct atoms are used. Fixed build breakage. Fixed C++ and plain markup found in \c commands. Doc: Document display-orientation-related widget attributes. Added a configuration variable for the QML documentation file prefix. Doc: Renamed a tutorial image to avoid a clash with another image.
| * \ \ Merge branch '4.7-review' into 4.7Sergio Ahumada2011-02-08412-2116/+16202
| |\ \ \
| | * \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-02-0712-25/+26
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Fixed warnings and other problems found while fixing markup.
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-071-0/+287
| | | |\ \ \
| | | * | | | Doc: Fixed warnings and other problems found while fixing markup.David Boddie2011-02-0712-25/+26
| | | | | | |
| | * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-02-07425-2170/+16506
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (207 commits) Doc: Adding documentation on configure options for Qt configure Ensured that trailing newlines are quoted and correct atoms are used. Fixed build breakage. Fixed C++ and plain markup found in \c commands. Doc: Document display-orientation-related widget attributes. Added a configuration variable for the QML documentation file prefix. Fixed wrong casing of a Symbian library. Fixed wrong static library extension on Symbian. Fixed library casing. Remove dependencies to pre-Symbian3 platforms from Symbian3 packages My changes 4.7.2 Don't accept input methods when a TextEdit or TextInput is read only. Correct error message On windows xp using a higher port makes the declarativedebug* tests work Correct assert Fix for QTBUG-17035 Fix qt.sis platform dependencies for Symbian^3 builds. Fix QMutex can deadlock when calling tryLock Carefull free the data from XGetWindowProperty on X11. Fixes memory leaks in QX11Embed ...
| | | * | | | Doc: Adding documentation on configure options for Qt configureMorten Engvoldsen2011-02-071-0/+287
| | | |/ / /
| | | * | | Ensured that trailing newlines are quoted and correct atoms are used.David Boddie2011-02-052-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newlines after comments at the end of files were previously omitted. An assumption about the type code being quoted caused incorrect CSS classes to be used and extra HTML elements to be used.
| | | * | | Fixed build breakage.David Boddie2011-02-041-1/+1
| | | | | |
| | | * | | Fixed C++ and plain markup found in \c commands.David Boddie2011-02-041-6/+25
| | | | | |
| | | * | | Doc: Document display-orientation-related widget attributes.David Boddie2011-02-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mread
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-04411-1986/+15955
| | | |\ \ \
| | | * | | | Added a configuration variable for the QML documentation file prefix.David Boddie2011-02-0310-175/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This required a certain amount of refactoring to make the new variable visible to the relevant parts of the code. I also moved the fullDocumentLocation() function into the HtmlGenerator class, where it belongs. Task-number: QTBUG-17071