summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autotest: increase wait time to 3s on Windows to bypass 2s-granularity ↵Thiago Macieira2010-04-171-1/+1
| | | | limitation
* Autotest: update to the new values for the localeThiago Macieira2010-04-171-3/+3
|
* do not expand variables in read()'s file nameOswald Buddenhagen2010-04-161-2/+1
| | | | | | | it is positively backwards to apply any expansions at such a low level - they have already been applied where necessary. Reviewed-by: mariusSO
* remove ability to use break() a block outside any loopOswald Buddenhagen2010-04-161-2/+0
| | | | | | | it is a completely bizarre feature which is nowhere documented and no justification for it is provided anywhere. Reviewed-by: mariusSO
* don't add -unix to the qmake command lineOswald Buddenhagen2010-04-161-1/+0
| | | | | | it is redundant now and causes warnings from qmake Reviewed-by: mariusSO
* Increase the timeout for the QNAM getter test to 30 secondsThiago Macieira2010-04-161-3/+3
|
* Remove unstable hosts from the listThiago Macieira2010-04-161-2/+0
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-1618-429/+20214
|\
| * Other fixes to the remote network stresstesterThiago Macieira2010-04-161-8/+7
| |
| * Fix SSL connection problem.Thiago Macieira2010-04-161-4/+6
| | | | | | | | You can't do connectToHost followed by startClientEncryption followed by write.
| * Make sure we don't try URLs that aren't HTTP or HTTPSThiago Macieira2010-04-161-3/+5
| |
| * Fix menu bar visibility.Fabien Freling2010-04-161-3/+3
| | | | | | | | | | We no longer show the menu bar if it is not native and doesn't have a parent widget.
| * Add SSL remote host testsThiago Macieira2010-04-161-34/+95
| |
| * Split the remote and the local tests in two, in preparation for SSL testsThiago Macieira2010-04-166-266/+465
| |
| * Add tests for remote hostsThiago Macieira2010-04-163-9/+322
| |
| * Change the way we calculate the average transfer rates.Thiago Macieira2010-04-161-49/+84
| | | | | | | | The previous way was prone to division by zero if the file was too small
| * Finish renamingThiago Macieira2010-04-162-7/+4
| |
| * Move these tests to tests/manual.Thiago Macieira2010-04-167-2/+0
| |
| * Add a QNetworkAccessManager stresstestThiago Macieira2010-04-162-17/+142
| |
| * Add a non-blocking native function tooThiago Macieira2010-04-161-33/+162
| |
| * Move the code around into a function and add an alarm(2) on UnixThiago Macieira2010-04-161-54/+66
| |
| * Add a native test to compare withThiago Macieira2010-04-161-0/+126
| |
| * Add some statistics in the transfer rateThiago Macieira2010-04-161-30/+87
| |
| * Add the test to the testsuite, but disabledThiago Macieira2010-04-162-0/+9
| |
| * Make sure we read the data, to avoid keeping it all on RAMThiago Macieira2010-04-161-2/+8
| |
| * 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
| |
* | qdoc: Output TOC for more class ref pages.Martin Smith2010-04-161-10/+6
|/
* 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