summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-222-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QPainter not restored correctly in Graphics View. Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShape Fix compilation Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines. Fix warning on MSVC QThread: make sure start works even if called after exit Revert "Fixed painter path drawing on FBO without stencil buffer." Fix a crash with D&d on mingw Revert "Keep other text format with QTextOption::SuppressColors tag on" Fixed stencil buffer on FBOs with OpenGL ES. Keep other text format with QTextOption::SuppressColors tag on QTreeView: do not scroll to top if last item is removed
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-222-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix warning on MSVC QThread: make sure start works even if called after exit Revert "Fixed painter path drawing on FBO without stencil buffer." Fix a crash with D&d on mingw Revert "Keep other text format with QTextOption::SuppressColors tag on" Fixed stencil buffer on FBOs with OpenGL ES. Keep other text format with QTextOption::SuppressColors tag on QTreeView: do not scroll to top if last item is removed
| | * QThread: make sure start works even if called after exitOlivier Goffart2010-09-222-0/+4
| | | | | | | | | | | | | | | | | | | | | Regression in 4.7.0 introduced by 13ca61fcfdc53a6a06a Reviewed-by: brad Task-number: QTBUG-13810
* | | Make the de-inlined isRightToLeft not get called from updatePropertiesThiago Macieira2010-09-221-20/+23
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before Qt 4.7, QString::isRightToLeft was an inline function that called QString::updateProperties(). In Qt 4.7, QString::isRightToLeft was de-inlined and is now called from QString::updateProperties(). According to the Binary Compatibility Guidelines, it's ok to de-inline a function provided that it's ok the old method is called. Under some rare circumstances nowadays, the old method could be called from updateProperties(), which would result in an infinite loop (updateProperties -> isRightToLeft -> updateProperties -> ...) This is usually prevented by -fvisibility-inlines-hidden in GCC (automatic in Qt) and also by -Wl,-Bsymbolic-functions (not automatic, must pass -reduced-relocations to configure). Reviewed-by: Bradley T. Hughes
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-227-86/+83
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: apply msvc flags to wince too fix qt static build on wince fix build with QT_NO_GESTURES qmake: fix quoting of moc calls Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar Regenerate the Unicode tables after updates to the generator tool Compile in C++0x mode remove extra includes minor clean-ups minor improvements for data parsers tiny clean-up for generated data move QUnicodeTables:: script() and lineBreakClass() implementations make lupdate test less fragile Enable building Qt/Webkit with debug symbols Add breakpad support
| * Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QCharThiago Macieira2010-09-211-1/+1
| | | | | | | | Reviewed-By: Bradley T. Hughes
| * Regenerate the Unicode tables after updates to the generator toolThiago Macieira2010-09-212-65/+82
| |
| * remove extra includesRitt Konstantin2010-09-213-3/+0
| |
| * move QUnicodeTables:: script() and lineBreakClass() implementationsRitt Konstantin2010-09-211-17/+0
| | | | | | | | from qchar.cpp to qunicodetables.cpp
* | Bump version to 4.7.1.Jason McDonald2010-09-211-2/+2
|/ | | | Reviewed-by: Trust Me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-201-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x). Support multisampled pbuffers under Windows. tst_qpixmapfilter: Fix compilation in namespace qtextcodec_symbian: Add few aliases Give a warning in QPixmap::handle() if pixmap is not X11 class. Make QStaticText honor QPainter::pen() for rich text on X11 w/raster Fixed compilation of MeeGo graphics system without eglext.h Fixed memory corruption issue in qt_blurImage for Indexed8 images.
| * qtextcodec_symbian: Add few aliasesOlivier Goffart2010-09-201-2/+2
| | | | | | | | Reviewed-by: Denis
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-181-1/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make qml debugging work with command line arguments Fix example after changes to font.letterSpacing. Autotest and small fix for QDeclarativeFontLoader. Improve error messages Changes to objects returned from get() should emit itemsChanged() so Make it clear that private ListModel constructor is only for worker Remove duplicated move() implementations Doc changes Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the query has already quit PathView didn't accept mouse events, preventing it from working in a Flickable. Moving items in a PathView caused PathView.onPath to be set to false. Fix worker agent to emit ListModel itemsChanged() correctly when set()
| * Make qml debugging work with command line argumentsLasse Holmstedt2010-09-171-1/+2
| | | | | | | | | | | | | | | | | | | | The environment variables do not work for Symbian devices, so without this change, QML debugging cannot be done on them. In addition, configure now contains an option to disable qml debugging entirely, due to it being a major security risk. Reviewed-by: kkoehne
* | Remove unnecessary textcodec aliases from qtextcodec_symbian.cppAlessandro Portale2010-09-171-2/+2
|/ | | | | | | | | | | MS_KANJI and Java UTF-8 are not needed because both had aliases which only differ in character case. Qt handles these aliases case insensitive, however. The removal speeds the lookup up, a bit. Reviewed-By: Olivier Goffart Task-Number: QTBUG-13565
* Merge commit 'staging-1/4.7' into fridayMorten Engvoldsen2010-09-171-6/+6
|\
| * Removing embarrassing trialing white spaces from former commitAlessandro Portale2010-09-161-6/+6
| | | | | | | | Hereby, I outed myself to have used Carbide.c++
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-165-29/+41
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-161-2/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Check S60_VERSION instead of existence of certain files in bearer plugin Fixed EPOCROOT references in createpackage.pl. Restore 4.7.0 behavior that non-existing paths are possible. QTBUG-4852 Turning on runtime nested exception support where available Fix warnings Fixed incorrect Symbian scoping. QS60style: itemview selection indication works incorrectly
| | * Restore 4.7.0 behavior that non-existing paths are possible.Thomas Zander2010-09-161-2/+3
| | | | | | | | | | | | | | | | | | | | | Changing a relative path to a non-existing absolute path used to work, this should work again after this patch. Reviewed-by: João Abecasis
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-161-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update add libconninet version 0.45. Remove libconninet in preperation to updating it to version 0.45. doc: Fixed a \overload
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-161-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Fixed a \overload
| | | * | doc: Fixed a \overloadThorbjørn Lindeijer2010-09-151-1/+1
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-161-9/+13
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed regression in QPixmap::size() for null pixmaps. Make test less sensitive to platform specifics Doc: Further QML improvements. Doc: Minor improvements to QML-related documentation. The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first Doc: Continued work on the QML documentation. Doc: More work on the QML documentation. Doc: More work on the declarative API documentation. Doc: Some editing and tidying up. Doc: Added a missing file. Doc: Fixed text in license headers.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-151-9/+13
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: Further QML improvements. Doc: Minor improvements to QML-related documentation. The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first Doc: Continued work on the QML documentation. Doc: More work on the QML documentation. Doc: More work on the declarative API documentation. Doc: Some editing and tidying up. Doc: Added a missing file. Doc: Fixed text in license headers.
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-151-9/+13
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first
| | | | * QEventDispatcherUnix: do not process too many timer if other events need to ↵Olivier Goffart2010-09-151-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be processed first Task-number: QTBUG-13633 Reviewed-by: Brad
| * | | | Fixed Q_DECLARE_METATYPE for aix-xlcRohan McGovern2010-09-161-14/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | XLC needs to see the full declaration of these classes to use them in templates, where other compilers are satisfied with a forward declaration. Reviewed-by: Kevin Wu Won
| * | | Maintaining codecsData in qtextcodec_symbian.cppAlessandro Portale2010-09-151-3/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding portuguese_gsm7_single, portuguese_locking_gsm7ext, portuguese_locking_single, spanish_gsm7_single and GB18030. This should reduce the amount of expensive calls to CCnvCharacterSetConverter:: ConvertCharacterSetIdentifierToStandardNameL() Also adding an alias "Java UTF-8" to the existing "JAVA UTF-8" since that is what the function with long name would return. Task-Number: QTBUG-13565 Reviewed-By: Olivier Goffart
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-151-6/+29
|\ \ \ | |/ /
| * | Do not wait for QThread exit when destroying global statics in SymbianMiikka Heikkinen2010-09-151-6/+29
| |/ | | | | | | | | | | | | | | | | | | | | | | Symbian kernel will kill all threads except the main one before running destructors on global static objects. Qt gets no notification of these thread terminations, so it'll still think those threads are running and will wait indefinitely for their exit. QThread::wait() now checks if the thread is actually still alive before starting to wait on thread_done wait condition. Task-number: QTBUG-13612 Reviewed-by: Janne Koskinen
* | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-155-102/+43
|\ \ | |/ | | | | | | Conflicts: src/gui/kernel/qgesturemanager.cpp
| * I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-141-2/+2
| |
| * expose GestureType for using in QMLZeno Albisser2010-09-141-0/+1
| | | | | | | | Reviewed-by: Denis Dzyubenko
| * Revert "Properly implement qobject_cast for const pointers."Thiago Macieira2010-09-113-21/+6
| | | | | | | | | | | | | | This commit added new symbols to the 4.7 branch after 4.7.0 was frozen. This reverts commit 0b0aa7603b27447a5abe55c55d0514bc56b35f9e.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-105-106/+61
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bearer management: Fix compilation with namespace. fetch next token after class definition opening delay next token fetching when opening namespace don't let operator overloads confuse us don't try to show source when no locations are given Implement a private API for setting title widgets Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry. fix CRLF Added private API to install an x11EventFilter NTLM code: Save domain in different variable Update the error handling of invalid hostnames in QUrl. Remove unsupported code from qobject.h for MSVC < .NET 2003 Properly implement qobject_cast for const pointers. Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
| | * Fix the bug for QSettings on Windows, to store qint32/quint32, ↵Liang Qi2010-09-101-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | qint64/quint64 in Windows registry. Reviewed-by: Prasanth Ullattil Reviewed-by: Joerg Bornemann Task: QTBUT-13249 AutoTest: Included
| | * Update the error handling of invalid hostnames in QUrl.Thiago Macieira2010-09-101-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should let QUrl::errorString() show the original, invalid hostname in the URL it reports to be invalid. There may be a side-effect that QUrl::toEncoded() may include the broken hostname on the first call, then miss it in the next calls. But since QUrl::isValid() is returning false, we can consider that the result of toEncoded() is undefined, so anything goes. Reviewed-by: Olivier Goffart
| | * Remove unsupported code from qobject.h for MSVC < .NET 2003Thiago Macieira2010-09-101-91/+0
| | | | | | | | | | | | Reviewed-By: Joerg Bornemann <joerg.bornemann@nokia.com>
| | * Properly implement qobject_cast for const pointers.Thiago Macieira2010-09-103-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | Instead of using ugly const_cast in public headers and Q_UNUSED (which expands to nothing in release builds), use a properly-const method. Reviewed-By: Bradley T. Hughes
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-102-0/+12
|\ \ \ | |/ /
| * | Use QFactoryLoader to ensure we get the correct graphics system plugin.Samuel Rødal2010-09-102-0/+12
| |/ | | | | | | Also, this prevents hard-coding the path to the meego plugin.
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-0914-65/+391
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-091-2/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Editable QComboBox popup immediately closes itself after a click Change RLibrary handle in QS60PluginResolver to be process wide Cursor is misplaced in the editors text area QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-091-2/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Editable QComboBox popup immediately closes itself after a click Change RLibrary handle in QS60PluginResolver to be process wide Cursor is misplaced in the editors text area QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
| | | * Change RLibrary handle in QS60PluginResolver to be process wideMiikka Heikkinen2010-09-091-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix enables Symbian version plugins to be accessed from all threads of the process. Task-number: QT-3895 Reviewed-by: Janne Koskinen
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-093-10/+53
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QList::toVector()/QVector::toStdVector()/QVector::fromStdVector(): use reserve() When a move is completed, report the source and destination correctly. Fixed the scrolling of text in QLineEdit with right alignment Removing Q_ENUMS declaration in QTransform
| | * | QList::toVector()/QVector::toStdVector()/QVector::fromStdVector(): use reserve()Marc Mutz2010-09-091-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart Merge-request: 799
| | * | When a move is completed, report the source and destination correctly.Stephen Kelly2010-09-092-8/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rare cases source or destination is changed during the move, so it must be corrected afterward before being reported in the signal. Merge-request: 800 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-098-464/+422
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Work around a compiler bug on 64-bit. Fix handling of braces/no-braces in QUrl::host / setHost. Changes (and minor corrections) to QByteArray documentation. QtWebKit: Update tag files to match the same content on qtwebkit.git QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit. QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit. uic: Fix compile breakage in case QT_NO_QT3_SUPPORT. uic: Improve messages. Tools (uic/rcc): Improve warning messages. QDir: Removed checks for existance of fileEngine QDir and QFileInfo shouldn't lose properties when detaching Another bug-o introduced in fixing QDirPrivate refactoring Reverting QDir::detach introduced earlier QFileInfo: Prepare for engine-less implementation Removed QFileInfoPrivate::initFileEngine Simplify QDir::cd QDir::makeAbsolute could self-destruct on failure QDir::operator= simplification QDirPrivate refactoring QDirPrivate refactoring ...
generated by cgit v0.12 at 2025-01-04 12:22:57 (GMT)