summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'merge-request-1601' into master-s60axis2010-01-0516-51/+104
|\ | | | | | | | | | | | | | | | | Conflicts: bin/createpackage.pl mkspecs/features/symbian/application_icon.prf qmake/generators/symbian/symmake_abld.cpp src/gui/text/qfontdatabase_s60.cpp src/s60main/s60main.pro
| * Improving parts of commit 2d8d855d.axis2009-11-171-10/+20
| | | | | | | | | | It breaks Symbian on Windows, so instead use an approach that works on all platforms.
| * qmake: add Linux host support to Symbian generatorAnderson Lizardo2009-11-174-23/+53
| | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| * Fixed indentation.axis2009-11-171-6/+6
| |
| * Add Linux host support to Symbian mkspecs.Anderson Lizardo2009-11-172-6/+12
| | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| * Linux support for platform specific commands in .pro files.Anderson Lizardo2009-10-282-2/+18
| | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| * Add createpackage.bat equivalent for Unix systems.Anderson Lizardo2009-10-271-0/+3
| | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| * Make all Symbian #includes lower case.Anderson Lizardo2009-10-237-9/+9
| | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| * mkspecs: fix warning when calling qmakeAnderson Lizardo2009-10-231-1/+1
| | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| * Fix portability problems in bin/createpackage.pl.Anderson Lizardo2009-10-231-8/+6
| | | | | | | | | | | | | | * Use File::Spec functions to manipulate path components. * Keep $targetplatform lower case for case sensitive systems. Signed-off-by: axis <qt-info@nokia.com>
* | Remove the entire warning, is seems it was only there forMorten Johan Sørvig2010-01-051-11/+0
| | | | | | | | Designer.
* | Remove obsolete XShape configure warning.Morten Johan Sørvig2010-01-051-4/+1
| | | | | | | | | | | | Task:QTBUG-2158 Designer no longer uses XShape for Drag and Drop.
* | Don't use QPointer in objectve-c interfaces.Morten Johan Sørvig2010-01-051-2/+2
| | | | | | | | (Constructors and destructors are not called.)
* | Cocoa: exec() on a dialog with Qt::Tool windowflag is just a dialog.Richard Moe Gustavsen2010-01-041-3/+3
| | | | | | | | | | | | | | | | | | This is because a modal flag on the window wins over the type when determining window class. This fix will respect the type first, before looking at the window flag. Task-number: QTBUG-1455 Reviewed-by: Prasanth
* | Fixed QGLFormat::operator== to handle new fields.Kim Motoyoshi Kalland2010-01-042-3/+54
| | | | | | | | | | | | | | | | When I added new fields to QGLFormat in commit 592dc597, I forgot to update operator==. It has now been fixed and the auto-test updated. Reviewed-by: Trond
* | Carbon: compile fixRichard Moe Gustavsen2010-01-041-1/+1
| | | | | | | | Oops. Broke build on carbon.
* | Cocoa: app menu does now show before doing qApp::exec()Richard Moe Gustavsen2010-01-042-16/+28
| | | | | | | | | | | | | | | | The reason is that we need to start [NSApplication run] before the menus get properly initialized. This patch will make the event dispatcher run nsapp once before spinning a modal session, if needed Task-number: QTBUG-6627
* | Added support for OpenGL up to version 3.2 on Windows.Kim Motoyoshi Kalland2009-12-304-25/+275
| | | | | | | | | | Task-number: QTBUG-4438, QT-2662, QT-2663 Reviewed-by: Tom
* | Format qOpenGLVersionFlagsFromString() according to Qt coding style.Kim Motoyoshi Kalland2009-12-301-22/+16
| |
* | Merge branch '4.6'Thiago Macieira2009-12-26260-3472/+11075
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * \ 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.
generated by cgit v0.12 at 2025-09-09 21:53:04 (GMT)