summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Remove the use of deprecated qVariant*Olivier Goffart2010-08-0663-268/+268
| | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue git checkout src/corelib/kernal/qvariant* Rev-by: dev mailing list
* Deprecate qVariantValue qVariantCanConvert qVariantFromValue qVariantSetValueOlivier Goffart2010-08-062-21/+19
| | | | | | | | | | The template member equivalent should be used instead. qVariantFromValue and qVariantSetValue does not have the QT_DEPRECATED macro, as they have template specialisation which is not possible to acheive as member function. So they are called by the non-deprecated implementation. Rev-by: dev mailing list
* Remove the use of deprecated qFindChild(ren)Olivier Goffart2010-08-0622-47/+47
| | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(this,* */f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(&\([^\(),]*\),* */\\2.f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*()\),* */\\2->f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\):\([^\(),]*\),* */(\\2:\\3)->f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\),* */\\2->f\\1(/'" qFindChild Rev-by: dev mailing list
* Deprecated qFindChild and qFindChildrenOlivier Goffart2010-08-062-34/+37
| | | | Rev-by: dev mailing list
* Implement QFontMetrics::inFont(uint) which takes UCS-4 encoded charEskil Abrahamsen Blomfeldt2010-08-062-1/+33
| | | | | | | | | Support unicode characters which are not representable in 16 bits in QFontMetrics::inFont() to enable font selection algorithms for unicode ranges that require surrogates. Task-number: QTBUG-12638 Reviewed-by: Simon Hausmann
* Fix compilation with QT_NO_DEBUG_STREAMOlivier Goffart2010-08-041-3/+0
| | | | | That code should have been removed in commit 26f43dcc70a0bcc8aec96a0ca6f648c543b97b10 There is a template member operator<< in QNoDebug
* QImage::fill() overloads that take QColor and Qt::GlobalColorGunnar Sletta2010-08-042-0/+85
| | | | | | | This will break source compatibility in some cases, but only when the user has a bug in the first place, so this is preferable Reviewed-by: Eskil
* It is no longer necessary to check for QT_NO_MEMBER_TEMPLATESminiak2010-08-0312-48/+7
| | | | | Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* It is no longer necessary to check for QT_NO_PARTIAL_TEMPLATE_SPECIALIZATIONminiak2010-08-035-38/+2
| | | | | Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Fix MS Visual C++ 6.0 references in the documentationminiak2010-08-033-74/+60
| | | | | Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Remove obsolete code & workarounds for unsupported versions of MS Visual C++miniak2010-08-0320-267/+34
| | | | | | | The minimum supported version of MS Visual C++ 2003, which is _MSC_VER 1310. Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Fix the issue of resizing a window with theFabien Freling2010-08-031-2/+16
| | | | | | raster engine on Mac OS X. Reviewed-by: Richard Moe Gustavsen
* Add QTextFragment::glyphs() accessorEskil Abrahamsen Blomfeldt2010-08-024-4/+46
| | | | | | | | Add a function to retrieve fonts, glyph indexes and positions needed to visualize the text in a QTextFragment to allow converting the text of a QTextDocument to QGlyphs objects. Reviewed-by: Simon Hausmann
* Minor optimizationSimon Hausmann2010-07-301-1/+1
| | | | | | Make internal qpf2 font tag array read-only. Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Setting a timeSpec on QDateTimeEdit breaks the edit when only time is shownFrederik Gladhorn2010-07-291-0/+15
| | | | | | | | | | | Because of the time zone change we get an "overflow" in the min and max time. For example min 00:00:00 becomes 01:00:00 and max 23:59:59 becomes 00:59:59 which is an invalid time span and the displayed time gets fixed to the newly set min/max value. Autotest included. Task-number: QTBUG-12384 Reviewed-by: Gabriel
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-28280-2509/+6595
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * 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
| * | | | | Fix signal emission of QDesktopWidget on Symbian.Jason Barron2010-07-271-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDesktopWidget on Symbian was not properly emitting the resized() and the workAreaResized() signals. Qt was properly translating the system event and sending the QResizeEvent to the widget, but the signal emission is determined solely based on changes in the QVectors of QRects outlining the screen dimensions. On Symbian, these vectors were never being set and as a result the signals were never omitted. The fix is to set the rects correctly in the init() function which is called by the resizeEvent() handler. Also modify the accessor functions to return the rectangles stored in the vector instead of querying for them each time. Task-number: QTBUG-11433 Reviewed-by: axis Autotest: PASSES
| * | | | | Fixed gcce linker error when linking against s60main built by armcc.axis2010-07-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-10680 RevBy: Trust me
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-271-0/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed package creation when shadow building. Fix crash caused by not clearing the QPixmapCache on application exit. Removed QEXPECT_FAIL macros from test cases which now pass Ensure backing store is deleted before top-level window
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-261-0/+6
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed package creation when shadow building. Fix crash caused by not clearing the QPixmapCache on application exit. Removed QEXPECT_FAIL macros from test cases which now pass Ensure backing store is deleted before top-level window
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-261-0/+6
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed package creation when shadow building. Fix crash caused by not clearing the QPixmapCache on application exit. Removed QEXPECT_FAIL macros from test cases which now pass Ensure backing store is deleted before top-level window
| | | | * | Fix crash caused by not clearing the QPixmapCache on application exit.Oleh Vasyura2010-07-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qt_cleanup() function will call CCoeEnv::DestroyEnvironment() on application shutdown. This destruction will in turn tear down the various server sessions associated with the application. One of these sessions is the FBSERV session and if the QPixmapCache attempts to delete a CFbsBitmap after the session has been destroyed, the app will crash. The solution is call QPixmapCache::cleanup() before we destroy the environment. This is inline with what the other platforms do. Reviewed-by: Jason Barron
| | | | * | Ensure backing store is deleted before top-level windowGareth Stockwell2010-07-261-0/+4
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If this is not done, later deletion of the backing store may cause a crash. If the backing store is an EGL surface, its destruction includes a call to eglDestroySurface(), which triggers an exception if the window handle passed as a parameter is no longer valid. Task-number: QTBUG-10643 Task-number: QTBUG-11376 Reviewed-by: Jason Barron
| * | | | Document that animations have to be started/stopped as a groupBea Lam2010-07-271-0/+8
| | | | |
| * | | | various doc fixesBea Lam2010-07-275-13/+11
| |/ / /