summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Inclusion of QtOpenVg overwrites all other modules in s60install.proSami Merilä2009-11-031-1/+1
| | | | | | | | The pro-file is missing '+' when it is adding QtOpenVg support for sis file. Task-number: None Reviewed-by: Janne Koskinen
* Fix cleanupstack crash on exit in Symbian OS 9.2Shane Kearns2009-11-032-6/+13
| | | | | | | | | | | | | | | | | | | | | | | Destroying the control environment also pops items from the original cleanup stack which is not owned by the control environment. This is a platform issue (and does not occur in 9.3 & 9.4). To avoid this causing a panic, the s60main is changed to not push items on the cleanup stack (instead, it TRAPs the call to main(), and deletes its allocations manually). A further 9.2 cleanup stack crash was caused when application construction fails (because of missing resource files). The resulting exception would bypass deleting the control environment, and return from main with the wrong cleanup stack active. This is resolved by doing the TRAP / cleanup / throw manually instead of using qt_trap_throwing (The control environment cannot be pushed to the cleanup stack, because it owns the cleanup stack at that time). This isn't a 9.2 specific bug, but rather is revealed by 9.2 because the missing resource file is non fatal in 9.3 and 9.4. Fixes many autotests which have crashed on S60 3.1 since the cleanup stack swapping patch. Reviewed-by: axis
* Fix for potential crash in S60 styleShane Kearns2009-11-031-7/+7
| | | | | | Leaving function called without a TRAP Reviewed-by: Sami Merila
* Fix crash in QApplication autotest introduced by native pixmaps (S60 3.1)Shane Kearns2009-11-031-11/+11
| | | | | | | | | | Problem was caused by S60 closing a handle under our feet when QApplication is destroyed. To avoid this, we open our own handle for the global lock instead of using the shared one inside CFbsBitmap. Also the global unlock/relock is not needed on S60 3.2 so this can be eliminated and save a few cycles (the function call was a no-op before) Reviewed-by: Jani Hautakangas
* Add the Symbian Foundation OS versionsShane Kearns2009-11-032-11/+28
| | | | | | | | | | | Symbian^1 - SV_SF_1 Symbian^2 - SV_SF_2 etc. This is for the benefit of developers working with the Symbian master codelines. Reviewed-by: axis
* QS60Style: impossible to open menu from styled QToolButtonSami Merilä2009-11-031-2/+34
| | | | | | | | | | | | | QS60Style ignores toolButton's menu indicator rect. This means that the button's menu cannot be triggered by the user, as the style does not draw the indicator at all. With this fix, style calculates a rect (including margins) for menu indicator and draws that (arrow down) into toolButton (by making the button bevel larger). Task-number: QTBUG-5266 Reviewed-by: Alessandro Portale
* Fixed compile error on Symbian emulator.axis2009-11-031-0/+1
| | | | RevBy: Trust me
* Fix tst_qwebpage and tst_qwebframe compilation on Symbian.Liang QI2009-11-034-2/+10
| | | | RevBy: TrustMe
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-03210-1575/+4231
|\
| * fix font height calculation on QWSJoerg Bornemann2009-11-031-1/+1
| | | | | | | | | | | | | | fontDef.pixelSize is a qreal now and we should round it after multiplication to avoid an accuracy loss. Reviewed-by: mae
| * WebKit compile fix for Windows CEJoerg Bornemann2009-11-031-0/+11
| | | | | | | | | | | | | | | | | | Not sure if this is right fix. We could also disable PLUGIN_PACKAGE_SIMPLE_HASH. But this is automatically enabled when NETSCAPE_PLUGIN_API is disabled. Reviewed-by: thartman
| * Fixed compilation on windows.Dmytro Poplavskiy2009-11-031-3/+3
| | | | | | | | Reviewed-by: trustme
| * Fixed qrand global static related problem.Dmytro Poplavskiy2009-11-031-19/+40
| | | | | | | | | | | | | | | | | | | | | | qrand() uses global static seed storage, but if used from destructors of other global static objects (directly or via ~QSettings() or QMap::insert()) the global static seed storage can be already deleted. Fallback to plain rand() in this case. Task-number: QTBUG-5218 Reviewed-by: Justin McPherson
| * Merge commit 'e4bec39a139363d1ee4cf3fb15a3fe4499215e77' into 4.6Thiago Macieira2009-11-0234-297/+1200
| |\
| | * Merge remote branch 'origin/4.6' into core-4.6Thiago Macieira2009-10-2913-106/+810
| | |\
| | * | Remove the posix_memalign and Win32 _aligned_mallocThiago Macieira2009-10-291-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MinGW doesn't have _aligned_malloc and posix_memalign doesn't have a realloc function. So use our own implementation in all platforms. Removing posix_memalign was reviewed by Brad, but I apparently lost the commit. Reviewed-by: Trust Me
| | * | Merge branch '4.6' into core-4.6Thiago Macieira2009-10-2920-449/+591
| | |\ \
| | * | | Fix compilation on Mac: there's no malloc.h thereThiago Macieira2009-10-291-5/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Update confusing qWarning message.Thiago Macieira2009-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| | * | | Fix compilation in QContiguousCache.Thiago Macieira2009-10-291-3/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | QLocalServer: block indefinitely when timeout value is -1Peter Hartmann2009-10-281-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... as described in the documentation. Furthermore: * use qt_safe_select to timeout correctly * return immediately when timeout value is 0 Reviewed-by: Oswald Buddenhagen
| | * | | Initialise the reserved bits to 0.Thiago Macieira2009-10-287-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is future compatibility: we must rely on them being 0 in older versions of Qt. Reviewed-by: Bradley T. Hughes
| | * | | Fix Qt containers to properly support types with strict alignments.Thiago Macieira2009-10-289-39/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QContiguousCache is a new type, so there are no binary compatibility issues. QHash and QMap didn't have any public qMalloc / qFree, so the entire logic is contained in .cpp code. However, since old code will not inform us of the alignment requirements, we need to add a bit to the structure to indicate whether strict alignment is in use or not. QList doesn't require any changes. For small, movable types, they're all stored in the pointer array itself, so they're aligned. For larger types, we use new(), so types with stricter requirements should define their own operator new(). QLinkedList cannot be fixed. It uses new() on the QLinkedListNode, which contains a T type. Sorry. QVector did have public qMalloc / qFree. I've moved the calls to the inner function and made it keep the old calls if the alignment requirement is below a certain threshold. The idea is that, if it's above, no one was using QVector anyway. Reviewed-by: Bradley T. Hughes
| | * | | Add the aligned versions of qMalloc/qRealloc/qFreeThiago Macieira2009-10-282-0/+103
| | | | |
| | * | | Add some STL compatibility for QContiguousCache and private inheritanceThiago Macieira2009-10-281-60/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The private inheritance ensures that we don't try to access the types under the wrong pointer. If we did that, we'd cause strict aliasing violations. Reviewed-by: Olivier Goffart
| | * | | Doc: add documentation for QDBusServiceWatcher class.Thiago Macieira2009-10-281-0/+163
| | | | |
| | * | | Add QDBusServiceWatcher class.Thiago Macieira2009-10-283-69/+393
| | | | |
| | * | | Add a warning to user's connecting to serviceOwnerChanged directlyThiago Macieira2009-10-281-1/+7
| | | | | | | | | | | | | | | | | | | | We want people to not use this signal directly.
| | * | | Stop using the NameOwnerChanged signal without arg0 in QtDBus itselfThiago Macieira2009-10-283-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using this signal to update the signal hooks when the remote service changed. That meant each Qt app received every single service creation, change or destruction. Now we only watch the services we're really interested in.
| | * | | Move the bulk of the signal connecting/disconnecting code to ↵Thiago Macieira2009-10-283-60/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDBusConnectionPrivate I'll need to recurse into the signal connection mechanism in the next commit.
| | * | | Fix the use of the owner when connecting the service "watcher".Thiago Macieira2009-10-282-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use null services to indicate we're not interested in the owner, but empty-but-not-null to indicate we don't know what the owner is. Since empty service names are not valid, this will mean that this rule won't match.
| | * | | Use the new argument-based rule-matching in QDBusAbstractInterface.Thiago Macieira2009-10-281-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | This allows us to listen only to the activations we're really interested in.
| | * | | Add new public API to QDBusConnection for connecting with stringThiago Macieira2009-10-282-22/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matching. The bus allows us to match string arguments when receiving messages. This is very useful for the NameOwnerChanged signal, whose first argument is usually what we're interested in. By using these new functions, you can restrict receiving of signals to those that you truly want, instead of receiving NameOwnerChanged for all services registered/unregistered on the bus.
| | * | | Add the ability for the match-rule builder to add argument matching.Thiago Macieira2009-10-283-6/+16
| | | | | | | | | | | | | | | | | | | | I'll use this feature to match the NameOwnerChanged signal from the bus.
| | * | | Merge remote branch 'origin/4.6' into core-4.6Thiago Macieira2009-10-2845-186/+20835
| | |\ \ \
| | * | | | Make QProcess report errors from a failed subprocess start.Thiago Macieira2009-10-271-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: João Abecasis
| | * | | | QAbstractSocket: insert timer to prevent timeoutPeter Hartmann2009-10-273-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a timeout that occurred on Mac with the gui event dispatcher: we were waiting for a write notification, but timed out when we were in closing state and still waiting for the socket engine to complete writing. Now we close the socket anyway after 2 seconds. Reviewed-by: Thiago Macieira
| | * | | | QAbstractSocket: wait with closing until all bytes have been writtenPeter Hartmann2009-10-279-7/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only disconnect from host when all bytes have been written; i.e. not only check whether the write buffer is empty, but also check whether the socket engine has still bytes to write. This is necessary for HTTP and SOCKS5 socket engine, because they both contain an inner TCP socket which also does buffering. For the native socket engine, there is no difference with this patch. Reviewed-by: Markus Goetz Reviewed-by: Thiago Macieira
| | * | | | QLibrary on Windows: Do not show error boxes when library load failsPeter Hartmann2009-10-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When loading a library fails, the error message "The application or DLL ... is not a valid Windows image. Please check this against your installation diskette." is shown, which is not very helpful. Task-number: QT-2357 Reviewed-by: Marius Storm-Olsen
| * | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-02189-1578/+3400
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'feature' into 4.6Jørgen Lind2009-11-0275-242/+499
| | |\ \ \ \ \
| | | * \ \ \ \ Merge commit 'origin/4.6' into featureJørgen Lind2009-11-02169-2310/+3603
| | | |\ \ \ \ \
| | | * | | | | | Reverts bf1a6bb6b3b8c98f6ab402512eb2f1996c2435c7Jørgen Lind2009-10-307-119/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and removes THREAD from qfeature Reviewed-by: Trust Me
| | | * | | | | | Fix GRAPHICSVIEWJørgen Lind2009-10-297-13/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | | * | | | | | Remove QT_NO_ICON from mimimalJørgen Lind2009-10-291-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | | | | Fix QT_NO_MAINWINDOWJørgen Lind2009-10-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | | * | | | | | FIX TABBARJørgen Lind2009-10-292-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | | * | | | | | Fix SHAREDMEMORYJørgen Lind2009-10-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | | * | | | | | Fix PROXYMODELJørgen Lind2009-10-293-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | | | | Fix TEXTCODECJørgen Lind2009-10-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: tom