summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-268-2/+105
|\ | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Don't include dlfcn.h unconditionally. Fix warning on 64-bit build with MSVC. Add missing license headers to the new solaris-cc-stlport mkspecs. FTBFS on hurd-i386 because since clock_gettime is not available there Fix build on ARMv6 when NEON is detected. Add two new mkspecs for SunCC with stlport.
| * Don't include dlfcn.h unconditionally.Thiago Macieira2009-12-252-1/+1
| | | | | | | | | | Task-number: QTBUG-3344 Reviewed-by: Trust Me
| * Fix warning on 64-bit build with MSVC.Thiago Macieira2009-12-251-1/+1
| | | | | | | | | | Task-number: QTBUG-3792 Reviewed-by: Trust Me
| * Add missing license headers to the new solaris-cc-stlport mkspecs.Thiago Macieira2009-12-252-0/+82
| | | | | | | | Reviewed-by: Trust Me
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-255-0/+21
| |\ |/ / | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: FTBFS on hurd-i386 because since clock_gettime is not available there Fix build on ARMv6 when NEON is detected. Add two new mkspecs for SunCC with stlport.
| * FTBFS on hurd-i386 because since clock_gettime is not available thereSamuel Thibault2009-12-251-0/+3
| | | | | | | | | | | | | | | | | | | | qt4-x11 reverts to using gettimeofday, but it doesn't include <sys/time.h> where the latter is defined. Debian bug #533526 Task-number: QTBUG-6961 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Fix build on ARMv6 when NEON is detected.Thiago Macieira2009-12-251-1/+1
| | | | | | | | The compiler requires -mfpu=neon to enable NEON instructions.
| * Add two new mkspecs for SunCC with stlport.Thiago Macieira2009-12-254-0/+18
| | | | | | | | Untested, but not used anywhere yet, so this cannot cause any problems.
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-258-172/+170
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Minor optimization for QS60Style Correcting white space in QS60Style QComboboxes are squeezed in QVGA screens Revert "Daylight savings time for Symbian." Changed autodetection logic for stlport version and sqlite in Symbian Setting background color to a QDialog doesn't work QWidget with the window flag Qt::Dialog is not decorated as a dialog Device flickers badly when orientation change occurs Changed make sis only require .make.cache if QT_SIS_TARGET is not set.
| * | Minor optimization for QS60StyleSami Merila2009-12-231-3/+3
| | | | | | | | | | | | | | | | | | | | | Ask selected state only once in QS60Style when handling element CE_TabBarTabLabel. Reviewed-by: TrustMe
| * | Correcting white space in QS60StyleSami Merila2009-12-231-76/+76
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | QComboboxes are squeezed in QVGA screensSami Merila2009-12-231-29/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ComboBoxes and SpinBoxes are squeezed in QVGA screens, due to dodgy style calculations. This fix ensures that sub-widget buttons for these widgets are always square. Task-number: QT-2158 (internal) Reviewed-by: axis
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2009-12-2374-1083/+1747
| |\ \
| | * | Changed autodetection logic for stlport version and sqlite in SymbianMiikka Heikkinen2009-12-232-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support building Qt as part of Symbian SDK where epoc32 is not yet populated, changed the autodetection logic in determining stlport version. Now, we assume that we want the new version, unless only the old version exists on SDK already. Sqlite binaries export autodetection is now skipped if CONFIG value symbian_no_export_sqlite exists, allowing clean builds to explicitly suppress exporting. Task-number: QTBUG-6971 Reviewed-by: axis
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-233-8/+23
| | |\ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Setting background color to a QDialog doesn't work QWidget with the window flag Qt::Dialog is not decorated as a dialog Device flickers badly when orientation change occurs Changed make sis only require .make.cache if QT_SIS_TARGET is not set.
| | * | Setting background color to a QDialog doesn't workSami Merila2009-12-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since dialogs use their own theme graphics for background, regular method of checking the palette fails (as generic background brush is probably unchanged). Therefore to check if the dialog background is using default (=theme graphic), it needs to check the cache key value of background - so that it matches with the one in stored theme palette. Task-number: QTBUG-5898 Reviewed-by: Janne Koskinen
| | * | QWidget with the window flag Qt::Dialog is not decorated as a dialogSami Merila2009-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously style casted widgets to QDialog to see if it is able to draw dialog background theme graphic. As a fix, we now query window flag from the widget and if it is equivalent of Qt::Dialog, draw dialog background. Task-number: QTBUG-5930 Reviewed-by: Janne Koskinen
| | * | Device flickers badly when orientation change occursSami Merila2009-12-232-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently what happens when orientation changes is: 1. Application gets notification that status pane size has changed. 2. Qt resizes S60Data to new size, and sends resize event. 3. Application redraws itself. But style is still using incorrect screen size internally, so background brush is incorrect. Redrawing thus might showup white rect on-screen. 4. Style gets notification that orientation is changed and style then deletes existing background brush. 5. Style creates a new background brush and sends events to all toplevel widgets that style has changed 6. Widgets might draw themselves with new style background brush. What this fix changes is: 1. When application first tries to redraw itself, style notices that the background brush size does not match to active screen size. 2. Style immediately re-creates background brush 3. Since cachekey for pixmaps won't match, new background is not drawn until after background brush has been updated to application palette. 4. Due to #1 style needs to remove deletion of background brush from clearCaches to avoid deleting (and re-creating) background twice. Task-number: QTBUG-6428 Reviewed-by: Janne Koskinen
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-221-2/+4
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Changed make sis only require .make.cache if QT_SIS_TARGET is not set.
| | | * Changed make sis only require .make.cache if QT_SIS_TARGET is not set.Miikka Heikkinen2009-12-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .make.cache file contents are ignored if QT_SIS_TARGET environment variable is set, so there is no point in requiring its existence in those cases. Task-number: QTBUG-4617 Reviewed-by: Janne Anttila
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-2310-237/+451
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Implement ScaledClipRect in the jpeg image plugin Add support for ClipRect to the jpeg image plugin Use libjpeg's builtin scaler for implementing setScaledSize() Use 3x3 PMV matrices rather than 4x4 in the GL2 engine Handle broken shaders better in the GL2 engine's shader manager Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram Fix build with neon instructions enabled but not set in mkspec
| * | | Implement ScaledClipRect in the jpeg image pluginRhys Weatherley2009-12-232-9/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where possible, we convert the post-scale clip rectangle into a pre-scale clip rectangle because it is more efficient to clip first. Task-number: QT-2023 Reviewed-by: Sarah Smith Reviewed-by: Daniel Pope
| * | | Add support for ClipRect to the jpeg image pluginRhys Weatherley2009-12-232-86/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The jpeg is read and scanlines discarded until the clip region is found (libjpeg doesn't support direct seeking). This is faster than the previous approach of reading the entire jpeg and then clipping. Task-number: QT-2023 Reviewed-by: Sarah Smith Reviewed-by: Daniel Pope
| * | | Use libjpeg's builtin scaler for implementing setScaledSize()Rhys Weatherley2009-12-222-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libjpeg library has builtin support for scaling to 1/2, 1/4, and 1/8 the original size very quickly. Use this in the implementation of setScaledSize() to get close to the desired size and then scale with QImageSmoothScaler the rest of the way. Task-number: QT-2023 Reviewed-by: Daniel Pope
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-227-142/+248
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use 3x3 PMV matrices rather than 4x4 in the GL2 engine Handle broken shaders better in the GL2 engine's shader manager Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram Fix build with neon instructions enabled but not set in mkspec
| * | | Use 3x3 PMV matrices rather than 4x4 in the GL2 engineTom Cooksey2009-12-223-64/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsView based applications will set a new transform for every item before it's painted. This leads to lots of updates to the PMV matrix. So switching to a 3x3 rather than a 4x4 gives us less data to pass to GL for each QGraphicsItem which gets rendered. It also means the vertex shader is more efficient. However, this patch only gives a maximum 2.5% speed improvement on the SGX, which seems to be only due to the faster vertex shader rather than the reduced amount of data we pass to GL. Reviewed-By: Kim
| * | | Handle broken shaders better in the GL2 engine's shader managerTom Cooksey2009-12-221-77/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The shader manager will now a) not seg-fault and b) actually tell you which shader has the error. Reviewed-By: Kim
| * | | Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgramTom Cooksey2009-12-222-0/+71
| | | | | | | | | | | | | | | | Reviewed-By: Rhys Weatherley
| * | | Fix build with neon instructions enabled but not set in mkspecTom Cooksey2009-12-221-1/+1
| | | | | | | | | | | | | | | | Reviewed-By: Samuel Rødal
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-221-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Memory leak when using QWidget::setWindowIcon() in Carbon.
| * | | | Memory leak when using QWidget::setWindowIcon() in Carbon.Prasanth Ullattil2009-12-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The icon was not released when destroying the window. Task-number: QTBUG-6973 Reviewed-by: Richard Moe Gustavsen
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-2229-57/+4568
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added more specific clean targets for Symbian builds Fixed incorrect headers. Daylight savings time for Symbian. Tool for launching symbian apps on the phone from windows command line Fixes to winscw def files Fixing compile error on armcc
| * | | | Added more specific clean targets for Symbian buildsMiikka Heikkinen2009-12-222-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed sbsv2 build targets 'make release' and 'make debug'. Task-number: QTBUG-5156 Reviewed-by: Janne Koskinen
| * | | | Fixed incorrect headers.axis2009-12-2218-252/+474
| | | | | | | | | | | | | | | | | | | | | | | | | AutoTest: Passed RevBy: Paul Olav Tvete
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2009-12-223-155/+27
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Remove unused legacy code from the jpeg image plugin Clean up oracle data type tests.
| * | | | Remove unused legacy code from the jpeg image pluginRhys Weatherley2009-12-222-134/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A long time ago, in a Qt version far, far, away there was a parameter string mechanism for asking for header details, requesting scaling, and so on. This has since been replaced with actual real API's and it is no longer possible to pass such parameter strings to the image plugins. This change removes the crufty beloved old code. Reviewed-by: Sarah Smith
| * | | | Clean up oracle data type tests.Bill King2009-12-221-21/+16
| | | | |
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-2223-115/+290
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( de77f8ee69c434bde9306c8f407ee2e443a00188 ) Drag and drop icon not updated correctly in Cocoa. Adding missing file. Warn when calling QFileInfo::absolutePath() on an improper object. update harfbuzz to 2b78f0d78ad3075fd1657d1260b31219e1a5155 Fixing a problem with xmlpatterns, where code from tools/xmlpatterns was being included by src/xmlpatterns. Fix for WinCE compilation of QAbstractSpinBox.
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-12-218-13/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( de77f8ee69c434bde9306c8f407ee2e443a00188 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-12-21 David Boddie <dboddie@trolltech.com> Reviewed by Simon Hausmann. Doc: Minor fixes to language. * Api/qwebpage.cpp: 2009-12-15 Holger Hans Peter Freyther <zecke@selfish.org> Reviewed by NOBODY (OOPS!). [Qt] Do not disable the inspector on show and hide https://bugs.webkit.org/show_bug.cgi?id=31851 On Qt/X11 with some window managers the window will be hidden when switching windows. In this case all the results are gone when coming back to the window. Attempt to use the CloseEvent to figure out if the window was closed and withdrawn as this is more friendly to the user of the inspector client. * Api/qwebinspector.cpp: (QWebInspector::event): (QWebInspector::hideEvent): 2009-12-13 Simon Hausmann <hausmann@webkit.org> Reviewed by Holger Freyther. [Qt] Re-enable QWebView::renderHints property for Qt for Symbian https://bugs.webkit.org/show_bug.cgi?id=28273 The bug in Qt's moc that triggered a linking error when declaring this property has been fixed and we can remove the workaround. * Api/qwebview.h: 2009-11-30 Abhinav Mithal <abhinav.mithal@nokia.com> Reviewed by Simon Hausmann. [Qt][Symbian] Report SymbianOS in user agent string for Symbian https://bugs.webkit.org/show_bug.cgi?id=31961 * Api/qwebpage.cpp: (QWebPage::userAgentForUrl):
| * | | Drag and drop icon not updated correctly in Cocoa.Prasanth Ullattil2009-12-211-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDragMoveEvent is compressed using the answer rect in QCocoaView. The result of the last sendEvent is saved, so that we dont have to generate a new event always. This saved result was not updated correctly when the event was ignored. Task-number: QTBUG-5186 Reviewed-by: Richard Moe Gustavsen
| * | | Adding missing file.Carlos Manuel Duclos Vergara2009-12-211-0/+74
| | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | | Warn when calling QFileInfo::absolutePath() on an improper object.Andreas Kling2009-12-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1821 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * | | update harfbuzz to 2b78f0d78ad3075fd1657d1260b31219e1a5155Lars Knoll2009-12-212-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression in Hebrew text rendering that got introduced in Harfbuzz. Fix some uninitialized variables. Task-number: http://bugreports.qt.nokia.com/browse/QTBUG-6436 Reviewed-by: Simon Hausmann
| * | | Fixing a problem with xmlpatterns, where code from tools/xmlpatterns was ↵Carlos Manuel Duclos Vergara2009-12-219-95/+78
| | | | | | | | | | | | | | | | | | | | | | | | being included by src/xmlpatterns. Reviewed-by: Peter Hartmann
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-211-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix for WinCE compilation of QAbstractSpinBox.
| | * | | Fix for WinCE compilation of QAbstractSpinBox.David Laing2009-12-211-1/+1
| |/ / /
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-215-8/+20
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Edit focus should not be lost unless by explicit action RVCT 2.2 compiler can't handle static inline functions with templates. Forwarded return value from QtMainWrapper() to E32Main() exit code.
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-1914-313/+417
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a bug in resizing the anomaly browser demo. doc: Added a missing \sa command, plus a \l in the text. Improve the performance of the Anomaly browser demo Fixed crash when parsing invalid polygons in svgs. doc: Fixed typos. Fixed QResource to respect the explicitely set locale Change QHostInfo to use 5 parallel lookup threads Doc: fix typo fix Cocoa build
| * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-1914-313/+417
| |\ \ \ \ |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a bug in resizing the anomaly browser demo. doc: Added a missing \sa command, plus a \l in the text. Improve the performance of the Anomaly browser demo Fixed crash when parsing invalid polygons in svgs. doc: Fixed typos. Fixed QResource to respect the explicitely set locale Change QHostInfo to use 5 parallel lookup threads Doc: fix typo fix Cocoa build
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-1914-313/+417
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a bug in resizing the anomaly browser demo. doc: Added a missing \sa command, plus a \l in the text. Improve the performance of the Anomaly browser demo Fixed crash when parsing invalid polygons in svgs. doc: Fixed typos. Fixed QResource to respect the explicitely set locale Change QHostInfo to use 5 parallel lookup threads Doc: fix typo fix Cocoa build
generated by cgit v0.12 at 2024-10-24 04:28:40 (GMT)