summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update the parallel test to do different counts of parallel testsThiago Macieira2010-04-161-3/+16
|
* Add an event-loop based test that does parallel fetchesThiago Macieira2010-04-161-3/+36
|
* Add a simple event-loop based testThiago Macieira2010-04-161-0/+26
|
* Add two more blocking testsThiago Macieira2010-04-161-1/+98
|
* Add a TCP stress-test testThiago Macieira2010-04-166-0/+18418
|
* Document the time format pattern for timezone info.Denis Dzyubenko2010-04-161-0/+1
| | | | | | | Apparently Qt already supports a format pattern for the timezone info, so it should be mentioned in the doc. Reviewed-by: Thiago
* Convert date/time format to something that Qt understandsDenis Dzyubenko2010-04-163-424/+547
| | | | | | | | | | The date/time format in QLocale originate from unicode CLDR which has more format patterns that Qt understands, so when generating date for QLocale we remove unsupported patterns and convert some other to something that Qt understands. Task-number: QTBUG-9500 Reviewed-by: Thiago
* adding new entries to qt::key enumAdam Wasila2010-04-161-0/+2
| | | | documentation updated with two new Qt::Key keys
* adding new entries to qt::key enumAdam Wasila2010-04-162-2/+4
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-16188-2488/+2151
|\
| * Fix tst_QEventLoop::exec() regression introduced by commit ↵Bradley T. Hughes2010-04-165-19/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 816523117bc00cfeb17e347f7fe5f11278a5e871 The quitNow flag needs to be reset at the beginning of exec() to allow exec() to recurse and be run multiple times. This changes reverts commit 816523117bc00cfeb17e347f7fe5f11278a5e871 an introduces the QThreadPrivate::exited flag to fix the race between start() and exit(), and QThreadPrivate::returnCode to make sure exec() returns the code passed to exit(). Task-number: QTBUG-1184 Reviewed-by: olivier
| * Fix building of corelib, network and gui with qconfig minimal.Aaron McCarthy2010-04-165-0/+14
| | | | | | | | | | | | | | | | The bearer management code, which this bug is for, was fixed by MR 517 previously. Task-number: QTBUG-9493 Reviewed-by: alex
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-16121-1712/+4344
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Fix duplicate project entry in visual studio solution file. Doc qdoc: Added the index and fixed images in the extra files list. Speed up qsTr() by caching the translation context Crash while printing from the portedcanvas example on Mac Cocoa. qdoc: Fixed .qdocconf files for assistant. Disable debug-only framework builds on Mac. Compile (with -no-pch) Add missing QT_NO_BEARERMANAGEMENT ifdefs. Introduce a qconfig feature for Bearer Management Fix MOBILITY-404 Remove holes in bearer management data structures. Don't link bearer plugins against QtGui unnecessarily. Added missing newline after warning message when using -L with qml Doc: updating scripts Fixed a crash on embedded due to uninitialized pointer. Fix a race where QThread::exit() is "lost" when called after start() qdoc: Removed all <table> attributes in favor of using css. Autotest failure: dialogModality test fails on cocoa (macgui) Force the bic test to compile in 32-bit mode on Mac ...
| | * Fix duplicate project entry in visual studio solution file.Andrew den Exter2010-04-161-1/+1
| | | | | | | | | | | | | | | | | | The marshal project was being appended to SUBDIRS twice. Reviewed-by: Justin McPherson
| | * DocAaron Kennedy2010-04-161-1/+4
| | | | | | | | | | | | | | | Update QObject documentation to match the Qt's Property System documentation.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-1529-128/+327
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-15119-1707/+4333
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits) Speed up qsTr() by caching the translation context Crash while printing from the portedcanvas example on Mac Cocoa. qdoc: Fixed .qdocconf files for assistant. Disable debug-only framework builds on Mac. Compile (with -no-pch) Add missing QT_NO_BEARERMANAGEMENT ifdefs. Introduce a qconfig feature for Bearer Management Fix MOBILITY-404 Remove holes in bearer management data structures. Don't link bearer plugins against QtGui unnecessarily. Added missing newline after warning message when using -L with qml Doc: updating scripts Fixed a crash on embedded due to uninitialized pointer. Fix a race where QThread::exit() is "lost" when called after start() qdoc: Removed all <table> attributes in favor of using css. Autotest failure: dialogModality test fails on cocoa (macgui) Force the bic test to compile in 32-bit mode on Mac Revert "Doc: Updating design files." Remove statically allocated pixmaps through the post routine qdoc: Checked for empty title. ...
| | | | * Speed up qsTr() by caching the translation contextKent Hansen2010-04-152-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qsTr() uses QFileInfo::baseName() to determine the translation context from a URL. The problem is that creating a QFileInfo object (and thus a file engine object), as well as processing the URL to determine the base name part, is very expensive. By caching the last translation URL and context, qsTr() becomes 5x faster. Only the most recent URL is cached, because a script's text will be translated all at once (as the script is evaluated), so for scripts with multiple translated strings only the first qsTr() call will cause a cache miss. The performance could be improved even further by getting rid of the QFileInfo dependency altogether; created QTBUG-9939 for that since it's a more risky change. Task-number: QTBUG-6908 Reviewed-by: Olivier Goffart
| | | | * Crash while printing from the portedcanvas example on Mac Cocoa.Prasanth Ullattil2010-04-152-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PMPrintSession inside the NSPrintInfo can get changed by the NSPageLayout. Refresh the session pointer saved in the QMacPrintEnginePrivate after showing the page setup dialog. Task-number: QTBUG-9880 Reviewed-by: Trond
| | * | | qdoc: Added the index and fixed images in the extra files list.David Boddie2010-04-155-27/+30
| | | |/ | | |/| | | | | | | | | Reviewed-by: Trust Me
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-16144-2312/+1740
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (32 commits) Correctly support translation in QDeclarativePixmapCache Improve warning for non-Item delegates. Correctly support translation in QDeclarativeCompiler Small calculator fix. Improve declarative calculator example. Update examples autotest to use the runtime directly Support valuetypes as method return values Compile without Qt3 support. Doc Simplify dynamic resource loading to avoid cluttering Text API. Add Component.onDestruction attached property Use qmlInfo for image loading errors, not qWarning(). Visual test updates. Rename section so that it's not linked to by references to "JavaScript" Doc improvements Comments Remove unused parameter Correctly resolve, and load, IMG tags in Text element. Rename "sql" test so autotester doesn't get confused. Should work now, don't skip. ...
| | * | Correctly support translation in QDeclarativePixmapCacheWarwick Allison2010-04-162-5/+7
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-16102-722/+1366
| | |\ \
| | | * | Correctly support translation in QDeclarativeCompilerAaron Kennedy2010-04-152-8/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Friedemann Kleint
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-15144-2302/+1724
| | | |\ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits) Small calculator fix. Improve declarative calculator example. Update examples autotest to use the runtime directly Support valuetypes as method return values Compile without Qt3 support. Doc Simplify dynamic resource loading to avoid cluttering Text API. Add Component.onDestruction attached property Use qmlInfo for image loading errors, not qWarning(). Visual test updates. Rename section so that it's not linked to by references to "JavaScript" Doc improvements Comments Remove unused parameter Correctly resolve, and load, IMG tags in Text element. Rename "sql" test so autotester doesn't get confused. Should work now, don't skip. ignore autotester logs Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeData Rename QDeclarativeData -> QAbstractDeclarativeData ...
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-15144-2302/+1724
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits) Small calculator fix. Improve declarative calculator example. Update examples autotest to use the runtime directly Support valuetypes as method return values Compile without Qt3 support. Doc Simplify dynamic resource loading to avoid cluttering Text API. Add Component.onDestruction attached property Use qmlInfo for image loading errors, not qWarning(). Visual test updates. Rename section so that it's not linked to by references to "JavaScript" Doc improvements Comments Remove unused parameter Correctly resolve, and load, IMG tags in Text element. Rename "sql" test so autotester doesn't get confused. Should work now, don't skip. ignore autotester logs Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeData Rename QDeclarativeData -> QAbstractDeclarativeData ...
| | | | * | Small calculator fix.Yann Bodson2010-04-152-10/+10
| | | | | |
| | | | * | Improve declarative calculator example.Yann Bodson2010-04-1513-227/+238
| | | | | |
| | | | * | Update examples autotest to use the runtime directlyAaron Kennedy2010-04-154-96/+42
| | | | | | | | | | | | | | | | | | | | | | | | This improves the test execution time
| | | | * | Support valuetypes as method return valuesAaron Kennedy2010-04-159-41/+133
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-9818
| | | | * | Compile without Qt3 support.Yann Bodson2010-04-151-1/+1
| | | | | |
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-151-0/+20
| | | | |\ \
| | | | | * | DocAaron Kennedy2010-04-151-0/+20
| | | | | | |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1518-104/+178
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-1556-1467/+327
| | | | | |\ \
| | | | | * | | Add Component.onDestruction attached propertyAaron Kennedy2010-04-1517-99/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This property complements Component.onCompleted. It is emitted before the destruction actually begins (for the most part) so the objects are still alive and accessible. The QtObject.onDestroyed signal is now blocked as it never really worked properly anyway.
| | | | | * | | CommentsAaron Kennedy2010-04-151-1/+3
| | | | | | | |
| | | | | * | | Remove unused parameterAaron Kennedy2010-04-153-4/+4
| | | | | | | |
| | | | * | | | Simplify dynamic resource loading to avoid cluttering Text API.Warwick Allison2010-04-153-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9900 QT-3287
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1524-1436/+130
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | * | | | Use qmlInfo for image loading errors, not qWarning().Warwick Allison2010-04-1511-44/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9908
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1524-124/+296
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QListView: Re-fix scrollbar ranges Fix compile error with QT_NO_GRAPHICSVIEW in QtMultimedia Fix compile error with QT_NO_IMAGEFORMAT_XPM in QtGui Wrap EGL image function pointers and move into QEgl namespace Fix compilation of ShivaVG, which does not have EGL. Move nativePaintingActive flag to GL2 engine's private More adjustments to QTBUG-6800 Adjustments to QTBUG-6800 patch. QTBUG-6800 patch included, but only for OpenGL 2.0 Support building with desktop OpenGL managed via EGL Print more information when debugging X11 Visual selection Fix gcc compile warning in qstatictext.cpp Avoid taking sqrt of negative number in FT font engine
| | * | | | | | QListView: Re-fix scrollbar rangesGabriel de Dietrich2010-04-152-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 11dea4a8b227801c110f791f350632bf6f0c958d fixing QTBUG-2678 was the wrong solution and introduced some regressions. Auto-test included. Reviewed-by: Thierry Task-number: QTBUG-2678 Task-number: QTBUG-9455
| | * | | | | | Fix compile error with QT_NO_GRAPHICSVIEW in QtMultimediaTasuku Suzuki2010-04-153-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2333 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
| | * | | | | | Fix compile error with QT_NO_IMAGEFORMAT_XPM in QtGuiTasuku Suzuki2010-04-152-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2327 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
| | * | | | | | Wrap EGL image function pointers and move into QEgl namespaceTom Cooksey2010-04-154-32/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtGui exporting a symbol called eglCreateImageKHR seems a pretty silly idea. Much better to have them in the QEgl namespace. Reviewed-By: Iain
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1515-87/+180
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation of ShivaVG, which does not have EGL. Move nativePaintingActive flag to GL2 engine's private More adjustments to QTBUG-6800 Adjustments to QTBUG-6800 patch. QTBUG-6800 patch included, but only for OpenGL 2.0 Support building with desktop OpenGL managed via EGL Print more information when debugging X11 Visual selection Fix gcc compile warning in qstatictext.cpp Avoid taking sqrt of negative number in FT font engine
| | | * | | | | | Fix compilation of ShivaVG, which does not have EGL.Rhys Weatherley2010-04-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9809 Reviewed-by: Sarah Smith
| | | * | | | | | Move nativePaintingActive flag to GL2 engine's privateTom Cooksey2010-04-142-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Samuel
| | | * | | | | | More adjustments to QTBUG-6800Carolina Gomes2010-04-143-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2344 Reviewed-by: Tom Cooksey