summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.5'Bill King2009-07-0835-375/+1929
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/ibase/qsql_ibase.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qsqldatabase/tst_databases.h tests/auto/qsqldatabase/tst_qsqldatabase.cpp translations/qt_ru.ts
| * Update QGroupBox on focusBenjamin Poulain2009-07-081-5/+1
| | | | | | | | | | | | | | | | We cannot assume the position of the decorations when a QGroupBox get the focus. Task-number: 257660 Reviewed-by: Thierry
| * don't drop all location tags after the first file without anyOswald Buddenhagen2009-07-081-2/+3
| | | | | | | | Task-number: 256647
| * make test behave like othersDerick Hawcroft2009-07-081-1/+1
| |
| * Make the table actually delete before the autotestBill King2009-07-081-1/+1
| |
| * Cleanup more SQL autotest failures.Bill King2009-07-083-12/+28
| |
| * Fixes Dericks inf/nan patch for msvcBill King2009-07-081-0/+13
| |
| * safely drop tables.Derick Hawcroft2009-07-081-1/+3
| |
| * remove debugDerick Hawcroft2009-07-071-1/+0
| |
| * Auto test for task 233829Derick Hawcroft2009-07-071-1/+29
| | | | | | | | | | | | - postgreSQL specific autotest. Task-number:233829
| * Handle special number cases (nan,{+-}infinity) in PostgreSQLDerick Hawcroft2009-07-071-0/+17
| | | | | | | | | | | | | | | | | | When contructing the EXECUTE statement, there is a special case that we need to handle whereby we explicitly put quotes around the special float values before submutting the statement for execution Task-number:233829 Reviewed-by: Bill King
| * Stop showing then hiding windows on starting designer in top-level mode.Norwegian Rock Cat2009-07-071-3/+2
| | | | | | | | | | | | | | | | | | We've had this since 4.5 and it's very annoying to see the window show and quickly hide itself. I was hoping it wasn't a bug in Qt, and it turns it isn't and it was happening on all platforms. Reviewed-by: Friedemann Kleint Shout outs: João for testing.
| * Document limitation in Cocoa cursor handling.Norwegian Rock Cat2009-07-071-0/+5
| | | | | | | | | | | | | | | | | | | | It seems there is a bug in AppKit which will automatically reset a cursor even when it is grabbed, but won't reset it when it's brought back into the window. The upshot of this is that doing a setCursor() inside of mouse handling behaves slightly different than on the other platforms (including Carbon). However, we are at the mercy of Cocoa here and I would rather have all the other things AppKit does right and live with this bug which they may fix some day.
| * 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
| * Fix more sql autotest failures.Bill King2009-07-061-3/+4
| | | | | | | | | | | | Sql server fails at numeric field calculations. (Confirmed by running against MySql via odbc). Also, quote fields properly. The drivers know how to do it correctly, so let them handle it.
| * Fix precision autotest for SqlServerBill King2009-07-061-6/+7
| | | | | | | | | | Sql Server can't count. Reduce the expected length of string when we're on sql server.
| * 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
| * Fix up two more qsqldatabase autotests.Bill King2009-07-031-1/+8
| |
| * 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
| * Minor: fix spelling in configure.exe -help output.Thiago Macieira2009-07-021-1/+1
| | | | | | | | Reported via qt-bugs
| * 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
| |
* | QPropertyAnimation: save a Q_GLOBAL_STATICThierry Bastian2009-07-081-10/+8
| | | | | | | | | | This is possible because we anyway use a Mutex to access the static hash
* | Fix possible crash in QDockAreasThierry Bastian2009-07-081-1/+1
| |
* | Define M_PI in qmath.h if not defined by math.h (as is the case on Windows), ↵Volker Hilsheimer2009-07-083-8/+4
| | | | | | | | and remove duplicate defines elsewhere.
* | Make test pass when executed from debug/release directory.Volker Hilsheimer2009-07-081-0/+3
| |
* | QMainWindow: fix the use of animation and improve code qualityThierry Bastian2009-07-083-52/+38
| |
* | Compile fix for the qapplication autotest.Denis Dzyubenko2009-07-081-25/+43
| | | | | | | | Reviewed-by: TrustMe
* | autotest compile fix for MacOSXThierry Bastian2009-07-081-1/+1
| |
* | doc: Output a clearer "All functions in this class are..." statement.Martin Smith2009-07-084-53/+156
| | | | | | | | Task-number: 189232