summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
| |
| * Doc: Various fixes to documentation, some based on changes in master.David Boddie2011-05-232-1/+13
| |
| * Doc: Added missing project and desktop files.David Boddie2011-05-231-0/+11
| |
| * Doc: Documented the value returned when no field can be found.David Boddie2011-05-231-1/+2
| | | | | | | | Task-number: QTBUG-19115
| * Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-23302-0/+5585
| |
| * Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-23474-649/+3172
| | | | | | | | (4.7-generated-declarative branch).
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-2415-60/+249
|\ \ | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: QUrl auto test: include core-private headers QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..." Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCore
| * | QUrl auto test: include core-private headersPeter Hartmann2011-05-241-1/+1
| | | | | | | | | | | | | | | | | | ... for the newly introduced TLD test. Task-number: QTBUG-13601
| * | QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..."Peter Hartmann2011-05-241-4/+4
| | | | | | | | | | | | | | | | | | | | | see previous commit Task-number: QTBUG-13601 (cherry picked from commit 9face4b88de2db6f552149d2f96257620e971a59)
| * | Add QUrl::topLevelDomain() and move TLD table from QtNetwork to QtCoreRobert Hogan2011-05-2414-55/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Qt's copy of the Mozilla public suffix list from QtNetwork to QtCore and use it to expose a new API function QUrl::topLevelDomain(). This function returns the section of the url that is a registrar-controlled top level domain. QtCore now exports a couple of functions to the other Qt modules: qTopLevelDomain, a helper function for QUrl::topLevelDomain(); and qIsEffectiveTLD(), a helper function for QNetworkCookeieJar. The motivation for this new API is to allow QtWebKit implement a Third-Party Cookie blocking policy. For this QtWebKit needs to know the element of the url that is the registry-controlled TLD. Without this knowledge it would end up blocking third-party cookies per host rather than per registry-controlled domain. See also https://bugs.webkit.org/show_bug.cgi?id=45455 Merge-request: 1205 Task-number: QTBUG-13601 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from commit 154402f56dcf8303a6ce601a52215226af8d31ba)
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-241-1/+5
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: fix Symbian ordinals for merge request re. utf8 characters in SSL certs
| * | fix Symbian ordinals for merge request re. utf8 characters in SSL certsPeter Hartmann2011-05-241-1/+5
| | | | | | | | | | | | | | | Task-number: QTBUG-7912 (cherry picked from commit 83c37059df7f23be482d4ecb2c54603a3665a33d)
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-247-41/+86
|\| | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: add auto test for SSL certificates containing utf8 characters fix coding style for merge request re. utf8 characters in SSL certs Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerName
| * | add auto test for SSL certificates containing utf8 charactersPierre Rossi2011-05-234-5/+58
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-7912 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from commit 19c77b5e5e5fefedafcfbd587c3fbb4114d7c641)
| * | fix coding style for merge request re. utf8 characters in SSL certsPierre Rossi2011-05-231-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | fixes minor coding issues for "Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerName" Task-number: QTBUG-7912 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from commit 2e8d206fd9f656cd88b797c059ef83ed3df32881)
| * | Use OpenSSL X509_NAME_ENTRY API to parse UTF8 subjectName/issuerNameRaul Metsma2011-05-233-36/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | ... to be able to display non-ASCII names from subject and issuerInfo. Task-number: QTBUG-7912 Merge-request: 922 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from commit e5d94256be2525c24a8b61edd771662b7f2b8be3)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 06:30:11 +0000