summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-2918-31/+31
| | | | QTBUG-11938 and QTBUG-10801
* Fix compilation with QT_NO_TEXTCODECTasuku Suzuki2010-07-294-2/+7
| | | | | Merge-request: 755 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix compilation with QT_NO_XMLSTREAMREADERTasuku Suzuki2010-07-293-0/+10
| | | | | Merge-request: 757 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix compilation - disable TextInput when QT_NO_LINEEDIT is definedTasuku Suzuki2010-07-294-0/+14
| | | | | Merge-request: 739 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fixes for using freetdsMark Brand2010-07-292-0/+6
| | | | | | | | | DBNTWIN32 only if not Q_USE_SYBASE. Workaround for RETCODE typedef conflict between ODBC and FreeTDS. Include winsock2.h supplies SOCKET for FreeTDS. Merge-request: 684 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Added *_location variables to pkg-config files for rcc, lupdate and lreleaseDavid García Garzón2010-07-291-1/+13
| | | | | Task-number: QTBUG-11546 Reviewed-by: ossi
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-293-21/+35
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Ensure that window rectangle is updated when CBA visibility changes Clear Qt::WA_OutsideWSRange when making window fullscreen
| * Ensure that window rectangle is updated when CBA visibility changesGareth Stockwell2010-07-283-21/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In S60, there are two pieces of screen furniture, changes in whose visibility or size can affect the size of the Qt application window. These are the status pane, at the top of the screen, and the CBA at the bottom. QSymbianControl listens for changes in status pane visibility and size by implementing MEikStatusPaneObserver. Notifications received via this interface trigger a call to QSymbianControl::handleClientAreaChange() which resizes the control. There is no corresponding interface through which to receive notifications of changes in CBA visibility. This patch introduces a utility function for setting the visibility of both the status pane and CBA, which ensures that the control's rectangle is updated when either one changes. Task-number: QTBUG-5320 Reviewed-by: Jason Barron
| * Clear Qt::WA_OutsideWSRange when making window fullscreenGareth Stockwell2010-07-281-0/+2
| | | | | | | | | | Task-number: QTBUG-10269 Reviewed-by: Jason Barron
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-297-315/+294
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove warnings in photoviewer demo. Uncomment code accidentally removed with 1937adaab5861ced44813c6a4b0bff1c3750ecd3 Fix image source Don't emit movementEnded if mouse press is a continuation of a flick. Avoid binding loop warnings Append 'Example' to titles of example pages Improvements to Modules docs Component docs Fixes for Dynamic Object Management docs. Also adds links to Update Symbian emulator QtOpenVGu.def, QtNetworku.def, QtCoreu.def files for Qt 4.7 to be in sync between respective def files in Qt 4.6.3
| * | Don't emit movementEnded if mouse press is a continuation of a flick.Martin Jones2010-07-291-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the mouse is pressed the flick is stopped, but this may be a continuation of a previous flick, in which case we don't want to emit movementEnded since this can cause stutters in animations triggered by movementEnded, for example. Task-number: QTBUG-12492 Reviewed-by: Warwick Allison
| * | Improvements to Modules docsBea Lam2010-07-291-3/+3
| | | | | | | | | | | | Task-number: QTBUG-12430
| * | Component docsBea Lam2010-07-291-21/+9
| | | | | | | | | | | | Task-number: QTBUG-12447
| * | Fixes for Dynamic Object Management docs. Also adds links toBea Lam2010-07-292-17/+13
| | | | | | | | | | | | | | | | | | this page from other documentation. Task-number: QTBUG-12446
| * | Update Symbian emulator QtOpenVGu.def, QtNetworku.def, QtCoreu.def files for ↵Joona Petrell2010-07-283-259/+252
| |/ | | | | | | | | | | | | Qt 4.7 to be in sync between respective def files in Qt 4.6.3 Task-number: QTBUG-12468 Reviewed-by: Jason Barron
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2870-2/+12948
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Wrong geometery for QMainWindow with Unified toolbar on Cocoa. Statically link to Qt based dependent librarys. Add libgq version 0.4+0m6. Add libconninet version 0.41+0m6.
| * | Wrong geometery for QMainWindow with Unified toolbar on Cocoa.Prasanth Ullattil2010-07-283-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a mainwindow is shown maximized (initially) with unified toolbar, the top portion of the widget gets hidden underneath the native toolbar. This is because while showing the window, the toolbar is resized. Which causes the client area of the NSWindow to resize, we need to update the frame of the NSView for QMainWindow based on this new size. Task-number: QTBUG-10500 Reviewed-by: Denis
| * | Merge remote branch 'staging/4.7' into bearermanagement/icd-static-libsAaron McCarthy2010-07-287-117/+209
| |\ \ | | |/
| * | Statically link to Qt based dependent librarys.Aaron McCarthy2010-07-281-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the library dependencies of the ICD Bearer Management plugin use Qt. We include them in src/3rdparty and link against them statically to avoid the circular build dependency. Libraries that do not use Qt are still linked dynamically. The libraries which are statically linked are libconninet and libgq-gconf. Task-number: QTBUG-12354
| * | Add libgq version 0.4+0m6.Aaron McCarthy2010-07-2826-0/+2830
| | | | | | | | | | | | | | | | | | libgq is required by the ICD Bearer Management plugin. Task-number: QTBUG-12354
| * | Add libconninet version 0.41+0m6.Aaron McCarthy2010-07-2840-0/+10072
| | | | | | | | | | | | | | | | | | libconninet is required by the ICD Bearer Management plugin. Task-number: QTBUG-12354
* | | QMenu and QStyleSheetStyle: fix setting a border.Olivier Goffart2010-07-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | The native border would be drawn over the one drawn by the QStyleSheetStyle Regression since 68a498284e206e2bb000bc35331c966f3790f607 Reviewed-by: Gabriel Task-number: QTBUG-10785
* | | Fix compilation on 64-bit Windows.Kim Motoyoshi Kalland2010-07-281-25/+8
| | | | | | | | | | | | | | | | | | | | | When compiling for 64-bit with Visual Studio 2008, inline assembly is not supported. Use intrisic instead. Reviewed-by: Benjamin Poulain
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-287-4/+14
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix missing license header Add test for getting a backtrace in QML Doc: add link to new gettings started to index.html Doc: Added new getting started document. QtDeclarative: Give name to function bindings and signals.
| * | QtDeclarative: Give name to function bindings and signals.Olivier Goffart2010-07-287-4/+14
| |/ | | | | | | | | | | | | | | Currently, bindings and signals are annonymous javascript functions. If one give them a name, a proper name is then shown in the javascript debugger. Reviewed-by: Aaron Kennedy
* | Merge commit '9814b2225b70d6b2f758e9dbe98f8e1662049b37' into oslo-staging-1Aaron McCarthy2010-07-287-117/+209
|\ \ | |/ |/|
| * Cherry pick fix for MOBILITY-1234 from Qt Mobility.Aaron McCarthy2010-07-281-0/+2
| | | | | | | | e51af0d74f8bb6ca6100d2338671d2d053bfed01
| * Cherry pick fix for QTMOBILITY-408 from Qt Mobility.Aaron McCarthy2010-07-282-33/+34
| | | | | | | | 7f9a8ebcfe86d3df428707888c3ab5fcd10226a4
| * Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-283-24/+68
| | | | | | | | f84bb604d745c512db8d53410c5fec835309f85e
| * Fix compilation error on Symbian^4.Aaron McCarthy2010-07-283-12/+12
| | | | | | | | | | The root cause is failing compilation test for SNAP when it shouldn't, but it should still not result in compilation errors in code.
| * Fix detection of OCC functionality.Aaron McCarthy2010-07-281-1/+1
| |
| * Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-283-48/+93
| | | | | | | | 2f582953ecfc53f217317f58e4fc75b5b51a1126
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2712-36/+58
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Adding missing image Fix QT_NO_DATESTRING Check the gesturemanager pointer before accessing it. Added files that had been renamed. Modified file/directory names and text to remove disallowed terminology. Cherry pick fix for MOBILITY-1077 from Qt Mobility. Fix typo in docs. Cherry pick fix for MOBILITY-1145 from Qt Mobility. Cherry pick fix for MOBILITY-1144 from Qt Mobility. Fixed the following sub-tasks for QTBUG-12192
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2712-36/+58
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QT_NO_DATESTRING Check the gesturemanager pointer before accessing it. Added files that had been renamed. Modified file/directory names and text to remove disallowed terminology. Cherry pick fix for MOBILITY-1077 from Qt Mobility. Fix typo in docs. Cherry pick fix for MOBILITY-1145 from Qt Mobility. Cherry pick fix for MOBILITY-1144 from Qt Mobility. Fixed the following sub-tasks for QTBUG-12192
| | * | Fix QT_NO_DATESTRINGTasuku Suzuki2010-07-275-13/+13
| | | | | | | | | | | | | | | | | | | | Merge-request: 730 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| | * | Check the gesturemanager pointer before accessing it.Denis Dzyubenko2010-07-273-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a crash when a static QWidget is destroyed after the QApplication object. Task-number: QTBUG-12025 Reviewed-by: Zeno Albisser
| | * | Merge branch '4.7' of http://git.scm.dev.nokia.troll.no/qt/oslo-staging-1 ↵Kevin Wright2010-07-2728-51/+521
| | |\ \ | | | | | | | | | | | | | | | into 4.7
| | | * \ Merge commit 'c16f0a839743af36b36aea9c35f0d5ddfda3d6ac' into oslo-staging-1Aaron McCarthy2010-07-272-7/+26
| | | |\ \ | | | | |/
| | | | * Cherry pick fix for MOBILITY-1077 from Qt Mobility.Aaron McCarthy2010-07-271-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | 7ef45318255c5cf1f10508753c9a2c55fc2cb8c0 321bd8b7b54e34a983b1ba142af836cf3e153a66
| | | | * Cherry pick fix for MOBILITY-1145 from Qt Mobility.Aaron McCarthy2010-07-271-1/+3
| | | | | | | | | | | | | | | | | | | | f17d8a5dbef076046ff504fecb1fd445c9b785ac
| | | | * Cherry pick fix for MOBILITY-1144 from Qt Mobility.Aaron McCarthy2010-07-271-2/+15
| | | | | | | | | | | | | | | | | | | | 426ff79e49d4abb659167541bb67846443b9707e
| | * | | Modified file/directory names and text to remove disallowed terminology.Kevin Wright2010-07-272-7/+7
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-2713-92/+292
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't run the QGL test on systems that does not have GL support. Remove an useless assert from comp_func_SourceOver_sse2() QScriptEngineAgent: recompile all the function when installing a debugger. QScriptDeclarativeObject: we need to save the current stack pointer. QScriptValue::objectId(): do not assert if the value is not a cell Implement the composition mode "Plus" with SSE2 Clean the CompositionFunction tables of drawhelper
| * | | | | Remove an useless assert from comp_func_SourceOver_sse2()Benjamin Poulain2010-07-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assert can never be true since const_alpha is unsigned. That line was triggering a warning on GCC. Reviewed-by: Olivier Goffart
| * | | | | QScriptEngineAgent: recompile all the function when installing a debugger.Olivier Goffart2010-07-273-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recompile all the function is necessary to ger the debug opcode that notifies us when the position changes. The change in CollectorHeapIterator.h is nessesary to get it work as Debugger::recompileAllJSFunctions uses LiveObjectIterator, LiveObjectIterator initialied m_cell to -1 and to ++(*this) in its constructor. But as m_cell is of type size_t (unsigned) then the < comparison will always fail as it is an unsigned comparison. This was already fixed upstream in r54672 Reviewed-by: Jedrzej Nowacki
| * | | | | QScriptDeclarativeObject: we need to save the current stack pointer.Olivier Goffart2010-07-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in DeclarativeObjectDelegate::put, else we cannot get a proper backtrace in the debugger. Reviewed-by: Kent Hansen
| * | | | | QScriptValue::objectId(): do not assert if the value is not a cellOlivier Goffart2010-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSC::JSValue::asCell asserts if it is not a cell Reviewed-by: Jedrzej Nowacki
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-278-82/+282
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Implement the composition mode "Plus" with SSE2 Clean the CompositionFunction tables of drawhelper
| | * | | | Implement the composition mode "Plus" with SSE2Benjamin Poulain2010-07-273-5/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement the composition function for CompositionMode_Plus with SSE2. The macro MIX() can be replaced by a single instruction add-saturate, which increase the speed a lot (13 times faster on the blend benchmark). Reviewed-by: Olivier Goffart Reviewed-by: Andreas Kling
| | * | | | Clean the CompositionFunction tables of drawhelperBenjamin Poulain2010-07-277-77/+208
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some instructions sets were defining partial table of composition functions. To work around that, qInitDrawhelperAsm() was resetting the composition function of QPainter::CompositionMode_Destination and anything above QPainter::CompositionMode_Xor. This was a problem because it makes it impossible to implement fast path for those composition mode. This patch export prototypes for the generic functions of each composition mode. The specialized implementations now define a complete table. Reviewed-by: Andreas Kling