summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Trailing whitespace and tab/space fixes for QtNetworkJanne Anttila2009-08-0314-123/+122
|
* Restored window title after another top-level window was closed.Janne Anttila2009-07-311-3/+9
| | | | | | | | | | | | | Task: 249995 The window title in S60 is global entity, i.e. is located in application status pane. When top level window, for example mesage box is closed, the window title has to be restored for window which is getting the focus. This way we don't leave title from destroyed window to title bar. It is also into question, whether the non-maximized dialogs should set title to statuspane at all. For now they will, but things may change if we switch to use native dialogs.
* Removed unnecessary code, UID is associated to wserv by framework.Janne Anttila2009-07-311-5/+0
| | | | | | | | | | This code was inialy added before we had s60main. Since that time we did not had S60 application framework classes constructed we had to associate application UID to wserv manually to get fast swap window (FSW) working correctly. Now application frameworks take care of associating the UID to wserv window group.
* Removed tiff libarary warning: `inline' redefined.Janne Anttila2009-07-301-0/+2
| | | | | Since inline is defined by platform, it should be safe to leave it as is, and not to tuch the definition here at all.
* Added some spaces to pkg_prerules statements to make output more readable.Janne Anttila2009-07-301-1/+4
|
* Swicthed back to original way of using AddToStackL and RemoveFromStackJanne Anttila2009-07-301-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | Task: 258504 This commit fixes the problem that background widgets do not get orientation change events, and thus will not be correctly layouted after the foreground windget is closed. See also: c17c1c101cbe09d4c6149ef8e76a9bb792222456 At the time when commit c17c1c101cbe09d4c6149ef8e76a9bb792222456 was created there were no SetFocus calls in hide_sys and show_sys. I think that has been the root cause why focus change event has not been generated. I.e. hiding a CCoeControl in Symbian (MakeVisible) does not generate focus event but setFocus(false/true) generates. I tried this code with Drilldown example. In city detaisl view the combobox was working fine with keypad navigation. The change had no effects to qcombobox autotest results and qwidget autotest resutls were better on some run and a bit worse on some run. There was variation in 2-4 qwidget autotest results on each run. Note also that screensaver seems to affect to test results.
* Extended PKG customization possibilities via qmake.Janne Anttila2009-07-291-3/+12
| | | | | | | | | | | | | | | | | | | Task: 242139 This commit replaces Symbian specific 'depends' keyword in qmake DEPLOYMENT variable with two more generic ones. The new keywords are 'pkg_prerules' and 'pkg_postrules', and they allow developer to pass raw data to PKG file. The strings in 'pkg_prerules' are added before PKG file package-body headers and 'pkg_postrules' after them. Correspondingly as old 'depends' keyword, the new keywords are not parsed by qmake, so they must be in a format understood by Symbian package generation tools. Note that 'pkg_prerules' can also replace default language, package-header and vendor statements in pkg file. If you decide to override any of these statements, you need to pay attention that also other statements stay valid.
* Small optimization.Aleksandar Sasha Babic2009-07-241-0/+4
| | | | Do not use route info for addresses other than IPV4.
* For some reason interface info on Symbian will notAleksandar Sasha Babic2009-07-241-2/+59
| | | | | | | | | | | | | give neither correct netmask nor broadcast address. But, experiments show that route info can be used to obtain netmask. Then is easy to calculate broadcast address. Idea is to match interface and destination address from routeinfo entry, and then to use given netmask. "Machines take me by surprise with great frequency." Alan Turing(1912 - 1954)
* Implemented setWindowIcon for S60 devices without context pane.Janne Anttila2009-07-231-0/+36
| | | | | | | | | Task: 258582 All S60 versions does not have context pane in status bar area, that's why the window icon was not shown on those devices. Fortunately there was another API (CAknTitlePane::SetSmallPicture) whicch can be used to put graphics next to title.
* Removed few compiler warnings when using NokiaX86 compiler.Janne Anttila2009-07-222-1/+2
|
* Increased default stack size for QThreads on Symbian.axis2009-07-161-0/+7
| | | | | | | | | | | | | | | It can be debated whether this is a bug or not, and whether or not we should rely on the Symbian default. Our rationale was that the default size caused even the simplest tasks to fail (the task talked about a file copy crashing), so we decided to increase the headroom. Those that want to minimize the stack size can do so manually with setStackSize(). We go by the old API design slogan: Make the simple tasks easy, and the advanced tasks possible. RevBy: Jason Barron Task: 253666
* Make S60 integration optional.Jason Barron2009-07-1544-158/+239
| | | | | | | | | | | | | | This is more a cleanup of the usage of Q_WS_S60 vs. Q_OS_SYMBIAN than anything else. One of the side effects of this work was that it was relatively little work to get QtGui compiling when Q_WS_S60 is not defined. Based on this we introduce two new configure options that control S60 integration. Currently the -no-s60 option will not work entirely because the 's60main' module has not yet been refactored and still has a dependancy on the S60 libraries. Reviewed-by: axis <qt-info@nokia.com>
* Fixed a consistency problem in the backing store.axis2009-07-141-0/+4
| | | | | | | | | | | | | | | | | | Widgets maintain an internal state (inDirtyList) which says whether that widget is in the backing store's list of dirty widgets. Naturally this list has to be kept in sync with the actual list contents. This did not happen if the backing store was destroyed and recreated; if the list had any contents it would be destroyed without resetting the widget flags. Destroying and recreating the backing store is common on S60 where we try to save memory. Fixed by making sure those flags are reset during backing store destruction. Done together with Jason. RevBy: Jason Barron RevBy: bnilsen AutoTest: Included
* Fixed a bug where the input panel would not show up.axis2009-07-132-1/+32
| | | | | | | | | | | | | Task: 257214 The problem happened if a user called setFocus() on an input capable widget, and then tried to open the input panel by sending an event. Since the call to InputCapabilitiesChanged is asynchronous, Symbian would not yet know about the updated state, and the event would be lost. Now we generate our own asynchronous event, and ensure that it is synchronous in the cases where it's needed.
* Fixed a bug where input capabilities would not be updated.axis2009-07-132-8/+8
| | | | | | | | Task: 257215 The capabilities would not be updated if the IM hints were the same. We still try to avoid that when we can, but now we update the capabilities if we really have to.
* Make non-zero timers high priority.Johannes Oikarinen2009-07-131-2/+3
| | | | | | | | | Timers are constructed with CActive::EPriorityHigh if they are non-zero timers. If zero timer CActive::EPriorityLow is used. Task: 256620 Signed-off-by: axis <qt-info@nokia.com>
* Fix plugins properly.Jason Barron2009-07-101-1/+2
| | | | | | The 'else' block is not the correct place to add the s60 subdir because this will also build the plugin for other non-unix platforms which is not correct. It should be built on symbian.
* someone forgot this import module: s60Liang Qi2009-07-101-1/+1
|
* Compile OpenVG paint engine after QScopedPointer changes.Jason Barron2009-07-101-1/+1
| | | | Do the same fix as with the OpenGL paint engine.
* Merge branch 'fixing_tst_qdatetimeedit'axis2009-07-104-86/+93
|\ | | | | | | | | Conflicts: src/gui/kernel/qkeysequence.cpp
| * Restructured some code that had flawed logic.axis2009-07-091-8/+10
| | | | | | | | | | | | | | | | | | A different codepath was taken when QT_KEYPAD_NAVIGATION was defined, despite keypad navigation itself being off. Now it should behave the same in both cases. This helped the autotests to pass on Symbian. AutoTest: Passed RevBy: Trust me
| * Added key sequences for Symbian.axis2009-07-093-76/+81
| | | | | | | | | | It's probably not complete, and most of them were found by trial and error, so feel free to fix any issues.
* | Compile the OpenGL2 paint engine after the QScopedPointer changesJason Barron2009-07-091-3/+3
| | | | | | | | | | | | This part of the code was not tested on Symbian so it's failure went unnoticed. This should get it compiling on platforms that use the OpenGL2 paint engine.
* | Fix compilation after merge.Jason Barron2009-07-091-1/+1
| | | | | | | | | | Don't want this enum value to have the same as another enum value since that obviously doesn't work in a switch statement.
* | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-0984-7107/+7082
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
| * Merge branch 'fixing_tst_qdatetimeedit'axis2009-07-097-15/+41
| |\
| | * Switched to asynchronous focus handling on Symbian.axis2009-07-096-14/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done in order to be more in line with what other platforms (at least X11) do. In addition, it prevents show() from entering event handlers in Qt. That should only happen in processEvents(). This required the introduction of a new event, SymbianDeferredFocusChanged, which we post whenever there is a focus change. RevBy: Jason Barron AutoTest: Passed
| | * Removed a warning.axis2009-07-091-1/+1
| | |
| * | Fix compilation on WinCE by using correct scopes.Jason Barron2009-07-071-1/+1
| |/ | | | | | | | | | | | | A scope is not an else case unless it is explicitly preceded by the 'else' keyword. This was causing the 'symbian' block to be treated as a separate block and therefore WinCE was hitting the 'else' case which caused several subdirs to be added a second time.
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-07-0734-6921/+6920
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/network/access/qhttpnetworkconnection_p.h tests/auto/qstyle/qstyle.pro tests/auto/qstyle/tst_qstyle.cpp tools/configure/configureapp.cpp configure.exe will be recompiled in next commit. Took ours.
| | * Fix typo in color calculation.Norwegian Rock Cat2009-07-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Argh! It's divide by 256 not 265. The worst part was that I used the same values in Cocoa as well, so they were both "damaged." It should be good now. Task-number: 257499 Reviewed-by: Prasanth Ullattil
| | * Handle all PostgreSQL notifications sitting in the queueDerick Hawcroft2009-07-071-4/+4
| | | | | | | | | | | | | | | Task-number: 257247 Reviewed-by: trustme
| | * Fix issue where a mainwindow would show two size grips in Cocoa.Norwegian Rock Cat2009-07-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OK. this is a bit strange. It seems the topdata->resizer value is used to control whether or not we should show a resize handle based on a count (0 no, non-zero yes). Since we somehow decided that this value will never be larger than 15, we made it 4-bits wide. There's a "Qt/Mac" API, QWidgetPrivate::qt_mac_update_sizer(QWidget *, int = 0) which would adjust this value by the int passed in.. We use that in several places, not excluding the QStatusBar where we would pass 1 if we want to show, and -1 if we didn't. Now if you subtract -1 from zero when you are 4 bits wide, well, bad things happen. Therefore protect that (since if it's at zero we have succeeded, we don't want to show the resizer). This seems to work well. The private API is certainly an interesting way of solving the problem, but is easy to abuse (for example, this code will break if resizer = 1 and we are passed -2 in the function. Task-number: 257485 Reviewed-by: Prasanth Ullattil
| | * Implement QApplication::setOverrideCursor to use pure Cocoa callsNorwegian Rock Cat2009-07-061-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems this was a victim of our cursor fixing. Cocoa does a lot for us with setting cursors. This meant that we didn't need to do as much meddling and as a result qt_mac_set_cursor does nothing in Cocoa. Unfortunately, this broke setOverrideCursor. Luckily Cocoa has a stack that works exactly like Qt, so we can just use that. Task-number: 257507 Reviewed-by: Prasanth Ullattil
| | * Fixed dead code possibly leading to crash.Rohan McGovern2009-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Looks like this `&&' was meant to be `||'. QNetworkProxy::FtpCachingProxy is 5 so it's clearly impossible for type to be less than 0 and greater than QNetworkProxy::FtpCachingProxy. Reviewed-by: Aaron Kennedy
| | * Fixes ::record for dialect 3 named tables in interbase/firebird.Bill King2009-07-031-2/+2
| | | | | | | | | | | | | | | | | | The comparison was mistakenly only uppercasing one side, so mixed case table names were reporting back as if they weren't found for both QSqlDatabase::record() and QSqlDatabase::primaryIndex()
| | * Fixes invalid length for numeric fields in oracle.Bill King2009-07-031-1/+1
| | | | | | | | | | | | | | | When the precisionpolicy is high, and the field is numeric, it was getting confused as a string field and pulling the wrong length value.
| | * QDirectFBPaintEngine return if destRect is nullAnders Bakken2009-07-031-0/+2
| | | | | | | | | | | | Reviewed-by: Donald <qt-info@nokia.com>
| | * Better debug output for QDirectFBPaintEngineAnders Bakken2009-07-021-2/+5
| | | | | | | | | | | | | | | | | | Add unsupportedCompositionMode to the output. Reviewed-by: TrustMe
| | * Remove unused function viewUnderTransparentForMouseView in QCocoaView.Prasanth Ullattil2009-07-022-57/+0
| | | | | | | | | | | | | | | | | | | | | After we implemented hitTest for QCocoaView, this function is no longer used. Reviewed-by: Norwegian Rock Cat
| | * Drag and drop events are not delivered correctly in CocoaPrasanth Ullattil2009-07-022-8/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drag and drop events should consider the WA_TransparentForMouseEvents attribute like the mouse events. If this attribute is set for a widget, the event has to be passed to right widget under mouse. The widget is identified by calling hitTest. In such cases the leave event has to be delivered to the widget which actually accepted the enter event. Task-number: 252088 Reviewed-by: Norwegian Rock Cat
| | * Implement hitTestNorwegian Rock Cat2009-07-022-54/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cocoa calls hitTest on our view to determine if the view should get the mouse press. We always said, "yes" and did all the logic ourselves. Turns out that we can say "no" if I'm transparent to mouse events and remove all that code where we do all the work ourselves. Big maintenance win! For the time being I've kept the "transparentViewForEvent" method since it might be useful for others, but no one is using it at the moment and we may just kill it soon. HitTest should handle this situation correctly.
| | * Fix a regression where dynamic tooltips wouldn't show up in Cocoa.Norwegian Rock Cat2009-07-022-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracking of mouse events was only enabled when enableMouseTracking or Hover or a tooltip had been set explictly on the item, but this meant that the dynamic QEvent::Tooltips would never get dispatched. So, in order to help out people that might use this feature, all QCocoaViews must pay the mouse move event tax *sigh*. I added comments in the proper places so that we DO the right thing for a release where we can force the change in behavior. Task-number: 257320 Reviewed-by: Denis
| | * Fix oops in strcmp in QBuffer.Thiago Macieira2009-07-021-1/+1
| | | | | | | | | | | | | | | | | | Reported via qt-bugs. Reviewed-By: Peter Hartmann
| | * Add a note about this method not being safe in multithreaded contextsThiago Macieira2009-07-021-0/+7
| | |
| | * Tinyint is unsigned, force it to such.Bill King2009-07-021-1/+3
| | | | | | | | | | | | | | | Tinyint only supports 0-255, so mark it as unsigned despite sign flag, which have the time is inverted/wrong.
| | * Get more autotests passing/fixed up.Bill King2009-07-021-2/+5
| | |
| | * We still need to Flip in NO_WM modeAnders Bakken2009-07-021-1/+1
| | | | | | | | | | | | | | | | | | This ifdef was simply in the wrong place. Reviewed-by: Donald <qt-info@nokia.com>
| | * Make sure we check the right deviceAnders Bakken2009-07-011-2/+2
| | | | | | | | | | | | | | | | | | Also. Make sure to call QRasterPaintEngine::end() Reviewed-by: Donald <qt-info@nokia.com>