summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-12-1712-36/+120
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-171-1/+1
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: typo fixed in doc/src/declarative/extending.qdoc
| | * Doc: typo fixed in doc/src/declarative/extending.qdocJoerg Bornemann2010-12-161-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-161-1/+4
| |\ \ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QmlDebugger: Fix runtime warnings about unregistered metatypes
| | * | QmlDebugger: Fix runtime warnings about unregistered metatypesKai Koehne2010-12-161-1/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check whether the type of a property is known to the metatype system before trying to read from it. That avoids lots of runtime warnings e.g. for the QSequentialGroup::currentAnimation property, which type QAbstractAnimation * isn't registered by default via qRegisterMetaType<>(). Reviewed-by: Christiaan Janssen Task-number: QTCREATORBUG-2853
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-163-2/+48
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Improved orientation change autotest Avoid duplicate resize event
| | * | Improved orientation change autotestMiikka Heikkinen2010-12-162-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test wasn't even compiling anymore, so fixed that. Also added additional orientation change and an available geometry check after each orientation change. Reviewed-by: Sami Merila
| | * | Avoid duplicate resize eventMiikka Heikkinen2010-12-161-2/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | No need to have two resize events in queue for same widget, so do not post a new one if one is already pending in QSymbianControl::SizeChanged(). Reviewed-by: Sami Merila
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2010-12-167-32/+67
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Fix to commit 3778c3f5208f3db99d6b23a2a3c4abf1fe2ec64f Make sure that d->init() is called from both ctors. Fix failing tst_QGraphicsView::QTBUG_16063_microFocusRect auto-test Fixes text jitter in QtQuick components when using the virtual keyboard Symbian specific input methods should use 'Text' mode as default case Fix whitespace in qs60style.cpp QDateTimeEdit is not showing correctly when resizes in symbian QLabel wraps text at fixed lengths
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-teamQt Continuous Integration System2010-12-159-34/+118
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team: Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE. Resize event for QDesktopWidget was sent too early Add extra type of embedded license. Fix possible null pointer dereference. Ensure that DBus is connected before all uses. Fix invalid configurations being added to bearermonitor list. Don't delete FBO when resetting glyph cache Trivial: Fix coding style Prevent ::flush from being called on QGLWindowSurface if no painting happened.
| | | * Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-159-34/+118
| | | |\
| | * | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-teamQt Continuous Integration System2010-12-1428-85/+286
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team: QApplication: fix crash exit whith native windows Fixed a bug in the input methods on S60 with QGraphicsWebView. Fixed several compile and deployment issues in the mmf phonon plugin. Docs: implications of creating network access managers in other threads Clarify that XmlListModel is read only Revert a fix made for bug QTBUG-15341 Abort working replies with error when network session fails. Remove active selection when TextEdit loses focus qrgb565: Use the trivial qt_memconvert() and qt_rectconvert() Non-hacky fix for qwidget autotest Fix qapplication autotest deployment Minor optimization Fix crash when creating more than one QApplication in single test case Fixed GL 2 engine rendering of images / pixmaps above max texture size. Cocoa: popup hides behind window Cocoa: combobox does not hightlight when mouse re-hovers the first item Cocoa: Fix addChildWindow bug where we connect a grandparent to a child Cocoa: cannot use staysOnTop flag for native file dialogs Cocoa: make sure stays on top child windows are not levelled down Cocoa: native child filedialogs sometimes shows non-native on screen
| | | * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1428-85/+286
| | | |\ \
| | * | \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-141-1/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Fix to commit 3778c3f5208f3db99d6b23a2a3c4abf1fe2ec64f Make sure that d->init() is called from both ctors.
| | | * | | Fix to commit 3778c3f5208f3db99d6b23a2a3c4abf1fe2ec64fJan-Arve Sæther2010-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is what could happen if you go to lunch before comitting.
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Jan-Arve Sæther2010-12-141-2/+2
| | | |\ \ \
| | | * | | | Make sure that d->init() is called from both ctors.Jan-Arve Sæther2010-12-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsLayout uses the protected ctor that did not call d->init(), so all its subclasses was potentially suffering from this. Task-number: QTBUG-15333 Reviewed-by: John Tapsell
| | * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-1444-158/+842
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (30 commits) Fix failing tst_QGraphicsView::QTBUG_16063_microFocusRect auto-test Add a small protection against releasing a timer twice. Use constants the timer ID masks instead of values everywhere Fix ABA problem with: the serial must be updated on all accesses Comment a bit more the timer ID allocation code. Fixes text jitter in QtQuick components when using the virtual keyboard Add expected failures for JS test suite on Symbian Ensure ListView contentHeight is set to a valid size. Revert "Add mirroring-positioners.qml example" that was accidentally pushed Fix dragging Flickable back over start point. Add mirroring-positioners.qml example A QAIM model resulted in items moving to incorrect locations Build on Symbian QmlViewer: Remove trailing whitespace QmlViewer: Remove trailing whitespace QmlViewer: Fix crash on exit PathView: removing the currentIndex could make it invalid. Fix broken database creation caused by previous fix Improvements to anchoring docs QDeclarativeProperty doc improvements ...
| | | * | | | Fix failing tst_QGraphicsView::QTBUG_16063_microFocusRect auto-testGabriel de Dietrich2010-12-141-2/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ammends commit 0af1f5508e165f3b494ab236cb1cdf1b0edcffa5. Reviewed-by: trust me
| | | * | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1342-157/+802
| | | |\ \ \
| | | * | | | Fixes text jitter in QtQuick components when using the virtual keyboardGabriel de Dietrich2010-12-132-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsView::mapFromScene() returns a QRect instead of a QRectF. Thus, we were prematurely rounding the micro focus rectangle coordinates in QGraphicsView::inputMethodQuery(). (The Qt::ImMicroFocus query returns a QRectF from QGraphicsScene, which is the result of querying QDeclarativeTextEdit and mapping it to the scene.) Auto-test included. Reviewed-by: leo Reviewed-by: bnilsen Task-number: QTCOMPONENTS-288 Task-number: QTBUG-16063
| | * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-131-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Symbian specific input methods should use 'Text' mode as default case
| | | * | | | Symbian specific input methods should use 'Text' mode as default caseSami Merila2010-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently default case is 'lower'. It makes more sense to set the default as 'Text', as it is natural default case for most text entries. Task-number: QTBUG-10311 Reviewed-by: Miikka Heikkinen
| | * | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-1318-196/+299
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: refuse to open empty translation files fix path separator matching fix -dont-process for mingw cross-build fix nonsense condition Fix qwidget test crash Fix whitespace in qs60style.cpp QDateTimeEdit is not showing correctly when resizes in symbian Don't include <features.h> directly: non-standard header. Remove superfluous OpenGL linking for QtDeclarative Corrected case on Symbian library. Missing glyphs in GL when scaling QStaticText and QML text items Runtime dependency on Symbians Font Table API Try using pure scissor clip in GL 2 engine for rotations. Fixed DeviceCoordinateCache items when using QGraphicsScene::render(). Fixed missing text in GL 2 engine after recreating a context. Add libinfix support for QML plugins in Symbian. Fix compilation of qnetworkreply test with namespaces.
| | | * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-111-0/+7
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1016-174/+276
| | | |\ \ \ \ \
| | | * | | | | | Fix whitespace in qs60style.cppSami Merila2010-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | | | | QDateTimeEdit is not showing correctly when resizes in symbianSami Merila2010-12-101-22/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem boils down to using large square area for QDateTime widget (which is more or less a date-aware combobox). Style tries to make the combobox button as wide as it is tall, and as button is as tall as the combobox frame, it steals the whole square widget for itself. To fix this, we now limit the combobox button height to be no more than fourth of the total width of the widget. Thus, in normal, non-resized case, button is, as tall as the frame, but as widget is made larger, button stops to grow after reaching quarter of width of the widget. Task-number: QT-4312 Reviewed-by: Janne Koskinen
| | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-102-3/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: QLabel wordwrap to respect maximumSize QT::Window palette brush fails to render correctly.
| | | * | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-092-3/+2
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-0924-83/+322
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: QLabel wraps text at fixed lengths Prevent out-of-bounds memory access in drawhelper. Check Qt::WA_TranslucentBackground instead of custom widget property. New translucency API for the meego graphics system. Support for 'qglTranslucent' in QGLWindowSurface. Use a different dither distribution matrix + a bit of rand. Fixed cubic bezier rendering bug in qgrayraster. Revert "qgrayraster: Speed up rendering of small cubic splines." Update .def files after 783a278f243c6411f5f32d11f2165b9eed9b6f8c Fix QWingedEdge memory usage issue Make sure QMeeGoGraphicsSystem::setTranslucent can't be called if surface already created. Proxy mode was not correctly checked. Don't emit activeFocusChanged() unless the active focus actually changed Prevent always deep-copying in QPixmap::toImage() for raster pixmaps. Fix text disappearing on GL when RGB-path is taken (no transformation) Fix for GCC on Windows x64. Fixed a BC break between S60 SDK 3.2 and 5.0. Fix crash in QTextDocument::markContentsDirty Make sure to do a deep copy of a QImage when it's being painted on.
| | | * | | | | | | QLabel wraps text at fixed lengthsSami Merila2010-12-092-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are multiple problems with text wrapping and dialogs. First, teh CBA height was assumed to be zero, or fetch from previous layout, which caused the dialog to be half under the CBA. Now, CBA height is always asked from AVKON metrics, since asking it from actual component might fail (or produce incorrect results) due to that the component is not created yet (or might still have previous layout active). Additionally, qinputDialog label is now having a size policy to restrict its growing out of dialog borders. Task-number: QT-4354 Reviewed-by: Janne Koskinen
| | | * | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-0822-76/+314
| | | |\ \ \ \ \ \ \
* | | | | | | | | | | Fix waitForOpened not working with already active configurationVille Pernu2010-12-171-1/+2
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an active QNetworkConfiguration is already in use (e.g. browser already open), the QNetworkSession::waitForOpened() did not work properly. Changed one if-statement in the function to adapt to the scenario. Reviewed-by: Perttu Pohjonen Task-number: QTBUG-565
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-162-10/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Improve performance of clipping to a scaled QRectF
| * | | | | | | | | | Improve performance of clipping to a scaled QRectFLars Knoll2010-12-152-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clipping to a scaled QRectF was so far hitting the slow code path in the raster paintengine that generates clip spans for every line. This is not needed as we also clip translated QRectF's to integer rects. This patch does the same for scaled rectangles and ensures the clipping really happens at the closest pixel boundary. Reviewed-by: Samuel
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-156-18/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Suppress a warning about killing a timer that isn't active. ICC: Don't print warning 1259 since it's too annoying. Autotest: Add some comments about this obscure test. Add a warning about trying to release a timer ID that isn't active Don't need to set FD_CLOEXEC since qt_safe_* will have done that. Check for null-pointer to avoid a crash in textedit demo.
| * | | | | | | | | | Suppress a warning about killing a timer that isn't active.Thiago Macieira2010-12-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timer was active, but it got killed by ~QObject. The QObject d-pointer is deleted after the timers (as is expected), which means that the QBasicTimer destructors in QAbstractItemViewPrivate are run after the timers are already gone. Reviewed-by: Trust Me
| * | | | | | | | | | ICC: Don't print warning 1259 since it's too annoying.Thiago Macieira2010-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ICC 12 keeps outputting this when you copy a type of larger size to a smaller, or from int to float.
| * | | | | | | | | | Autotest: Add some comments about this obscure test.Thiago Macieira2010-12-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More information, see commit d9bf386d917c64ad5d8f11f9daadf82b2be9d531 (old qt-history) and old TT task 90183. Reviewed-By: Trust Me
| * | | | | | | | | | Add a warning about trying to release a timer ID that isn't activeThiago Macieira2010-12-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Trust Me
| * | | | | | | | | | Don't need to set FD_CLOEXEC since qt_safe_* will have done that.Thiago Macieira2010-12-151-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Trust Me
| * | | | | | | | | | Check for null-pointer to avoid a crash in textedit demo.Denis Dzyubenko2010-12-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16125 Reviewed-by: trustme
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-151-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Resize event for QDesktopWidget was sent too early
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-151-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Resize event for QDesktopWidget was sent too early
| | * | | | | | | | | | | Resize event for QDesktopWidget was sent too earlyMiikka Heikkinen2010-12-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some recent changes had caused a change in events sent from avkon to QSymbianControl, causing QDesktopWidget to be get resize event before the client area of application was correct. Moved the resize event sending from HandleStatusPaneSizeChange to HandleResourceChange (case KEikDynamicLayoutVariantSwitch). Task-number: QTBUG-16095 Reviewed-by: Sami Merila
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-12-151-11/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | / / / / / / / / / | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE.
| * | | | | | | | | | | Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE.Samuel Rødal2010-12-151-11/+0
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't use the qdrawhelper_sse.cpp or qdrawhelper_sse3dnow.cpp when SSE is not run-time detected, as those are compiled with -msse and MMXEXT is just a subset of SSE. The compiler might choose to use an instruction not in the subset, causing a crash at run-time. Task-number: QTBUG-15693 Reviewed-by: Thiago Macieira
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-12-152-4/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add extra type of embedded license. Fix possible null pointer dereference.
| * | | | | | | | | Add extra type of embedded license.Jason McDonald2010-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marketing needs this for commercial customers. Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-11-27 16:25:26 (GMT)