summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-0782-1357/+3946
|\ | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msbuild_objectmodel.h qmake/generators/win32/msvc_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/arch/qatomic_arm.h tests/auto/qglthreads/tst_qglthreads.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-0755-1031/+2917
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (36 commits) Fix failure on Windows after commit ccd3f66 tst_qtcpserver: Another attempt to reproduce QTBUG-14268 Fix crash when constructing QThreadStorage after global destructors have run tst_qtcpsocket: Attempt to reproduce QTBUG-14268 Fixed a buffer overrun when pasting large data from non-Qt apps Fix copying large data to non-Qt applications fix regexp in "make custom command handling in vc(x)proj files sane" qmake: Include -pthread when reducing duplicate library arguments qmake: Ensure right library order when reducing duplicate libraries rebuild configure.exe make QMAKE_POST_LINK handling in nmake generator sane make custom command handling in vc(x)proj files sane Revert "QWorkspace: fix hardcoded min size overwriting the real min size" QtScript/JavaScriptCore: Backport random number generator seeding fix Fix performance regression in QUuid::createUuid() Update japanese translations. Ensure that the underline is only drawn when expected for an accel Small improvement in the textedit demo My changes for 4.7.1 QWorkspace: fix hardcoded min size overwriting the real min size ...
| | * Fix failure on Windows after commit ccd3f66Bradley T. Hughes2010-10-071-0/+8
| | | | | | | | | | | | | | | | | | | | | By default the builds are placed in either a release\ or debug\ directory, so we need to start the correct one on Windows. Reviewed-by: trustme
| | * tst_qtcpserver: Another attempt to reproduce QTBUG-14268Markus Goetz2010-10-062-7/+61
| | | | | | | | | | | | | | | | | | The test (un)fortunately passes :-) Task-number: QTBUG-14268
| | * Fix crash when constructing QThreadStorage after global destructors have runBradley T. Hughes2010-10-066-6/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this particular case, the destructors vector used by QThreadStorageData has already been destroyed, yet a new QThreadStorage is being allocated. This can only happen during global destruction, at which point we assume that there is only one thread. In order to keep QThreadStorage working, we need somewhere to store the data, and the best place we have in this situation is at the tail of the current thread's tls vector. The destructor is ignored, since we have no where to store it, and no way to actually call it. Task-number: QTBUG-10084 Reviewed-by: thiago Reviewed-by: olivier
| | * tst_qtcpsocket: Attempt to reproduce QTBUG-14268Markus Goetz2010-10-061-0/+71
| | | | | | | | | | | | | | | | | | The test (un)fortunately passes :-) Task-number: QTBUG-14268
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-0647-1025/+2680
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits) Fixed a buffer overrun when pasting large data from non-Qt apps Fix copying large data to non-Qt applications fix regexp in "make custom command handling in vc(x)proj files sane" qmake: Include -pthread when reducing duplicate library arguments qmake: Ensure right library order when reducing duplicate libraries rebuild configure.exe make QMAKE_POST_LINK handling in nmake generator sane make custom command handling in vc(x)proj files sane Revert "QWorkspace: fix hardcoded min size overwriting the real min size" QtScript/JavaScriptCore: Backport random number generator seeding fix Fix performance regression in QUuid::createUuid() Update japanese translations. Ensure that the underline is only drawn when expected for an accel Small improvement in the textedit demo My changes for 4.7.1 QWorkspace: fix hardcoded min size overwriting the real min size Doc: Fixing link titles and error color in search results Doc: Implementing features to the search feature. Setting the _NET_WM_STATE Atom only when its not already set Fix focus appearance of tabwidget tabs with QGtkStyle ...
| | | * Fixed a buffer overrun when pasting large data from non-Qt appsDenis Dzyubenko2010-10-064-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we receive a COMPOUND_TEXT data and convert it to multi-byte, if the new length is less than the original buffer, we resize the buffer, but then we need to make sure we reset the buffer_offset variable, which is returned as a "size" of the buffer to a caller. The conversion to COMPOUND_TEXT format was totally wrong, we were using the wrong length of the input text, so the converted string was truncated. Task-number: QTBUG-8644 Reviewed-by: Bradley T. Hughes
| | | * Fix copying large data to non-Qt applicationsDenis Dzyubenko2010-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In send_selection when we decide to use INCR properties we set the given property value to be INCR atom, however we were also sending SelectionNotify event containing the name of the property that the client should watch as INCR, which is wrong, we should send the original property that we were asked to use instead. This fixes copying large junks of data from Qt application, for example copying text (>200k) to gedit or images to gimp. Task-number: QTBUG-8644 Reviewed-by: Bradley T. Hughes
| | | * fix regexp in "make custom command handling in vc(x)proj files sane"Oswald Buddenhagen2010-10-061-1/+1
| | | |
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-0543-1008/+2667
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) qmake: Include -pthread when reducing duplicate library arguments qmake: Ensure right library order when reducing duplicate libraries rebuild configure.exe make QMAKE_POST_LINK handling in nmake generator sane make custom command handling in vc(x)proj files sane Revert "QWorkspace: fix hardcoded min size overwriting the real min size" QtScript/JavaScriptCore: Backport random number generator seeding fix Fix performance regression in QUuid::createUuid() Update japanese translations. Ensure that the underline is only drawn when expected for an accel Small improvement in the textedit demo My changes for 4.7.1 QWorkspace: fix hardcoded min size overwriting the real min size Doc: Fixing link titles and error color in search results Doc: Implementing features to the search feature. Setting the _NET_WM_STATE Atom only when its not already set Fix focus appearance of tabwidget tabs with QGtkStyle Incorrect selection background for unfocused widgets with GTK Make the OpenSSL library search also hit /lib. Update change log. ...
| | | | * qmake: Include -pthread when reducing duplicate library argumentsTor Arne Vestbø2010-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | Reviwed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | | | * qmake: Ensure right library order when reducing duplicate librariesTor Arne Vestbø2010-10-051-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3ed9e2788e8 changed the logic from using lookahead to checking if the library already existed in the arguments parsed so far. This broke the case -lFoo -lBar -lFoo where Bar depends on symbols in Foo. Since we were reducing this to -lFoo -lBar, the linker would not know which missing symbols to include from Foo when encountering the -lFoo argument. We now keep the library order when building the final argument list, by making sure the position of a duplicated library is always that of the last instance of that library. Task-number: QTBUG-13944 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | | | * rebuild configure.exeOswald Buddenhagen2010-10-051-0/+0
| | | | |
| | | | * make QMAKE_POST_LINK handling in nmake generator saneOswald Buddenhagen2010-10-051-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is no point in &&-ing it with a possibly present signature command - putting it on a line of its own works just fine - with the added benefit of not breaking if it contains operators itself. Reviewed-by: mariusSO
| | | | * make custom command handling in vc(x)proj files saneOswald Buddenhagen2010-10-057-89/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of glueing the commands with "&&" and having a monster hack (\r\h) for the case where they cannot be and-ed, glue them with newlines and error checks. this ensures that we a) never have excessively long lines, b) don't need the monster hack and c) commands always have proper error checks, just like in makefiles. Reviewed-by: mariusSO
| | | | * Revert "QWorkspace: fix hardcoded min size overwriting the real min size"Marius Storm-Olsen2010-10-052-19/+6
| | | | | | | | | | | | | | | | | | | | This reverts commit b3a46493a1a74bd7918bd68638c28cf6e84eb57f.
| | | | * QtScript/JavaScriptCore: Backport random number generator seeding fixKent Hansen2010-10-057-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported changes: || <https://webkit.org/b/38719> || JavaScriptCore/wtf/RandomNumber.h should provide using WTF::* || || <https://webkit.org/b/41868> || Don't seed the JS random number generator from time() || Task-number: QTBUG-13440 Reviewed-by: Simon Hausmann
| | | | * Fix performance regression in QUuid::createUuid()Bradley T. Hughes2010-10-055-26/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit 4363d4eebce4afd2ce3b3d6da205f8037357099a, createUuid() would create a QFile, open it, read from it, and destroy it. This resulted in a pretty serious performance regression (report says around 2000 times slower, I measured 3600 times slower on my machine). This change creates one QFile per thread (since QFile is not thread safe) and leaves the file open until the thread exits (at which point QThreadStorage deletes the QFile). This approach is around 600 times faster than the current code, which is around 6 times slower than the original. Unfortunately, it is not possible to restore the original performance without reintroducing the problems that the commit mentioned above had fixed. Benchmark is included. Task-number: QTBUG-13877 Reviewed-by: thiago Reviewed-by: mgoetz
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-0423-884/+2469
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Update japanese translations. Ensure that the underline is only drawn when expected for an accel Small improvement in the textedit demo My changes for 4.7.1 QWorkspace: fix hardcoded min size overwriting the real min size Doc: Fixing link titles and error color in search results Doc: Implementing features to the search feature. Setting the _NET_WM_STATE Atom only when its not already set Fix focus appearance of tabwidget tabs with QGtkStyle Incorrect selection background for unfocused widgets with GTK Make the OpenSSL library search also hit /lib. Update change log. Doc: Implementing new doc search dialog. Doc: fixing slim fit style - search box. Doc: add style to new search results Doc: fixing bugs in slim-fit style Doc: Added lisence header to snippet Fix a link that no longer exists in documentation. Remove obsolete reference to qregexp.tex. Reference to QStringList::find() is incorrect, should be QStringList::filter(). ...
| | | | | * Update japanese translations.axasia2010-10-046-661/+1952
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 837 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | | | * Ensure that the underline is only drawn when expected for an accelAndy Shaw2010-10-042-4/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac, the underline for an accel should not be drawn at all as this is not part of the style guidelines. This ensures that it is not drawn. Autotest included which required a change to drawItemText() to go via the proxy as well so that the autotest would be useful too. Task-number: QTBUG-14172 Reviewed-by: Richard
| | | | | * Small improvement in the textedit demoDenis Dzyubenko2010-10-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to retrieve the content of the clipboard just to check if it is empty or not - that is quite a heavy operation if the clipboard contains large piece of data. Related to QTBUG-11085 Reviewed-by: Bradley T. Hughes
| | | | | * My changes for 4.7.1Miikka Heikkinen2010-10-041-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | | * Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-045-188/+352
| | | | | |\
| | | | | | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-011164-2053/+9426
| | | | | | |\
| | | | | | * | Doc: Fixing link titles and error color in search resultsMorten Engvoldsen2010-10-011-2/+8
| | | | | | | |
| | | | | | * | Doc: Implementing features to the search feature.Morten Engvoldsen2010-10-013-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding search to narrow/slim fit mode
| | | | | | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-3070-141/+170911
| | | | | | |\ \
| | | | | | * | | Doc: Implementing new doc search dialog.Morten Engvoldsen2010-09-293-88/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing search results from menus and including them in a floating dialog div element
| | | | | | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2845-4601/+679
| | | | | | |\ \ \
| | | | | | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-09-281-4/+3
| | | | | | |\ \ \ \
| | | | | | | * | | | Doc: fixing slim fit style - search box.Morten Engvoldsen2010-09-281-4/+3
| | | | | | | | | | |
| | | | | | * | | | | Doc: add style to new search resultsMorten Engvoldsen2010-09-281-1/+79
| | | | | | | | | | |
| | | | | | * | | | | Merge branch '4.7' into newSearchMorten Engvoldsen2010-09-28129-668/+2199
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-09-281-0/+39
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-28125-634/+2144
| | | | | | | | |\ \ \ \
| | | | | | | | * | | | | Doc: Added lisence header to snippetGeir Vattekar2010-09-281-0/+39
| | | | | | | | | | | | |
| | | | | | | * | | | | | Doc: fixing bugs in slim-fit styleMorten Engvoldsen2010-09-282-34/+3
| | | | | | | | |/ / / / | | | | | | | |/| | | |
| | | | | | * | | | | | Doc: Implementing new search displayMorten Engvoldsen2010-09-242-94/+138
| | | | | | | | | | | |
| | | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-049-28/+63
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QWorkspace: fix hardcoded min size overwriting the real min size Setting the _NET_WM_STATE Atom only when its not already set Fix focus appearance of tabwidget tabs with QGtkStyle Incorrect selection background for unfocused widgets with GTK Make the OpenSSL library search also hit /lib. Update change log. Fix a link that no longer exists in documentation. Remove obsolete reference to qregexp.tex. Reference to QStringList::find() is incorrect, should be QStringList::filter().
| | | | | | * \ \ \ \ \ \ Merge branch 'reviews/2429' into os1-4.7Marius Storm-Olsen2010-10-012-6/+19
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | QWorkspace: fix hardcoded min size overwriting the real min sizeDavid Faure2010-10-012-6/+19
| | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The setMinimumSize call was having precedence over the minimumSizeHint, so when having a sizegrip enabled it was possible to resize a MDI window to a much smaller size than its min size (actually it would flicker between the two sizes, on each resize). Fixed by moving that min size (for the titlebar contents) to the calculations in minimumSizeHint(). Reviewed-by: mariusso
| | | | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-10-011180-2133/+9744
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-014-16/+42
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|/ | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Setting the _NET_WM_STATE Atom only when its not already set Fix focus appearance of tabwidget tabs with QGtkStyle Incorrect selection background for unfocused widgets with GTK Make the OpenSSL library search also hit /lib. Update change log.
| | | | | | | | * | | | | | Setting the _NET_WM_STATE Atom only when its not already setDominik Holland2010-10-011-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QT-3918 Reviewed By: Bradley T. Hughes
| | | | | | | | * | | | | | Fix focus appearance of tabwidget tabs with QGtkStyleJens Bache-Wiig2010-10-011-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an issue with ubuntu Ambience theme since it requires a custom tab style. This was not currently supported by QGtkStyle. Task-number: QTBUG-14161 Reviewed-by: thorbjorn
| | | | | | | | * | | | | | Incorrect selection background for unfocused widgets with GTKJens Bache-Wiig2010-10-011-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ubuntu 10.10 the unfocused selection background is different from the focused one. Interestingly they use GTK_STATE_ACTIVE for unfocused widgets. This was verified back to GTK 2.10 which is the required minimum for QGtkStyle so it should be safe for all other styles as well. Task-number: QTBUG-13792 Reviewed-by: thorbjorn
| | | | | | | | * | | | | | Make the OpenSSL library search also hit /lib.Thiago Macieira2010-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: http://bugs.meego.com/show_bug.cgi?id=7777 Reviewed-by: Markus Goetz
| | | | | | | | * | | | | | Update change log.Andrew den Exter2010-10-011-1/+5
| | | | | | | | | | | | | |
generated by cgit v0.12 at 2025-01-17 00:32:40 (GMT)