summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-07-232-5/+5
|\
| * Fixed compile of Qt/symbian projects which set a custom MOC_DIRRohan McGovern2009-07-232-5/+5
| | | | | | | | | | | | | | | | | | or UI_HEADERS_DIR. This win32-specific path logic needs to get executed when the _host_ platform is win32, not the _target_. Acked-by: mstormo
* | 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.
* Fixed fluidlauncher deployment when webkit is not build.Janne Anttila2009-07-221-7/+12
| | | | | | FluidLauncher used deployment statements to deploy anomaly browser always. This crated the Symbian .pkg files with those files. Since the dependencies were not built, the makesis failed.
* 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
* Recompiled configure.exe with MSVC6.axis2009-07-151-0/+0
|
* Fix configure.exe when more than 256(!) else-ifs are required.Jason Barron2009-07-151-5/+5
| | | | | | | | | | | | The introduction of the additional 'continuousElse' statement was flawed because once the variable is toggled to true by the first else block, it remains true for the second block even if the option was found so these options will eventually hit the "Unknown option" error in the final else case. The workaround is not to re-use the variable for each block, but instead use an array of bools. One element of the array per 'continuousElse' check. This should probably be refactored soon-ish :)
* Make S60 integration optional.Jason Barron2009-07-1547-165/+270
| | | | | | | | | | | | | | 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-142-0/+33
| | | | | | | | | | | | | | | | | | 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>
* Made deployment paths with drive letters work.axis2009-07-131-1/+5
|
* 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.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicDavid Boddie2009-07-0911559-244844/+670567
|\ \
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-07-091-3/+3
| |\ \
| | * | 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.
| * | | Recompiled configure.exe with MSVC6.axis2009-07-091-0/+0
| |/ /
| * | Merge commit 'origin/master'Jason Barron2009-07-091-0/+3
| |\ \
| | * | Make this test slightly more easy to work with.Frans Englich2009-07-091-0/+3
| | |/
| * | 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-09355-7656/+17030
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-098-15/+53
| | |\
| | | * Switched to asynchronous focus handling on Symbian.axis2009-07-097-14/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Added some extra cleanup for QWidget autotest.axis2009-07-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These leftovers made some tests fail on Symbian due to focus issues. RevBy: Trust me 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.
| | * Fixed qmake "not found" error.axis2009-07-071-0/+0
| | |
| | * configure.exe recompiled with MSVC6.axis2009-07-071-0/+0
| | |
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-07-07270-7263/+16334
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Update Russian translation for Qt Assistant adpRitt Konstantin2009-07-061-46/+243
| | | | | | | | | | | | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * Update Russian translation for Qt AssistantRitt Konstantin2009-07-061-43/+37
| | | | | | | | | | | | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * Update Russian translation for Qt HelpRitt Konstantin2009-07-061-18/+18
| | | | | | | | | | | | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * Add basic Russian translation for qtconfigRitt Konstantin2009-07-062-0/+907
| | | | | | | | | | | | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * Add Russian translation for qvfbRitt Konstantin2009-07-062-0/+329
| | | | | | | | | | | | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * Update Russian translation for Qt Linguist.Ritt Konstantin2009-07-061-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typo fixes; clarify several strings; use 'own languages' hack Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * Update Russian translation for Qt libraries.Ritt Konstantin2009-07-061-108/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | almost done; only few strings left untranslated. Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * Update Russian Qt phrase bookRitt Konstantin2009-07-061-10/+42
| | | | | | | | | | | | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * 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
| | | * Removed superfluous code in assistant's search module.ck2009-07-063-16/+6
| | | | | | | | | | | | | | | | Reviewed-by: kh
| | | * Fixed race condition in search module.ck2009-07-063-15/+21
| | | | | | | | | | | | | | | | | | | | Task-number: 257441 Reviewed-by: kh
generated by cgit v0.12 at 2024-11-25 01:40:34 (GMT)