summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| | * Code cleanupAnders Bakken2009-07-011-48/+36
| | | | | | | | | | | | | | | | | | | | | Move the code from QDirectFBPaintEnginePrivate::(end|begin) into QDirectFBPaintEngine::(end|begin) Reviewed-by: TrustMe
| | * Doc: clearifying docs - QProgressDialogMorten Engvoldsen2009-07-011-1/+1
| | | | | | | | | | | | | | | | | | Clearifying details on a warning about a function call (setValue()) Task-number: qtp 4.5Workarea
| | * Fixed the build on Windows after regenerating the unicode tables.Denis Dzyubenko2009-07-011-2/+2
| | | | | | | | | | | | Reviewed-by: trustme
| | * Doc: correcting typoMorten Engvoldsen2009-07-012-2/+2
| | | | | | | | | | | | | | | | | | Correcting typos Task-number: 257225
| | * Regenerated unicode tables after the fix in the generator.Denis Dzyubenko2009-07-012-6693/+6694
| | | | | | | | | | | | | | | | | | | | | This is related to the following fix: 70137e0601549af1056082cdfbb4f141c70befab Reviewed-by: trustme
| | * Document unified toolbar change with regard to full screen change.Norwegian Rock Cat2009-07-011-3/+4
| | |
| | * Don assume QVariant::String data is going to always be unicode in QODBCDerick Hawcroft2009-06-301-1/+1
| | | | | | | | | | | | | | | | | | - as was not the case for the psqlODBC driver Reviewed-by: Bill King
| | * Fix Toolbars in unified toolbar looking bad Carbon w/Fullscreen changesNorwegian Rock Cat2009-06-301-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug in the Carbon code when an item went in full-screen, than out with a unified toolbar. In those cases the toolbars would end up getting but into the mainwindow area. The reason this was happening was that we were calling transferChildren() after we had set up our toolbar. This cause problems because we end up pulling the QToolbars right out of the unified toolbar. The easiest way to solve this is to just update the status on it again. This should solve any issues. I also added some logic to avoid calling this too many times in that one case. Luckily, this seems to only affect Carbon. Task-number: 254462 Reviewed-by: Jens Bache-Wiig
| | * Doc: Fixed a doc bug in QPlainTextEdit class description.Geir Vattekar2009-06-301-7/+7
| | | | | | | | | | | | | | | Task-number: 256762 Reviewed-by: TrustMe
| | * Doc: About menu on the Mac gets the application name from Info.plist.Geir Vattekar2009-06-302-3/+6
| | | | | | | | | | | | | | | Task-number: 256818 Reviewed-by: Trenton Schulz
| | * fix crash in QLocalServer on WinCE when waitForNewConnection times outJoerg Bornemann2009-06-301-1/+1
| | | | | | | | | | | | Reviewed-by: mauricek
| | * QWidget::adjustSize() sends a spontaneous event - Mac OS X CocoaPrasanth Ullattil2009-06-302-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | The windowDidResize notification now differentiates an internally triggered resize from a user triggered resize. Task-number: 256269 Reviewed-by: Norwegian Rock Cat
| | * bug fixDerick Hawcroft2009-06-301-0/+1
| | | | | | | | | | | | | | | | | | | | | - case for QVariant::Bool in switch statement was missing Task-number: 215511 Reviewed-by: TrustMe
| | * Remove unused variablesAnders Bakken2009-06-291-2/+0
| | | | | | | | | | | | | | | | | | These variables are never used. Reviewed-by: TrustMe
| | * Remove superfluous call to SetBlittingFlagsAnders Bakken2009-06-291-1/+0
| | | | | | | | | | | | | | | | | | We already do this in QDirectFBWindowSurface::scroll Reviewed-by: TrustMe
| | * QTemporaryFile: Report the user-provided openModeJoão Abecasis2009-06-291-1/+2
| | | | | | | | | | | | Reviewed-by: Thiago
| | * Always turn on shadows for Cocoa.Norwegian Rock Cat2009-06-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frameless windows wouldn't get shadows in Cocoa, which they do in Carbon. You can argue over who is more correct, but the fact is they can't be inconsistent. Since Cocoa is the newcomer, I'm bending that. Though it would seem useful to have an ability to provide some developer control over the shadow. At the moment, the only thing we have to ensure is that we always turn on the shadow. Task-number: 254725 Reviewed-by: Denis
| | * QNetworkAccessManager stuff: Some fixes for coverityMarkus Goetz2009-06-293-6/+13
| | | | | | | | | | | | | | | | | | A few "fixes" to make that number go down.. Reviewed-by: Thiago Macieira
| | * Fix crash/artifacts on SuperHTom Cooksey2009-06-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SuperH to the ever growing list of architectures which can't correctly dereference a short* which is not 16-bit aligned. Turning this into a white-list rather than a black list might make sense at some point, but as QT_ARCH_I386 isn't defined on windows, the white list looks even uglier at the moment. :-) Task-number: 257077 Reviewed-by: TrustMe
| | * Remove a couple of registry entries when unregistering an ActiveX serverAndy Shaw2009-06-291-0/+4
| | | | | | | | | | | | | | | | | | These two entries were not removed since the server was an OOP server Reviewed-by: Prasanth
| * | Merge branch 'warningRemovals'axis2009-07-0628-71/+31
| |\ \
| | * | Removed unused static data in Symbian and others.axis2009-07-061-0/+2
| | | |
| | * | Started suppressing some rather pointless warnings from RVCT.axis2009-07-062-0/+2
| | | |
| | * | Fixed warnings because of multiple macro definitions.axis2009-07-062-2/+2
| | | |
| | * | Fixed out-of-order construction.axis2009-07-061-2/+3
| | | |
generated by cgit v0.12 at 2025-01-09 07:47:28 (GMT)