summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add some autotests and benchmarks for QUuidLiang Qi2011-05-272-2/+152
| | | | | | | | | | | Missing those functions for optimization. Reviewed-by: joao (cherry picked from commit 4e9286880fd2686e61de2c4be3c317e01f0d9989) Change-Id: I147e028f10cec7abc545dcbcca911d39a89d830e Reviewed-on: http://codereview.qt.nokia.com/165 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Optimize QUuid::toString() and relevantLiang Qi2011-05-272-55/+100
| | | | | | | | | | | | | | | | QUuid::toString() and QUuid(const QString &) are too slow now. Task-number: QTBUG-19418 Reviewed-by: joao Reviewed-by: Denis Dzyubenko Reviewed-by: Ritt Konstantin Reviewed-by: Robin Burchell Reviewed-by: Richard J. Moore (cherry picked from commit 7ce566ed82666ac08f137f4d8590ce589d42c82a) Change-Id: I7e5bb4072f0941c20a7278a2d9766d4ef47be811 Reviewed-on: http://codereview.qt.nokia.com/166 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* tests: fixed compile of tst_macguiRohan McGovern2011-05-271-0/+2
| | | | | | | | This test uses private headers. Mark it as such. Change-Id: Icb6463629e1414b9da5403d0e0d766d8a113bd57 Reviewed-on: http://codereview.qt.nokia.com/160 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* tests: fixed compilation of qstring benchmark on macRohan McGovern2011-05-271-2/+7
| | | | | | | | | | | | | On Mac, MAP_ANONYMOUS and MAP_POPULATE are not defined. Fix MAP_ANONYMOUS by defining it to MAP_ANON. Fix MAP_POPULATE by removing it, because its usage was unnecessary in this code (the page was explicitly faulted in a few lines later anyway). Change-Id: Iead82e1a949b35fe3c304d38babac8d4dc6f0769 Reviewed-on: http://codereview.qt.nokia.com/162 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Make lexgen tests compileJason McDonald2011-05-271-2/+1
| | | | | | | | Correctly declare that the tests depend on the Qt build having testlib. Change-Id: Icf3332bc81a10e701316f1cd7021d2f6d3c2f424 Reviewed-on: http://codereview.qt.nokia.com/158 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Use "QT += testlib" consistentlyJason McDonald2011-05-2711-36/+7
| | | | | | | | | | If a project uses "load(qttest_p4)" it doesn't need to add testlib to the CONFIG or QT variables. If a project does not use "load(qttest_p4)", it should add "testlib" to the QT variable. Change-Id: If28353713ccdfe13612682e3e88dadebe2f2eefd Reviewed-on: http://codereview.qt.nokia.com/159 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix infinite recursion when changing geometry on MacGabriel de Dietrich2011-05-262-7/+19
| | | | | | | | | | | | Some complex widgets might get a negatively sized rectangle when calling QWidgetPrivate:setGeometry_sys_helper(), triggering a infinite recursion. Normalizing the rectangle size before checking for size change is enough to break this infinite recursion. Task-number: QTBUG-17333 Change-Id: I4682c3088ea53fb9f28f746c8264f573b5284825 Reviewed-on: http://codereview.qt.nokia.com/156 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Fix typo in commentOlivier Goffart2011-05-261-1/+1
| | | | | | | | (cherry picked from commit c8a3c427e96ee11907592f5c7f72046795c027ed) Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510 Reviewed-on: http://codereview.qt.nokia.com/145 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-by: axis
* Added some of my Qt 4.8 changes to the changelogOlivier Goffart2011-05-261-0/+22
| | | | | | Change-Id: I8913c88e5bd68145e0587d51ee9896fd5d21054a Reviewed-on: http://codereview.qt.nokia.com/140 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* MSVC do not really support initilizer_listOlivier Goffart2011-05-261-6/+2
| | | | | | | | | | | std::initializer_list exists, but it is not possible to do bracket initialisation Reviewed-by: Joao (cherry picked from commit a09f5c425079405e72078813bdb7b103c29a5221) Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510 Reviewed-on: http://codereview.qt.nokia.com/143 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Support of lambdas in QtConcurrent::runOlivier Goffart2011-05-266-81/+194
| | | | | | | | Reviewed-by: Joao (cherry picked from commit 917f2ff617209bcc283eb3590b422bcf239c0537) Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510 Reviewed-on: http://codereview.qt.nokia.com/142 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Add QtPrivate::QEnableIfOlivier Goffart2011-05-261-0/+6
| | | | | | | | | | | | Needed for QtConcurrent. Like the new std::enable_if (in c++0x) Reviewed-by: Joao (cherry picked from commit 837f18f043b18410c1d93b9f1156acf729dad510) Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510 Reviewed-on: http://codereview.qt.nokia.com/141 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Tests for QtConcurrent::map using lambdasOlivier Goffart2011-05-261-0/+21
| | | | | | | | | | Also disable tests with std::vector in c++0x as they do not compile Reviewed-by: Joao (cherry picked from commit 38d1b31006ecc83811bbb13e5a4182eac593a970) Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510 Reviewed-on: http://codereview.qt.nokia.com/144 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Fix instability in QNetworkConfigurationManager autotestShane Kearns2011-05-261-2/+4
| | | | | | | | | | | | | | | QThread::isFinished() can return false after the finished() signal is emitted, so test the event loop's timeout() function instead. Don't compare prescan configurations, as these may be cached by the OS. It was causing the test to fail on linux if run before any other network test. Reviewed-by: mread (cherry picked from commit e2320ec17446dc6e851fcf4ea2d998177b0d8049) Change-Id: I35d67294871a35e2e63619f4acb0c3c32caa5eea Reviewed-on: http://codereview.qt.nokia.com/137 Reviewed-by: Markus Goetz
* Fix thread safety regression of QNetworkConfigurationManagerShane Kearns2011-05-262-2/+2
| | | | | | | | | | | | | Changes in 4.8 led to a timer being created in the wrong thread. I have restored the invokeMethod used to call startPolling() to solve this problem. Reviewed-By: mread (cherry picked from commit e9e95f75e7c1e8325c2acce0087ff8677d773779) Change-Id: I8b89fa89766679beb2d469f9bbd1f5e2233f061b Reviewed-on: http://codereview.qt.nokia.com/138 Reviewed-by: Markus Goetz
* Update qhostinfo autotest to expect RFC5952 formatted ipv6 addressesShane Kearns2011-05-261-6/+6
| | | | | | | | | | | Test required updating due to ebc134db484eee31491836b619aad1ee86e3070e Reviewed-by: Martin Petersson (cherry picked from commit e46e32644720f0ddeb553b8a658c1711a4b5cdfb) Change-Id: Idf3df633534a0d914bd22fd589a8c521eb426bc8 Reviewed-on: http://codereview.qt.nokia.com/139 Reviewed-by: Markus Goetz
* fix "Host" header of ipv6 URLs in QNAMshiroki2011-05-262-10/+20
| | | | | | Change-Id: I6bf3320e5ab285e3d1f4d72bd1ef0a0e42813e5b Reviewed-on: http://codereview.qt.nokia.com/115 Reviewed-by: Markus Goetz
* Add QtTools' include/QtDesigner as well as QtCore's include/QtDesignerMarius Storm-Olsen2011-05-261-4/+3
| | | | | | | | | | | | | In modularization QT+=uilib adds the QtCore specific include/QtDesigner, while QT += designer adds the QtTools specific one. Using !isEmpty(QT.<module/library>.name) is the proper way to check for module/library existance in modularized Qt. Change-Id: If1fe5d192129fd1cdbf43183b52327d7fa9c57ec Reviewed-on: http://codereview.qt.nokia.com/126 Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Add private header support to the EGLFS platform plugin.Jason Barron2011-05-261-1/+1
| | | | | | | | | | Several of the QPA headers include private headers in the Core, Gui and OpenGL modules and with the new modularized Qt, we need to opt-in for these. Change-Id: Ib7a81f7843ef89e3c5c5218f790287bb6c00e4cb Reviewed-on: http://codereview.qt.nokia.com/133 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fixed ordering problem when configuring with `-make <part>'Rohan McGovern2011-05-261-14/+24
| | | | | | | | | | | | | | | | Prior to this change, running configure with the `-make' option would affect the order in which parts of Qt are built. This is unintuitive and would easily cause build failures. For example, configuring with `./configure -make demos' would attempt to build demos before building libs, which, of course, would fail. Refactor the code so that the result is the same regardless of the order of `-make' options. Change-Id: Idfa61834a0f01d0628a9a1ae27ece94ae3647e6d Reviewed-on: http://codereview.qt.nokia.com/128 Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove the redundant QTEST_ACCESSIBILITY define.Jason McDonald2011-05-262-17/+2
| | | | | | | | | | | | | QTEST_ACCESSIBILITY was always defined and only used in one autotest. Code that uses accessibility features should be excluded if Qt was built without accessibility rather than based on a define in the test framework. Change-Id: I3a517a579a51f536a0983b43bd99e86292026552 Reviewed-by: pending Reviewed-on: http://codereview.qt.nokia.com/129 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix for compiling and running cube example on Windows.Kim Motoyoshi Kalland2011-05-253-1/+6
| | | | | | Change-Id: I0bf933fe81e332c03a81874cb371fa423634621b Reviewed-on: http://codereview.qt.nokia.com/125 Reviewed-by: David Boddie
* Fix QGLWidget::renderPixmap for raster engine on MacJiang Jiang2011-05-251-2/+9
| | | | | | | | | | | | | | The QPixmap buffer is backed by QRasterPixmapData instead of QMacPixmapData for the raster engine, thus we have to update qt_mac_pixmap_get_base() and qt_mac_pixmap_get_bytes_per_line(), so that QGLWidget can locate the offscreen buffer from a QPixmap. Reviewed-by: Fabien Freling (cherry picked from commit c5846314dfd80e7f7f32ba737f1884dcccbbd80d) Change-Id: I2414222f8a59e02c778177d52ad9a6e0ff68668d Reviewed-on: http://codereview.qt.nokia.com/123 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Workaround a bug in Core Text to select Light fontsJiang Jiang2011-05-251-1/+6
| | | | | | | | | | | | | | | | | | | | | Currently in Core Text there is not proper way to select fonts with Light weight, for example: QFont font("Helvetica"); font.setWeight(QFont::Light); will give you Helvetica-Light, as with: QFont font("Helvetica"); font.setWeight(QFont::Normal); because of a bug in Core Text, applying 0 symbolic traits with CTFontCreateCopyWithSymbolicTraits will always return the Light variant of that font family. Thus, we should only do this unless symbolicTraits is not 0 or font.weight is not Normal (Light is not a symbolic trait, but CT doesn't support selecting Light weight numerically). Reviewed-by: Eskil (cherry picked from commit 4d5b8f66d82e9087d9d58a4e76e6b46ce7bb53cc) Change-Id: I37a970aba5019a13b9f3bc43b7fb594b74a1aa37 Reviewed-on: http://codereview.qt.nokia.com/124 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Add authentication token support for wayland windowsLasse Holmstedt2011-05-256-14/+53
| | | | | | | | | | | For compositors that support it, the wayland clients can associate themselves with an auth token, specified by WL_AUTHENTICATION_TOKEN env var, or by directly specifying it in the wayland client plugin. Change-Id: I74a50a27c7c61c2b2cf1e09868618f36edc94cb1 Reviewed-by: Samuel Rødal Reviewed-on: http://codereview.qt.nokia.com/116 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Fix QFontEngineX11FT compilationJiang Jiang2011-05-251-0/+2
| | | | | | | | | | | xglyph_format is only available when XRender is present. Reviewed-by: Fabien Freling (cherry picked from commit a6642e4659b3d45ffa94f9a3c6413124d49f2b91) Change-Id: Ibd767c5055c8fb4a7d28ace141f6713f4367d1ba Reviewed-on: http://codereview.qt.nokia.com/113 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Doc: Fixing typoSergio Ahumada2011-05-251-2/+2
| | | | | | Change-Id: Icd73646a9562af5fd6ae56e36ca268719d32471c Reviewed-on: http://codereview.qt.nokia.com/112 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-251-13/+0
|\ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Compile.
| * Compile. Morten Sorvig2011-05-251-13/+0
| | | | | | | | | | Change 0748751c brought in an extra copy of this function.
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-251-1/+5
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Do not continue if syncqt fails.
| * Do not continue if syncqt fails.Lincoln Ramsay2011-05-251-1/+5
| | | | | | | | | | | | | | | | | | | | If the user has set QTDIR to something other than the location of the qtbase build directory, syncqt will fail. This change prevents the build from continuing. Ideally, the system should ignore the user-set QTDIR value or give an appropriate error. Reviewed-by: Rohan McGovern
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-251-4/+2
|\ \ | |/ | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Fix -nomake tests.
| * Fix -nomake tests.Lincoln Ramsay2011-05-251-4/+2
| | | | | | | | | | | | | | It now means "don't run qmake", not just "don't build". This is consistent with -nomake demos and -nomake examples Reviewed-by: Rohan Mcgovern
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-255312-76855/+85487
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (21 commits) Fixed line endings. Update licenseheader text in source files for qtbase Qt module New configure.exe binary Add -qpa option on Windows Use qglobal.h's VERSION number instead of hardcoded current version More examples adjusted to Symbian and Maemo5. (cherry picked from commit a97b9620a584c9b1a2e006873183526b3d7e001e) Doc: Added some details to the accessibility events API documentation. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Made an additional change for clarity. Doc: Noted that the example will not work as expected with a mouse. Doc: Fixed qdoc warnings. Doc: Applying a pending change from previous merges. Doc: Fixed qdoc warning. Doc: Fixed qdoc warnings. Doc: Applied pending fixes to API documentation. Doc: Various fixes to documentation, some based on changes in master. Doc: Added missing project and desktop files. Doc: Documented the value returned when no field can be found. Squashed commit of changes from the 4.8-temp branch. ...
| * Fixed line endings.David Boddie2011-05-247-0/+316
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/widgets/applicationicon/applicationicon.svg examples/widgets/applicationicon/main.cpp examples/widgets/elidedlabel/elidedlabel.cpp examples/widgets/elidedlabel/elidedlabel.h examples/widgets/elidedlabel/main.cpp examples/widgets/elidedlabel/testwidget.cpp examples/widgets/elidedlabel/testwidget.h (cherry picked from commit 1b555a91f05b68c697b6985d1b672dc0fba5fc5a) (cherry picked from commit c0e0bfdd451f42b10051e8064153b811080ffa0e)
| * Update licenseheader text in source files for qtbase Qt moduleJyri Tahtela2011-05-244541-75952/+75952
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * New configure.exe binaryMarius Storm-Olsen2011-05-231-0/+0
| |
| * Add -qpa option on WindowsMarius Storm-Olsen2011-05-231-1/+8
| | | | | | | | | | Done-by: owolff Done-by: Friedemann Kleint
| * Use qglobal.h's VERSION number instead of hardcoded current versionMarius Storm-Olsen2011-05-231-1/+1
| | | | | | | | Done-by: Friedemann Kleint
| * More examples adjusted to Symbian and Maemo5.David Boddie2011-05-231-0/+11
| | | | | | | | (cherry picked from commit a97b9620a584c9b1a2e006873183526b3d7e001e)
| * Doc: Added some details to the accessibility events API documentation.David Boddie2011-05-231-36/+95
| | | | | | | | Reviewed-by: Frederik Gladhorn
| * Doc: Fixed qdoc warnings.David Boddie2011-05-238-44/+82
| |
| * Doc: Fixed qdoc warnings.David Boddie2011-05-232-7/+10
| |
| * Doc: Made an additional change for clarity.David Boddie2011-05-231-2/+3
| | | | | | | | Task-number: QT-4891
| * Doc: Noted that the example will not work as expected with a mouse.David Boddie2011-05-231-1/+4
| | | | | | | | Task-number: QT-4891
| * Doc: Fixed qdoc warnings.David Boddie2011-05-232-8/+8
| |
| * Doc: Applying a pending change from previous merges.David Boddie2011-05-231-0/+4
| |
| * Doc: Fixed qdoc warning.David Boddie2011-05-231-1/+1
| |
| * Doc: Fixed qdoc warnings.David Boddie2011-05-2332-158/+194
| |
| * Doc: Applied pending fixes to API documentation.David Boddie2011-05-2319-68/+90
| |