summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-238-23/+126
|\ \ \ | | |/ | |/| | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Enablers for TextInput
| * | Enablers for TextInputEskil Abrahamsen Blomfeldt2011-05-238-23/+126
| | | | | | | | | | | | | | | | | | | | | In order to use the scene graph text node in TextInput, we need enablers. Most of this is to enable selections, which in turn means we need to be able to extract a certain set of glyphs from a QTextLine.
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-233-3/+40
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Track Wayland changes
| * | Track Wayland changesPaul Olav Tvete2011-05-233-3/+40
| | | | | | | | | | | | | | | | | | | | | The wl_display_get_xxxx_visual() functions have been removed, and are replaced by a compositor event. Reviewed-by: Samuel
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-231-2/+2
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Add task numbers for disabled autotests
| * | Add task numbers for disabled autotestsJason McDonald2011-05-231-2/+2
| | | | | | | | | | | | | | | Change-Id: I830cdbf60ad1edf554b19cd7e6fdbd459f3e160f Reviewed-by: Trust Me
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-211-0/+25
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: add qmltestcase.prf for QtQuickTest
| * | add qmltestcase.prf for QtQuickTestCharles Yin2011-05-211-0/+25
|/ / | | | | | | so that 'CONFIG += qmltestcase' works
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-202-1/+18
|\ \ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range
| * | Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ↵Simon Hausmann2011-05-202-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ASCII range Qt's Shift-JIS codec maps the characters 0x5c and 0x7e to unicode yen (0x5a) and unicode overline (0x203e). ICU and (as it turns out) Symbian's native Shift-JIS codec preserve 0x5c and 0x7e when converting to Unicode. Qt's behaviour creates a problem when loading japanese web sites that are encoded in Shift-JIS. When they reference external JavaScript files, those tend to inherit the current page encoding (unless the character set is explicitly specified). Consequently JavaScript tends to contain regular expressions (as a built-in feature of the language), which in turn uses backslashes for escape sequences. Therefore it is crucial that the encodings used to decode the script preserve the ASCII range, i.e. do not convert 0x5c (ascii backslash) to something else. This patch corrects the behaviour of Qt's Shift-JIS codec to leave all characters < 0x80 unaltered in the process of conversion to and from Unicode. Task: QTBUG-19335 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> (cherry picked from commit 8e321cd869da7ff1cf0168da41aa0246b44867cc)
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-201-4/+53
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: add test case for ipv6 url parsing
| * | add test case for ipv6 url parsingshiroki2011-05-201-4/+53
|/ / | | | | | | | | Reviewed-by: Thiago (cherry picked from commit fd043eb78212de5935bc101624818070e1b4fb1b)
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-204-28/+59
|\ \ | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: tst_qhostinfo: Fix IPv6 lookup detection on Windows. Fix incorrect hardware address on systems without getifaddrs() Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.
| * | tst_qhostinfo: Fix IPv6 lookup detection on Windows.Martin Petersson2011-05-201-7/+7
| | | | | | | | | | | | | | | | | | | | | Moved the QTcpServer test to init winsock before we use getaddrinfo. Reviewed-by: Shane Kearns (cherry picked from commit 0ccf01368adcabbb25958a55976083f72116a2d5)
| * | Fix incorrect hardware address on systems without getifaddrs()Craig Scott2011-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On unix systems for which QT_NO_GETIFADDRS is defined, the way that the hardware address field is extracted from the result of a call to qt_safe_ioctl() is incorrect. The address of the ifreq.ifr_addr struct is taken rather than the appropriate member within that struct, sa_data, resulting in a memory offset and subsequently the hardware address has garbage in the first two of six fields. This commit modifies the code to pass the sa_data member instead of the address of the struct as a whole. Task-number: QTBUG-19165 Merge-request: 2614 Reviewed-by: Martin Petersson (cherry picked from commit 004ad12669ef696eeba70fd57d1eb0c67c806d1d)
| * | Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.Martin Petersson2011-05-202-20/+51
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-18426 Reviewed-by: Peter Hartmann (cherry picked from commit ebc134db484eee31491836b619aad1ee86e3070e)
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-202-0/+34
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Designer: Extend container extension.
| * | Designer: Extend container extension.Friedemann Kleint2011-05-202-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to disable adding/removing pages by adding respective bool virtual functions. Useful for implementing containers with fixed, single children like QScrollArea, QDockWidget, which require a container extension to work properly in Qt Designer. Previously, the problem was that the add/remove page context menu actions were enabled for them, leading to crashes und undesired behaviour. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-205-5/+5
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Allow arthur tests to use private headers.
| * | Allow arthur tests to use private headers.Jason McDonald2011-05-205-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | The tests include qapplication_p.h, therefore the .pro files need to specify QT += core-private gui-private Change-Id: Icd6d7ba31f79b8c7b15e0327dd5ce44c7f486221 Reviewed-by: Rohan McGovern
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-205-452/+2
|\| | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Remove mention of qt3support in makeselftest Remove Qt3Support test data from lancelot test Remove Qt3Support code from algorithms autotest Don't link qt3support lib in QMessageBox autotest
| * | Remove mention of qt3support in makeselftestJason McDonald2011-05-201-1/+0
| | | | | | | | | | | | | | | | | | Change-Id: Ie081d3a543ff30e3e58e154cbfea57a29bb24210 Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * | Remove Qt3Support test data from lancelot testJason McDonald2011-05-201-60/+0
| | | | | | | | | | | | | | | | | | | | | | | | The data was already commented out and thus unused. Change-Id: I234cea542bbacf429b6cb1fc0c9feec4f80e47e5 Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * | Remove Qt3Support code from algorithms autotestJason McDonald2011-05-202-389/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qHeapSort and qBubbleSort were Qt3 functions that were replaced by qSort. During modularization, the Qt3Support header containing these routines (q3tl.h) was moved into the algorithms autotest, presumably because that was the only thing that still included the header. However, as these routines are not part of Qt5, they don't need to be tested anymore. This commit deletes the q3tl.h header and the test functions that tested it. Change-Id: I52eed7b4b4db3bd671dc6dbd752642bc9e783c30 Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * | Don't link qt3support lib in QMessageBox autotestJason McDonald2011-05-201-2/+1
| | | | | | | | | | | | | | | | | | Change-Id: I0126dc790e88639ad524cdf719ced2a444df9b71 Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-20982-563/+119
|\| | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Remove Qt3Support code from QVariant autotest. Remove obsolete test data Remove Qt3Support code from QMenuBar test, part 2.
| * | Remove Qt3Support code from QVariant autotest.Jason McDonald2011-05-201-62/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes the four columns of test data that were only used for testing Qt3Support features. Change-Id: I93116b64ac49b0d6812595dfd58962ba8afbdad1 Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * | Remove obsolete test dataJason McDonald2011-05-20980-408/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove test data for Qt3Support functions from the QTextStream autotest. The code that used this data was removed in an earlier commit. Change-Id: I26e34cdefd47287c6992cf1d31276a40994c607c Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * | Remove Qt3Support code from QMenuBar test, part 2.Jason McDonald2011-05-201-93/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up to previous commit: remove the "_noQt3" suffixes on test function names and the "_Qt4" suffixes on variable names. Change-Id: I000e87357b025930b0065efc1d0de05c2cd07bba Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-201-0/+0
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: New configure.exe binary
| * | New configure.exe binaryMarius Storm-Olsen2011-05-191-0/+0
| | |
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-2018-55/+149
|\| | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Full translucent background support in xcb and xlib backend. Lighthouse xcb and xlib: Add support for transparency of GLX windows. Lighthouse minimal: Add support for transparency Compile fixes for Xlib plugin.
| * | Full translucent background support in xcb and xlib backend.Samuel Rødal2011-05-197-12/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to pick an alpha visual also for non-GL surface types, and to ask for alpha in the window format if the WA_TranslucentBackground attribute is set. Reviewed-by: Janusz Lewandowski (cherry picked from commit 6241e39cff9311c943430ff2f31236b13618f2ac)
| * | Lighthouse xcb and xlib: Add support for transparency of GLX windows.Janusz Lewandowski2011-05-1910-25/+78
| | | | | | | | | | | | | | | | | | Merge-request: 1231 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> (cherry picked from commit a3b627e1c5ce03a2500ab35c64729b1995639dcc)
| * | Lighthouse minimal: Add support for transparencyJanusz Lewandowski2011-05-192-3/+3
| | | | | | | | | | | | | | | | | | Merge-request: 1231 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> (cherry picked from commit c15b41056e60abdbb4d835e27a360f01be618a4f)
| * | Compile fixes for Xlib plugin.Samuel Rødal2011-05-194-15/+13
| | | | | | | | | | | | (cherry picked from commit 4af11f2c6666c55657569f946c33816f33711225)
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-202-2/+3
|\| | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Don't crash if windowmanager is not initialized Compile fix for 64bit Linux.
| * | Don't crash if windowmanager is not initializedLasse Holmstedt2011-05-191-1/+2
| | | | | | | | | | | | | | | | | | | | | This can happen if there is e.g. no wayland server. Reviewed-by: sroedal (cherry picked from commit aea5e35f57d061b133d2fa613d10f5e0118f5706)
| * | Compile fix for 64bit Linux.Friedemann Kleint2011-05-191-1/+1
| | | | | | | | | | | | Reviewed-by: Thiago <thiago.macieira@nokia.com>
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-2040-49/+76
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Tests: Fix some compile warnings.
| * | Tests: Fix some compile warnings.Friedemann Kleint2011-05-1940-49/+76
| | | | | | | | | | | | As they are now compiled by default.
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-199-1/+324
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Wayland: send surface id + process id pairs to compositor
| * | Wayland: send surface id + process id pairs to compositorLasse Holmstedt2011-05-199-1/+324
| | | | | | | | | | | | | | | | | | | | | | | | This enables doing window/process management since we can now actually map the process we've launched to a window. Reviewed-by: Samuel Rødal (cherry picked from commit 457c33d9fd308542c9290fd60bf86960f9251255)
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-192-4/+1
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Remove warning from QColor::setNamedColor().
| * | Remove warning from QColor::setNamedColor().Samuel Rødal2011-05-192-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This warning is pointless as the user can anyway check if the color is valid after making the call by calling isValid(). Using isValidColor() could be used but it has a big performance overhead as validation then needs to be done twice. Task-number: QTBUG-19098 Reviewed-by: Erik Verbruggen (cherry picked from commit a423ff5474b89028eeca95b254f5184311c8223b)
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-191-1/+1
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Fixed compile of qdrawhelper_neon.cpp.
| * | Fixed compile of qdrawhelper_neon.cpp.Samuel Rødal2011-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We need to use the quad-word intrinsic and reinterpret the cast to a signed int vector. Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com> (cherry picked from commit d2d7aef223a3bad368c6b7c7f7f4617f4acf323c)
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-1943-3074/+554
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Compile IPC tests. Always call XInitThreads. Remove redundant #ifdef's from benchmarks Improve coding style of qdatastream test Don't use Qt3Support in arthur test suite. Remove Qt3Support code from QMenuBar autotest Remove Qt3Support code from QSplitter autotest Remove Qt3Support code from QSharedPointer autotest Remove Qt3Support code from QComboBox autotest Remove Qt3Support test code from accessibility autotest tests: allow unstable tests to be marked with CONFIG+=insignificant_test
| * | Compile IPC tests.Friedemann Kleint2011-05-191-0/+1
| | |
| * | Always call XInitThreads.Gunnar Sletta2011-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Any Qt application that embeds a QSGView needs to call this because of the threaded renderer. Today applications that use threaded GL silently fail. In a few weeks time, the refactor branch will be merged, which will obsolete this change, so it is a temporary measure to get tests and examples running.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 09:13:09 +0000