summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-04-182121-108596/+139382
|\ | | | | | | | | Conflicts: examples/webkit/webkit.pro
| * Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2011-04-1810-15/+205
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: Fix build for Apple gcc Add platformNativeInterface assessor to QApplication Lighthouse: Add dummy QSessionManager Adapt to different uikit resolutions. Lighthouse: Make directfb conform with ligthhouse gl context api Compile fix for window surface features. (uikit)
| | * Fix build for Apple gcccon2011-04-181-1/+1
| | | | | | | | | | | | Reviewed-by: Paul Olav Tvete
| | * Add platformNativeInterface assessor to QApplicationJørgen Lind2011-04-152-0/+12
| | |
| | * Lighthouse: Add dummy QSessionManagerJørgen Lind2011-04-153-2/+175
| | |
| | * Adapt to different uikit resolutions.con2011-04-152-12/+10
| | |
| | * Lighthouse: Make directfb conform with ligthhouse gl context apiJørgen Lind2011-04-151-0/+2
| | |
| | * Compile fix for window surface features. (uikit)con2011-04-152-1/+6
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-04-18171-10156/+17506
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (163 commits) QLocale: Fixed double to currency string conversion on Mac. Fix qstringbuilder4 test on mac Compile on Mac. Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache" Use the qt_static_metacall in QueuedConnection Fix crash after merge of the native symbian thread branch. Fix bad merge Re-apply part of ba8e5eedf5f40091eb67dd391a7dcaf9299db2f5 Removed useless comment SSL code: introduce new error value for blacklisted certificates Disable DEF files by default for symbian-gcce. HTTP caching internals: fix logic for PreferNetwork and PreferCache Added a consistency check for number of missing symbols in elf2e32. Updated def file after symbol removal. QLocalSocket: fix abort on Windows. QStringBuilder: add operator += for QString and QByteArray Dummy commit to trigger pulse. Fix QMetaObject::indexOfSlot Fix compilation Documentation for the initilize_list constructor ...
| | * | QLocale: Fixed double to currency string conversion on Mac.Denis Dzyubenko2011-04-142-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes the autotest failure on mac with macDefaultLocale test. Reviewed-by: trustme (cherry picked from commit 78d47f520b2c4acdf782d39311063f5d44376913)
| | * | Fix qstringbuilder4 test on macOlivier Goffart2011-04-141-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The behaviour is different with or without QT_FAST_OPERATOR_PLUS And since on old gcc it is not defined, then the test fails. With the normal operator+, the bytearray will first be converted to a QString, and loose everything that is after \0, but now, with QStringBuilder, we do not do QString conversion anymore, so no data is lost. We do not want to specify the behaviour here, so we remove the test. Reviewed-by: Joao
| | * | Compile on Mac.Olivier Goffart2011-04-132-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the work around for old gcc from qstring.h to qbytearray.h Since QByteArray now also use the FAST_OPERATOR_PLUS, it also need to be undefined there. and since qstring.h includes qbytearray.h, it should be placed into qbytearray.h
| | * | Merge earth-team into origin/master'Olivier Goffart2011-04-12788-2981/+49990
| | |\ \
| | * | | Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"Markus Goetz2011-04-112-26/+16
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e5d27e7aeac984e46f3aa8de20160cc00fc63155. Broke the CI.
| | * | | Use the qt_static_metacall in QueuedConnectionOlivier Goffart2011-04-085-28/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And also in QMetaMethod::invoke Reviewed-by: brad
| | * | | Fix crash after merge of the native symbian thread branch.Olivier Goffart2011-04-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The memory leak was fixed in two different ways in b6c60b0c9778f51af8c80f853d840ba25910c6f4 and 0ee221b374ffef3657247be4c78e05689e04bef7 after the merge, the thread are now deleted twice.
| | * | | Fix bad mergeOlivier Goffart2011-04-081-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Code was removed in that commit 834ad29849ebef99d7e5c516cde26d550abff7cd But the merge d54b3f04fa629fe031f1083073eef0145f0d6b1e reintroduced it back
| | * | | Re-apply part of ba8e5eedf5f40091eb67dd391a7dcaf9299db2f5Olivier Goffart2011-04-081-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | It was somehow lost in the merge of the native symbian threads (wrong merge was cf94df01d2d2364653f2ab602688394450e92d31)
| | * | | Removed useless commentOlivier Goffart2011-04-071-3/+0
| | | | | | | | | | | | | | | | | | | | That call was removed in 0ee221b374ffef3657247be4c78e05689e04bef7
| | * | | SSL code: introduce new error value for blacklisted certificatesPeter Hartmann2011-04-074-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve error reporting by introducing a new enum value in case the peer certificate is blacklisted. Reviewed-by: Markus Goetz Task-number: QTBUG-18338
| | * | | Disable DEF files by default for symbian-gcce.axis2011-04-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | elf2e32 crashes when using it, and gcce will not produce matching symbols anyway. It can still be turned on manually by specifying -use-deffiles. Reviewed-by: Liang Qi
| | * | | HTTP caching internals: fix logic for PreferNetwork and PreferCachePeter Hartmann2011-04-072-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PreferNetwork means: send out a request and read from cache if it has not been modified. PreferCache means: load resource from cache if it has not expired yet. This commit makes the cache behave according to the documentation. Reviewed-by: Markus Goetz
| | * | | Added a consistency check for number of missing symbols in elf2e32.axis2011-04-071-4/+35
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust me
| | * | | Updated def file after symbol removal.axis2011-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust me
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-07987-86967/+59113
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| | * | | | QLocalSocket: fix abort on Windows.Martin Petersson2011-04-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The socket will not close as long as there are bytes left to write. So by deleting the pipeWriter bytesToTrite will be 0 and the socket will close directly. Task-number: QTBUG-14939 Reviewed-by: Joerg Bornemann
| | * | | | QStringBuilder: add operator += for QString and QByteArrayOlivier Goffart2011-04-063-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize cases when we have. string += someString + someOtherString Avoid the allocation of one temporary string. Behaviour change: byteArray += someString + QByteArray("foo\0bar", 7) before, the array would end at foo because of the conversion to string Reviewed-by: hjk
| | * | | | Dummy commit to trigger pulse.axis2011-04-050-0/+0
| | | | | |
| | * | | | Fix QMetaObject::indexOfSlotOlivier Goffart2011-04-042-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | The wrong offset was added
| | * | | | Fix compilationOlivier Goffart2011-04-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Joao
| | * | | | Documentation for the initilize_list constructorOlivier Goffart2011-04-043-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Joao
| | * | | | QStringList: constructor for std::initializer_listOlivier Goffart2011-04-042-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Joao
| | * | | | HTTP backend: rename method that loads resource from cachePeter Hartmann2011-04-042-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz
| | * | | | HTTP backend: make cache validation method return boolPeter Hartmann2011-04-042-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... rather than storing it in a bool reference. Reviewed-by: Markus Goetz
| | * | | | HTTP backend: return earlier when resource loaded from cachePeter Hartmann2011-04-041-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no need to add headers to the request if it is not sent but loaded from cache anyway. Reviewed-by: Markus Goetz
| | * | | | QTemporaryFile: Locate placeholder before re-encodingJoão Abecasis2011-04-041-31/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the placeholder was identified in unicode-based QString, and the offset was assumed to be correct after conversion to the local 8-bit encoding. This assumption is obviously wrong for variable-sized encoding, such as utf-8. With this change, the placeholder is still identified in the original QString, but conversion to 8-bit encoding is done in a step-wise fashion and offsets recomputed. This allows us to drop the intermediary argument verification in _gettemp. Task-number: QTBUG-4796 Reviewed-by: Robin Burchell
| | * | | | Prefer use of QByteArray to qstrdup and manual memory managementJoão Abecasis2011-04-041-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart Reviewed-by: Robin Burchell
| | * | | | Check for null no longer neededJoão Abecasis2011-04-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With proper checks for boundary conditions, we no longer need to protect against reaching the terminating null character. Reviewed-by: Robin Burchell
| | * | | | Don't overrun XXXXXX placeholder when generating next filenameJoão Abecasis2011-04-041-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking of boundary condition needs to happen whenever there is a change. Checking anywhere else is useless. This fixes an issue where we would overrun the placeholder if there was a 'Z' next to the placeholder string. Reviewed-by: Robin Burchell
| | * | | | Split argument validation of _gettemp as separate functionJoão Abecasis2011-04-041-25/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes knowledge about the structure of the filename template from the randomization process and is a pre-requisite to adding Unicode support to the code. Task-number: QTBUG-4796 Reviewed-by: Robin Burchell
| | * | | | Remove duplication with QCoreApplication::applicationIdJoão Abecasis2011-04-041-19/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The duplication was there to allow qmake and other tools to compile without a full build of QtCore. Cleaning up this code justifies losing the benefit of PID-tagged temporary files in those tools. Reviewed-by: Olivier Goffart Reviewed-by: Robin Burchell
| | * | | | Adding comments; variable scopingJoão Abecasis2011-04-041-22/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There should be no semantic differences, otherwise. Reviewed-by: Harald Fernengel Reviewed-by: Robin Burchell
| | * | | | Don't pre-check if directory exists as it's unnecessaryJoão Abecasis2011-04-041-35/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Posix platforms, when attempting to atomically create file and obtain descriptor, we only continue if we get an EEXIST error. If the path points to a non-existing directory, we should get ENOENT and will fail as well. On Windows, the check was already ignored. We would detect the file does not exist, attempt to obtain a handle upon return to QTemporaryFileEngine::open and fail there without running "for a *very* long time". Checking if the directory exists beforehand is not only unnecessary it also constitutes a race condition. Trusting the result of this check is dangerous and doubly useless. Reviewed-by: Olivier Goffart Reviewed-by: Robin Burchell
| | * | | | QTemporaryFile: More dead code eliminationJoão Abecasis2011-04-041-84/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are exactly 2 uses of the _gettemp function: one for windows platforms, one for all others. Windows requests a file name, others request a valid file descriptor for that file name. Despite the 2 distinct use cases, the code was full of #ifdefs to keep never used code paths compiling. With this change the qt_mkstemp wrapper is eliminated, together with dead code inside if (doopen) {} blocks on Windows platforms. The more proper Q_OS_WIN macro is preferred to Q_WS_WIN. _gettemp is also changed to return the valid file descriptor on non-Windows platforms. Reviewed-by: Olivier Goffart Reviewed-by: Robin Burchell
| | * | | | Removing dead code in QTemporaryFileJoão Abecasis2011-04-041-18/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option to create a directory is never used, so let's drop it. There are bigger issues with this code. Reviewed-by: Olivier Goffart Reviewed-by: Robin Burchell
| | * | | | Remove duplicate #includeJoão Abecasis2011-04-041-1/+0
| | | | | |
| | * | | | Extending fileTemplate autotestJoão Abecasis2011-04-041-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to also verify template prefix and corner cases with runs of less than 6 Xs. Reviewed-by: Olivier Goffart Reviewed-by: Robin Burchell
| | * | | | Adding unicode test case for QTemporaryFileJoão Abecasis2011-04-041-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4796 Reviewed-by: Olivier Goffart Reviewed-by: Robin Burchell
| | * | | | Test should fail, debug output here is uselessJoão Abecasis2011-04-041-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart Reviewed-by: Harald Fernengel Reviewed-by: Robin Burchell
| | * | | | moc: qobject_cast cannot be used if the class privately iherit from QObjectOlivier Goffart2011-04-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because the qobject_cast function do not have the right to access the staticMetaObject.
generated by cgit v0.12 at 2024-11-12 07:12:30 (GMT)