summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-05-1748-334/+524
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: (23 commits) Fix QGLWidget::renderPixmap for raster engine on Mac Check if OES_texture_npot is present on OpenGL ES 2. Fix tst_QVariant::invalidColor Move QTextCursor::MoveStyle to Qt namespace Move the painting redirection to the unified toolbar surface. Fix misspelled word in comment. Build fix for tst_qrawfont Add some QRawFont related low level functions to avoid extra copying Compile on Mac Rename QGlyphs -> QGlyphRun Fix QRawFont::setPixelSize() on Mac Remove warning from QColor::setNamedColor(). Add internal documentation for QUnifiedToolbarSurface. Fix QPainter::drawGlyphs() with non-affine transformation Remove misspelled comment in tst_qtextdocument.cpp Only enable design metrics for scalable fonts Add a way to retrieve CTFontRef from QFont Include pixel size of font in exported HTML from QTextDocument Fix the autotest condition. Change the repaint() call to an update(). ...
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-05-1142-307/+447
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix QGLWidget::renderPixmap for raster engine on Mac Check if OES_texture_npot is present on OpenGL ES 2. Fix tst_QVariant::invalidColor Move QTextCursor::MoveStyle to Qt namespace Move the painting redirection to the unified toolbar surface. Fix misspelled word in comment. Build fix for tst_qrawfont Add some QRawFont related low level functions to avoid extra copying Compile on Mac Rename QGlyphs -> QGlyphRun Fix QRawFont::setPixelSize() on Mac Remove warning from QColor::setNamedColor(). Add internal documentation for QUnifiedToolbarSurface. Fix QPainter::drawGlyphs() with non-affine transformation
| | * Fix QGLWidget::renderPixmap for raster engine on MacJiang Jiang2011-05-111-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
| | * Check if OES_texture_npot is present on OpenGL ES 2.Kim Motoyoshi Kalland2011-05-111-13/+20
| | | | | | | | | | | | | | | | | | | | | Unless the OES_texture_npot extension is present, non-power- of-two textures have some restrictions on OpenGL ES 2. Reviewed-by: Samuel
| | * Fix tst_QVariant::invalidColorJiang Jiang2011-05-111-1/+0
| | | | | | | | | | | | | | | | | | | | | Since a423ff5474b89028eeca95b254f5184311c8223b, the warning message is no longer produced. Reviewed-by: Samuel Rødal
| | * Move QTextCursor::MoveStyle to Qt namespaceJiang Jiang2011-05-1117-47/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot use QTextCursor::MoveStyle enums in QTextLine because QTextCursor is not a QObject, while referring to that enum in Q_PROPERTY requires it to be. That's why we need to move the enums in Qt namespace. Reviewed-by: David Boddie
| | * Move the painting redirection to the unified toolbar surface.Fabien Freling2011-05-112-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | If the new parent of a widget is inside the unified toolbar, we need to update the redirection. Task-number: QTBUG-18150 Reviewed-by: Samuel Rødal
| | * Fix misspelled word in comment.Fabien Freling2011-05-111-1/+1
| | | | | | | | | | | | Reviewed-by: trustme
| | * Build fix for tst_qrawfontJiang Jiang2011-05-101-2/+2
| | | | | | | | | | | | Reviewed-by: Eskil
| | * Add some QRawFont related low level functions to avoid extra copyingJiang Jiang2011-05-102-5/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added functions: - QRawFont::glyphIndexesForChars(const QChar *chars, int numChars, quint32 *glyphIndexes, int *numGlyphs) const - QRawFont::advancesForGlyphIndexes(const quint32 *glyphIndexes, QPointF *advances, int numGlyphs) const Reviewed-by: Eskil
| | * Compile on MacEskil Abrahamsen Blomfeldt2011-05-101-2/+2
| | | | | | | | | | | | | | | | | | Missing API update in Q_WS_MAC block Reviewed-by: Jiang Jiang
| | * Rename QGlyphs -> QGlyphRunEskil Abrahamsen Blomfeldt2011-05-1017-222/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API clean-up for QGlyphRun: 1. QGlyphs -> QGlyphRun 2. QGlyphRun's font()/setFont() -> rawFont()/setRawFont() 3. QPainter::drawGlyphs() -> drawGlyphRun() 4. QTextLayout and QTextFragment's glyphs() -> glyphRuns() Reviewed-by: Jiang Jiang
| | * Fix QRawFont::setPixelSize() on MacEskil Abrahamsen Blomfeldt2011-05-062-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | When refactoring the setPixelSize() code of QRawFont, it was broken on Mac. To avoid making the same mistake again, I've added a simple autotest to check that the pixel size is actually set. Reviewed-by: Jiang Jiang
| | * Remove warning from QColor::setNamedColor().Samuel Rødal2011-05-062-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
| | * Add internal documentation for QUnifiedToolbarSurface.Fabien Freling2011-05-061-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | This document is aimed for developers. This is why it is directly written in the header file. This is not part of the public API. Reviewed-by: Richard Moe Gustavsen
| | * Fix QPainter::drawGlyphs() with non-affine transformationEskil Abrahamsen Blomfeldt2011-05-061-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the matrix has an non-affine transformation, the text will have to be rendered using the default path-renderer. This means going through the drawTextItem() path (since drawStaticText() has no support for those transformations) and it also means not pre-transforming the coordinates, since the default implementation of drawTextItem() supports transformations. Task-number: QTBUG-18214 Reviewed-by: Jiang Jiang
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-05-06216-2152/+3508
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (143 commits) QSslConfiguration documentation fix Remove misspelled comment in tst_qtextdocument.cpp Only enable design metrics for scalable fonts Add a way to retrieve CTFontRef from QFont Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget. don't crash in QProcessEnvironment::systemEnvironment() HTTP auto tests: do not load resources from cache that must be revalidtd HTTP cache backend: do not load resources that must be revalidated HTTP backend: do not load resources from cache that must be revalidated Compile fix for QLocale on Symbian. Added Kazakh language to the QLocale mapping table on Symbian. Added support for QLocale::uiLanguages on Symbian. QNAM HTTP: Fix bug with explicitly zero-length compressed responses. Include pixel size of font in exported HTML from QTextDocument Fix drawing text in item view: Add enablers for Symbian App Booster Don't rely on uninitialized data Don't realloc user-provided buffer qmake: Introduce new template type Fix the autotest condition. ...
| | * Merge remote branch 'qt-mainline/4.8'aavit2011-05-06208-2125/+3431
| | |\
| | * | Remove misspelled comment in tst_qtextdocument.cppEskil Abrahamsen Blomfeldt2011-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment was copy-pasted, spelling error and all, from the example in the bug report, and really doesn't make any sense at all in this context. Reviewed-by: TrustMe
| | * | Only enable design metrics for scalable fontsJiang Jiang2011-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bitmap fonts don't have linear advance at all. Reviewed-by: Eskil
| | * | Add a way to retrieve CTFontRef from QFontJiang Jiang2011-05-052-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since macFontID restricts to quint32, we have to return that in QFont::handle. Task-number: QTBUG-17890 Reviewed-by: Eskil
| | * | Merge branch 'master' into merge_rasterFabien Freling2011-05-043-23/+36
| | |\ \
| | | * | Fix the autotest condition.Fabien Freling2011-05-031-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous preprocessor directive was aimed to exclude Mac OS X. With the raster engine, the behavior is unified and we don't need to have a separate path for Mac OS X/Cocoa. The new condition excludes only Mac OS X with a graphics system other than raster or Carbon. Reviewed-by: Jiang Jiang
| | | * | Change the repaint() call to an update().Fabien Freling2011-05-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In show_sys(), if we directly call repaint() this will triggers too many UpdateRequest events. This fixes the qwidget autotest "compatibilityChildInsertedEvents". Reviewed-by: Richard Moe Gustavsen
| | | * | Fix the update() autotest for raster.Fabien Freling2011-05-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the CoreGraphics engine, we expect the test to fail with update(), but with the raster engine the behavior is the same across platforms. Hence we don't need a special case for Mac OS X with the raster engine. Reviewed-by: Samuel Rødal
| | | * | Change the repaint() to an update().Fabien Freling2011-04-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forcing to repaint might cause a recursive repaint. Since there is no apparent reason to directly repaint, we just call update(). Reviewed-by: Richard Moe Gustavsen
| | | * | Set the default graphics system to raster.Fabien Freling2011-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This change is specific to Mac OS X/Cocoa. Reviewed-by: Lars Knoll
| | | * | Merge remote branch 'fire/master'Fabien Freling2011-04-1866-664/+4566
| | | |\ \
| | * | | | Include pixel size of font in exported HTML from QTextDocumentEskil Abrahamsen Blomfeldt2011-05-042-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you copy-pasted rich text in which the font size had been set using setPixelSize() the font size would be mysteriously forgotten. The pixel size property in QTextCharFormat was added ad hoc, and not integrated in the HTML exporter. Task-number: QT-4792 Reviewed-by: Gunnar
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-1644-7233/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert all QScroller and QFlickGesture related code. Fix regression that caused waitForXXX(-1) to fail.
| * | | | | | Revert all QScroller and QFlickGesture related code.Robert Griebl2011-05-1641-7228/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 0274e68767cce6440515a68d6af868725d5577a4 2770b1277744bb676e96e4ae8c89acd645ec895d 02e1f4e83dc8e3c4ab957095167b3d34c51ba3c1 fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d d1f9a534da288884f443a975f428b0cfe0a7b29b 205d607c3387d074fb87f8deb77a8f515ae2e189 32d200da9cc7a4dfb3f302f22ef5718a286845c9 3e0df49f978933b1e4e6b48c695bf813ec9a2828 82bbc1c1611bde33680d22a1a3c6449e51d7b0b9 b78ffe51f9a4c4ac705e435d45fffe39864c032d fe438d7d828021d7f86301af36fe8dff2768532a df30d58de183d13c649ef7e0fbb8e2b3658e0862 fa845566b3733bc06454b71e33b1ff405ba32280 4f9a318d639c4e7e09e56751d31608fb39d472af 4810b587a65d81f8f90646efd09cadeb1276a756 7bad867382ad6c84155ffcfbb361709a8e8184ab 64ec011c6132496eb9555c1d09e7fd4ddf472837 81492e56aba5b5761500543665012a85d6835513 b668857b3749b39c3a61e0a25e750740b74df552 78a7a02b3b85435bc28eb23e9210522467171e42 Reviewed-By: Ralf Engels
| * | | | | | Fix regression that caused waitForXXX(-1) to fail.Thiago Macieira2011-05-163-5/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression was introduced by 8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba when it failed to check when msecs == -1. This manifested visibly in KDE failing to connect to any SSL site -- kioslaves are synchronous and use waitForXXX(-1) (in this particular case, waitForEncrypted, which calls waitForReadyRead). Also, take the opportunity to convert these tests in QTcpSocket to use port 80 (a defined service in the test server) instead of port 22. Reviewed-by: Martin Petersson
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-05-139-1/+1055
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Allow 'typeinfo <file>' lines in qmldir. qmlplugindump: Use command line options with a single dash. qmlplugindump: Allow dumping by path without URI. Move qmldump from Qt Creator to Qt.
| * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into ↵Kai Koehne2011-05-129-1/+1055
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | master-qml-staging
| | * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-05-129-1/+1055
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: Allow 'typeinfo <file>' lines in qmldir. qmlplugindump: Use command line options with a single dash. qmlplugindump: Allow dumping by path without URI. Move qmldump from Qt Creator to Qt.
| | | * | | | | | | Allow 'typeinfo <file>' lines in qmldir.Christian Kamm2011-05-123-0/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add documentation for that change. Reviewed-by: Aaron Kennedy Change-Id: Ifae395bc9b6699c03f9879dcb5407d23a4caab85 (cherry picked from b9839fc1e0e1d98911aef5149a58dd4bdacd8bc1)
| | | * | | | | | | qmlplugindump: Use command line options with a single dash.Christian Kamm2011-05-121-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the old -- options for compatibility. Change-Id: I9c9b0beccc7043cf8b4b654bdba33946abf8c7b6 Task-number: QTBUG-18834 (cherry picked from commit 175382d834142f2a55b4e209af870ab40f741d2d)
| | | * | | | | | | qmlplugindump: Allow dumping by path without URI.Christian Kamm2011-05-121-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This migrates b980a9b9646a89b5b24efeca40926408a71334de from the Qt Creator's copy into the qmlplugindump in Qt. Change-Id: I1ab90f491f5df0e6570aa43a91073e7b332e41df (cherry picked from commit 9fcece7b455b6540a67780cc3874b230e586b7c4)
| | | * | | | | | | Move qmldump from Qt Creator to Qt.Christian Kamm2011-05-126-1/+876
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename it to qmlplugindump. Qmlplugindump is a tool that loads a QML module and prints type information about the types contained in its plugins to the standard output. Reviewed-by: Aaron Kennedy Change-Id: I7c35c34af23adc1c37453393d71e492dedfc6a9b (cherry picked from b5265d4e99e5c90532e190632951070cf1a2b630)
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-133-1/+26
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: X11: Keep the menubar inside the widgetbox window in toplevel mode Retain ABI and API compatibility when Qt is built with EGL.
| * | | | | | | | | X11: Keep the menubar inside the widgetbox window in toplevel modeMichał Zając2011-05-131-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now the appmenu protocol does not make it possible to associate a menubar with all application windows. This means in top level mode you can only reach the menubar when the widgetbox window is active. Since this is quite inconvenient, better not use the native menubar in this configuration and keep the menubar in the widgetbox window. Merge-request: 1229 Reviewed-by: denis
| * | | | | | | | | Retain ABI and API compatibility when Qt is built with EGL.Michał Zając2011-05-132-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: Felix Geyer <debfx-pkg@fobos.de> Merge-request: 1230 Reviewed-by: ossi
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-05-1317-49/+140
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix QtOpenGL def file for armv5. Disable QtConcurrent for Symbian winscw builds. Fix loss of focus and activation when hiding a child widget Symbian build failure for Armv5 Fix softkeys in case a dialog with softkeys that have icons is closed. Update softkeys after orientation switch. Provide internal API to avoid automatic translation of input widget Do not allow fullscreen/maximized windows to expand beyond client rect
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-05-121-0/+14
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Fix QtOpenGL def file for armv5.
| | * | | | | | | | | | Fix QtOpenGL def file for armv5.Laszlo Agocs2011-05-121-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| * | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-05-12345-3577/+9102
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (250 commits) Disable QtConcurrent for Symbian winscw builds. Fix loss of focus and activation when hiding a child widget Symbian build failure for Armv5 update def files Fix softkeys in case a dialog with softkeys that have icons is closed. Update softkeys after orientation switch. ifdef out mac/no_coreservices path more cleanly fix build on symbian Provide internal API to avoid automatic translation of input widget Allow different text for undo actions and items in QUndoView Allow using not only prefixes for undo command text QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case Massively update the hurd-g++ mkspec. Sockets: Fix potential null pointer usages Update QTBUG-17223 for Qt 4.8 Do not allow multiple threads to acquire a QMutex rebuild configure fix tst_qnetworkreply::httpProxyCommands autotest Send User-Agent from the network request in http proxy CONNECT command QSslConfiguration documentation fix ...
| | * | | | | | | | | | Disable QtConcurrent for Symbian winscw builds.Laszlo Agocs2011-05-125-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While QtConcurrent is nowadays usable with RVCT and GCCE compilers, the compiler used for the winscw target has problems with the templates still. To enable building 4.8 on winscw, the patch defines QT_NO_CONCURRENT and QT_NO_QFUTURE in qglobal.h for this target. However this causes further complications in the Q_OBJECT classes of QtConcurrent because moc will be run without having QT_NO_CONCURRENT and QFUTURE defined (as moc is not a Symbian app and for other Symbian targets they must not be defined, which makes differentiation in qglobal.h impossible for the moc run) and having a moc file generated for a class that will be ifdef'ed out during compilation causes build breaks. Therefore additional dummy stubs are provided in QFutureWatcherBase. Reviewed-by: Liang Qi
| | * | | | | | | | | | Fix loss of focus and activation when hiding a child widgetMiikka Heikkinen2011-05-122-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't deactivate the active window when hiding its child if it has another child that currently has the focus. Task-number: QTBUG-19196 Reviewed-by: Sami Merila
| | * | | | | | | | | | Symbian build failure for Armv5Sami Merila2011-05-124-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Changed externs to Q_GUI_EXPORTs 2. ABSENTed missing exports from openGL's DEF-file Reviewed-by: Tomi Vihria
| | * | | | | | | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-05-1131-121/+1113
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
generated by cgit v0.12 at 2025-01-20 06:44:04 (GMT)