summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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.
| * Remove redundant #ifdef's from benchmarksJason McDonald2011-05-1923-158/+13
| | | | | | | | | | | | | | | | Preprocessor directives that refer to QT_VERSION's less than Qt 5 are redundant in the qt5 modules. Change-Id: Id3a9c5f0ba07b72d1c99e51c12a240570bf0d58e Reviewed-by: Rohan McGovern
| * Improve coding style of qdatastream testJason McDonald2011-05-191-525/+520
| | | | | | | | | | | | | | | | Expand literal tabs and format switch statements in accordance with the Qt Coding Style. Change-Id: I64e638b730f4be2bc707136b1b7e5585d6808731 Reviewed-by: Rohan McGovern
| * Don't use Qt3Support in arthur test suite.Jason McDonald2011-05-1910-230/+1
| | | | | | | | | | | | Change-Id: I5acc05aeb7db5aedbbe35594f46d614319a299b2 Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * Remove Qt3Support code from QMenuBar autotestJason McDonald2011-05-191-465/+0
| | | | | | | | | | | | Change-Id: I63677bfe56ec92c1c96e2df5619ee434bdc91fdb Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * Remove Qt3Support code from QSplitter autotestJason McDonald2011-05-191-657/+2
| | | | | | | | | | | | | | | | | | Note that the functions suffixed with a 3 were actually the Qt4 versions, which is why this patch looks strange. Change-Id: Iec874153248f57b8696a289cb13eb60fecc5699c Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * Remove Qt3Support code from QSharedPointer autotestJason McDonald2011-05-192-11/+6
| | | | | | | | | | | | Change-Id: I1bb3752e3a5101e4a2990d0cac01406e6023ee2e Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * Remove Qt3Support code from QComboBox autotestJason McDonald2011-05-191-19/+5
| | | | | | | | | | | | | | | | | | This commit removes the second-last column of test data (labeled testQt3Support) of the insertItem test function. Change-Id: I2158bdb5a77c9eaf1424998f51fb03a8df934490 Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * Remove Qt3Support test code from accessibility autotestJason McDonald2011-05-191-1007/+0
| | | | | | | | | | | | Change-Id: Id31836ea52da71b40c0bcbb67d9beffc70b90400 Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * tests: allow unstable tests to be marked with CONFIG+=insignificant_testRohan McGovern2011-05-191-0/+4
| | | | | | | | | | | | | | | | | | | | Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Reviewed-by: Jason McDonald Change-Id: I50a712c33c2ebb0af39f1ea0bf2adef7f0936425
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-191-293/+9
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Remove Qt3Support code from QDataStream autotest.
| * Remove Qt3Support code from QDataStream autotest.Jason McDonald2011-05-191-293/+9
| | | | | | | | | | | | | | | | | | QWMatrix and QColorGroup were Qt 3 classes and QPalette is substantially different in Qt 3 and Qt 4. Change-Id: Iee176fcf237c3f9ac2ffd7f1fd9e4963dc4df39c 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-1952-3987/+257
|\| | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: tests: fixed compilation of tst_qtextstream QUiLoader, QAbstractFormBuilder: Introduce errorString(). Enable configuration for Xcb Fall back to using paths for large fonts in drawStaticText() Add ability to work around non-standard GLES implementations Fix broken drawing with large fonts using QStaticText and FreeType Remove Q_ASSERT's from qdbustype autotest Remove autotest code for Qt3Support library.
| * tests: fixed compilation of tst_qtextstreamRohan McGovern2011-05-191-1/+1
| | | | | | | | | | | | | | | | Compilation of this autotest was broken by a strange qmake bug, QTBUG-19393. Work around it by putting a space between two string literals. Change-Id: I494c486dd11858eeaf98d7a04021c74fcf3cbba7
| * QUiLoader, QAbstractFormBuilder: Introduce errorString().Friedemann Kleint2011-05-186-24/+110
| | | | | | | | | | | | | | | | | | | | | | | | Introduce errorString() to be able to obtain load errors in Qt Designer. Remove automatic Qt 3 form conversion from Qt Designer (since uic3 no longer exists) and move all form load error checking logic including language check into QAbstractFormBuilder. Make language accessible in FormBuilderExtra in case Jambi is revived. Reviewed-by: hjk
| * Enable configuration for XcbEckhart Koppen2011-05-182-1/+25
| | | | | | | | | | | | | | | | The xcb platform plugin can now be enabled using -xcb at configuration time. A configuration time compilation check will be added at a later point. Reviewed-by: Samuel Rødal
| * Fall back to using paths for large fonts in drawStaticText()Eskil Abrahamsen Blomfeldt2011-05-184-14/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QStaticText had an implicit risk which meant you had to make sure the text size did not grow unreasonably large. This was intended to avoid hiding the performance impact of using QStaticText for such a purpose, but it's too inconvenient. Thus, the same fall back as in drawTextItem() has been introduced. This will also fix a bug recently introduced when we started using the FT cache to draw static text in the raster engine, since this will fail for large fonts. Task-number: QTBUG-19084, QTBUG-19370 Reviewed-by: Jiang Jiang (cherry picked from commit 0aa9b30432cec3b7f366983f451fc9a7f8f83243)
| * Add ability to work around non-standard GLES implementationsPaul Olav Tvete2011-05-181-3/+3
| | | | | | | | Reviewed-by: Gunnar
| * Fix broken drawing with large fonts using QStaticText and FreeTypeEskil Abrahamsen Blomfeldt2011-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | In FreeType, there's a fall back to QFontEngine::alphaMapForGlyph() when the fonts are very large. Since this uses a QPainterPath containing an unhinted glyph, the use of hinted metrics would sometimes lead to the glyphs being clipped because they would be positioned slightly outside the image they were painted into. When outline drawing is on, it makes sense to return unhinted metrics, since the glyphs we will actually use are unhinted. Task-number: QTBUG-19067 Reviewed-by: Jiang Jiang
| * Remove Q_ASSERT's from qdbustype autotestJason McDonald2011-05-181-4/+4
| | | | | | | | | | | | Change-Id: I276750d8acda3744ee8a9c424b2da0a08e8c7461 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern
| * Remove autotest code for Qt3Support library.Jason McDonald2011-05-1837-3939/+45
| | | | | | | | | | | | | | | | | | | | This commit deals with the simple cases -- mostly just removing blocks of code enclosed in #ifdef QT3_SUPPORT. Later commits will deal with the trickier cases. Change-Id: I280dea25b3754be175efe62fc7e5e4e7c304e658 Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-1910-35/+21
|\ \ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: QT_USE_QSTRINGBUILDER to fix source compatibility
| * | QT_USE_QSTRINGBUILDER to fix source compatibilityOlivier Goffart2011-05-1810-35/+21
|/ / | | | | | | | | | | | | | | | | | | | | | | In 4.8 we added support for using StringBuilder with QByteArray. But this is breaking source compatibility for people that used QT_USE_FAST_OPERATOR_PLUS in Qt 4.7. So we introduce a new macro Notice that QT_USE_FAST_CONCATENATION was not working without QT_USE_FAST_OPERATOR_PLUS, so we remove the checking of that macro. Reviewed-by: joao (cherry picked from commit 8447f5616be731d78081f326bb9cb3f5aa9087a4)
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-185-8399/+9
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Make QDataStream test compile and re-enable it
| * Make QDataStream test compile and re-enable itJason McDonald2011-05-185-8399/+9
| | | | | | | | | | | | | | | | | | | | This test can't use svg files as QtSvg is a separate module, on which qtbase does not depend. This commit changes the test to use a pixmap that was already present in the test. Change-Id: Iab4ce70aa376a7d2985b69816bd251ce4f5d46cf Task-number: QTBUG-19244 Reviewed-by: Rohan McGovern
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-1873-840/+884
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (84 commits) Reduce usage of Q_ASSERT in autotests. Fixed license header. Remove Q_ASSERT's from qsharedmemory autotest Remove Q_ASSERT's from QNetworkReply autotest Remove Q_ASSERT from QXmlStream autotest Remove Q_ASSERT's from QXmlStream autotest Remove Q_ASSERT from QItemModel autotest Remove Q_ASSERT's from QXmlStream autotest Remove Q_ASSERT from QVariant autotest Remove Q_ASSERT's from QTreeView autotest Remove Q_ASSERT from qtesselator autotest Remove unused function from qtessellator autotest Remove Q_ASSERT's from qreadwritelock autotest Remove Q_ASSERT's from QObject autotest Remove Q_ASSERT's from QObject autotest Remove Q_ASSERT's from QNetworkReply autotest Remove Q_ASSERT from qitemmodel autotest Remove Q_ASSERT's from QMutex autotest Remove Q_ASSERT from QMetaType autotest Remove Q_ASSERT's in qitemview autotest ...
| * Reduce usage of Q_ASSERT in autotests.Rohan McGovern2011-05-1822-172/+160
| | | | | | | | | | | | | | | | | | | | | | | | Using Q_ASSERT does nothing in release-mode builds, and in debug builds it causes tests to terminate prematurely. It is much better to use QVERIFY or QCOMPARE. Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 3475168550c1a804f04f2a4edfeb30c04cd36551) Change-Id: Ic39972b685ca35a9a71d9c8d03e8dae31481fb19
| * Fixed license header.Rohan McGovern2011-05-181-0/+42
| | | | | | | | | | | | (cherry picked from commit 2caea6081fc46217636f0ab70d09891efd2d2864) Change-Id: I086c8cb2d0ccc691d8af68804132f048bee7fa4b
| * Remove Q_ASSERT's from qsharedmemory autotestJason McDonald2011-05-182-2/+4
| | | | | | | | | | | | | | | | | | Report a fatal error rather than ignoring the error in non-debug builds. Change-Id: Ib6ef993e6e0c65bd9adea994ea7b454cc147f3d4 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 637456edef085d1825f15429cd921f2f0d4bd6a2)
| * Remove Q_ASSERT's from QNetworkReply autotestJason McDonald2011-05-181-7/+11
| | | | | | | | | | | | | | | | | | | | Rather than aborting in debug builds and failing mysteriously in release builds, report fatal errors in all builds. Change-Id: I020b06e19b7ffc8ae4413e1756259f4ca608f253 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit bbfefe1b764cd41b7e677f26621fb6e76a67f9d7)
| * Remove Q_ASSERT from QXmlStream autotestJason McDonald2011-05-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | Report a meaningful fatal error if an unknown token type is encountered rather than ignoring the error in non-debug builds and reporting an uninformative message in debug builds. Change-Id: Id219f3c7cbd4ba3e9875cb81f833720d5d153132 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 1c85fc559ee456a165527d23cb1b7dc237f5504b)
| * Remove Q_ASSERT's from QXmlStream autotestJason McDonald2011-05-181-5/+10
| | | | | | | | | | | | | | | | | | Report fatal errors rather than ignoring them in non-debug builds. Change-Id: I62dd177e2f391e64c12314bf224f8952ed6f3144 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 4793c3bd1dfddcc98eae12e5caf29ff6aabd31b2)
| * Remove Q_ASSERT from QItemModel autotestJason McDonald2011-05-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | If populateTestData() would return an invalid model index, report a meaningful fatal error rather than failing silently in a release build and aborting with an uninformative error message in a debug build. Change-Id: I96820429a25ce5c4eb375d50e7e1f672851e26e6 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 984a72a8bbf853059f0eb7e1054538b48d5f3bc8)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 11:51:07 +0000