summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-229-25/+39
|\ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Rename some variables to improve readability. Make QStaticText honor QPainter::pen() for rich text on X11 w/raster Fixed qdeclarativetext auto-test to work with raster graphicssystem. Fixed QStaticText auto-test to work with raster graphicssystem. Give a warning in QPixmap::handle() if pixmap is not X11 class. QThreadPool: name pooled threads Make raster the default graphics system on X11.
| * Rename some variables to improve readability.Frederik Gladhorn2010-09-211-20/+21
| | | | | | | | Review-by: Denis Dzyubenko
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-208-5/+18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make QStaticText honor QPainter::pen() for rich text on X11 w/raster Fixed qdeclarativetext auto-test to work with raster graphicssystem. Fixed QStaticText auto-test to work with raster graphicssystem. Give a warning in QPixmap::handle() if pixmap is not X11 class. QThreadPool: name pooled threads Make raster the default graphics system on X11.
| | * Make QStaticText honor QPainter::pen() for rich text on X11 w/rasterEskil Abrahamsen Blomfeldt2010-09-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The document layou will call setPen() with the PaintContext's text color. If this is different from the current painter settings, the pen will be passed on to the paint engine. The result was that, on X11 using the raster (or opengl) engine, QStaticText would record the pen as changed even when it hadn't explicitly been changed by the document. Task-number: QTBUG-13740 Reviewed-by: Samuel
| | * Fixed qdeclarativetext auto-test to work with raster graphicssystem.Samuel Rødal2010-09-203-0/+0
| | | | | | | | | | | | | | | | | | Updated the expected images in a few cases where the rounding differed. Reviewed-by: Eskil
| | * Fixed QStaticText auto-test to work with raster graphicssystem.Samuel Rødal2010-09-201-1/+1
| | | | | | | | | | | | Reviewed-by: Eskil
| | * Give a warning in QPixmap::handle() if pixmap is not X11 class.Samuel Rødal2010-09-181-2/+6
| | | | | | | | | | | | Reviewed-by: Markus Goetz
| | * QThreadPool: name pooled threadsArvid Ephraim Picciani2010-09-171-0/+1
| | | | | | | | | | | | | | | | | | Task-Number: QTBUG-13702 Reviewed-by: Andy Shaw Reviewed-by: ossi
| | * Make raster the default graphics system on X11.Samuel Rødal2010-09-172-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The raster graphicssystem in most cases performs better than the native graphicssystem. Results from tests/benchmarks/gui/painting/qtracebench below: Before change: RESULT : tst_QTraceBench::trace():"basicdrawing": 46 msecs RESULT : tst_QTraceBench::trace():"webkit": 20 msecs RESULT : tst_QTraceBench::trace():"creator": 62 msecs RESULT : tst_QTraceBench::trace():"textedit": 3 msecs RESULT : tst_QTraceBench::trace():"qmlphoneconcept": 713 msecs RESULT : tst_QTraceBench::trace():"qmlsamegame": 88 msecs After change: RESULT : tst_QTraceBench::trace():"basicdrawing": 40 msecs RESULT : tst_QTraceBench::trace():"webkit": 11 msecs RESULT : tst_QTraceBench::trace():"creator": 19 msecs RESULT : tst_QTraceBench::trace():"textedit": 5 msecs RESULT : tst_QTraceBench::trace():"qmlphoneconcept": 141 msecs RESULT : tst_QTraceBench::trace():"qmlsamegame": 3 msecs Reviewed-by: Gunnar Sletta
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-217-12/+27
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix project name duplicates in generated projects.sln Doc: document QMAKE_PROJECT_NAME qmake: introduction of QMAKE_PROJECT_NAME
| * | fix project name duplicates in generated projects.slnJoerg Bornemann2010-09-214-4/+6
| | | | | | | | | | | | | | | | | | | | | Using QMAKE_PROJECT_NAME to rename certain projects. Task-number: QTBUG-6887 Reviewed-by: owolff
| * | Doc: document QMAKE_PROJECT_NAMEJoerg Bornemann2010-09-211-5/+13
| | | | | | | | | | | | | | | | | | | | | Also moved QMAKE_LN_SHLIB upwards to maintain alphabetical order. Task-number: QTBUG-3206 Reviewed-by: aep
| * | qmake: introduction of QMAKE_PROJECT_NAMEJoerg Bornemann2010-09-212-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | With this variable one can set the project name for IDE project files. Currently only used for Visual Studio Task-number: QTBUG-3206 Reviewed-by: ossi
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-201-4/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: configure.exe: endianess on Windows is always little endian
| * | configure.exe: endianess on Windows is always little endianJoerg Bornemann2010-09-201-4/+1
|/ / | | | | | | | | | | | | No need to check the host system endianess. Task-number: QTBUG-7819 Reviewed-by: ossi
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-162-12/+11
|\ \ | |/ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: fix CRLF Fixes makeCurrent() failed messages on several systems.
| * fix CRLFHarald Fernengel2010-09-161-9/+9
| |
| * Fixes makeCurrent() failed messages on several systems.Trond Kjernåsen2010-09-161-3/+2
|/ | | | | | | | | Small but important fix for threaded environments. If a thread exits without releasing the current context, it could cause the resource system to get confused. Particularly on Windows, where a DC can only be used in the thread it is retrieved in. We don't need the EGL specific fix anymore since it will have the same effect as a doneCurrent() call.
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-164-47/+276
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Support "icon form theme" inside property editor
| * Support "icon form theme" inside property editorJarek Kobus2010-09-164-47/+276
|/ | | | | Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QT_BUG-7777
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-143-10/+8
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix crash in Mac font loading fix tiff reader to handle TIFFTAG_SAMPLESPERPIXEL for grayscale images
| * Fix crash in Mac font loadingJiang Jiang2010-09-142-8/+3
| | | | | | | | | | | | | | | | | | | | | | Commit f2f6330d915cbe3d0989ad280738ed0a6954cd35 introduced an extra CFRelease of QCFString, which will cause crash. Also, since we are not refering to ATS font in Cocoa code anymore, conversion of CTFontRef to CGFontRef should not rely on platform fonts, we use CTFontCopyGraphicsFont to get the corresponding CGFontRef directly. Reviewed-by: Eskil Abrahamsen Blomfeldt
| * fix tiff reader to handle TIFFTAG_SAMPLESPERPIXEL for grayscale imagesLuboš Luňák2010-09-141-2/+5
|/ | | | | | | | | | | | | | | This commit fixes reading a .tiff file from ImageMagick which reports the following: TIFFTAG_BITSPERSAMPLE = 8 TIFFTAG_SAMPLESPERPIXEL = 2 TIFFTAG_PHOTOMETRIC = PHOTOMETRIC_MINISBLACK The reader uses QImage::Format_Indexed8, but since the samples per pixel value this should be (non-existent) QImage::Format_Indexed16, causing memory corruption. The fix falls back to the "normal" way of reading tiff images. Merge-request: 2467 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-141-1/+26
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Skip sub pixel positions test if font smoothing is off Q_MAC_USE_COCOA -> QT_MAC_USE_COCOA
| * Skip sub pixel positions test if font smoothing is offEskil Abrahamsen Blomfeldt2010-09-141-0/+25
| | | | | | | | | | | | | | | | Copy/paste the test from qapplication_mac.mm where we detect if font smoothing is actually on by drawing an x into a buffer and checking the result for non-gray pixels. Reviewed-by: Jiang Jiang
| * Q_MAC_USE_COCOA -> QT_MAC_USE_COCOAEskil Abrahamsen Blomfeldt2010-09-141-1/+1
| | | | | | | | | | | | Make sure test is run on Cocoa like intended Reviewed-by: TrustMe
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-143-6/+21
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Properly implement qobject_cast for const pointers.
| * | Properly implement qobject_cast for const pointers.Thiago Macieira2010-09-113-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using ugly const_cast in public headers and Q_UNUSED (which expands to nothing in release builds), use a properly-const method. Reviewed-By: Bradley T. Hughes (cherry picked from commit 0b0aa7603b27447a5abe55c55d0514bc56b35f9e)
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-1423-106/+394
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix QPainter test failure on Mac/Carbon Fix typos. Fix typo in declative example. test for gdb version before runnning dwarf indexing Fix Core Text font loading for certain Mac Fonts Support sub pixel positioning of glyphs in raster engine Added basic tests for threaded QPainter drawing onto FBOs and PBOs.
| * Fix QPainter test failure on Mac/CarbonEskil Abrahamsen Blomfeldt2010-09-141-2/+2
| | | | | | | | | | | | | | ATSUI font engine has not been fixed to support sub pixel positioning with the raster engine. Reviewed-by: Jiang Jiang
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-1023-106/+394
| |\ |/ / | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix typos. Fix typo in declative example. test for gdb version before runnning dwarf indexing Fix Core Text font loading for certain Mac Fonts Support sub pixel positioning of glyphs in raster engine Added basic tests for threaded QPainter drawing onto FBOs and PBOs.
| * Fix typos.Frederik Gladhorn2010-09-102-2/+2
| | | | | | | | | | | | | | list of pointers, not points beter -> better Review-by: trust-me
| * Fix typo in declative example.Frederik Gladhorn2010-09-101-1/+1
| | | | | | | | Review-by: trust me
| * test for gdb version before runnning dwarf indexingArvid Ephraim Picciani2010-09-101-0/+1
| | | | | | | | Reviewed-by: ossi
| * Fix Core Text font loading for certain Mac FontsJiang Jiang2010-09-105-38/+58
| | | | | | | | | | | | | | | | | | | | | | Font names enumerated by Core Text cannot be found by ATSFontFamilyFindFromName because ATS is expecting native names instead of the names returned by Core Text. This patch get rid of ATS font matching code in Cocoa code path to simplify the code, avoid deprecation warnings (in the future) and fix this issue. Task-number: QTBUG-11145 Reviewed-by: Eskil
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-1016-65/+332
| |\ | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Support sub pixel positioning of glyphs in raster engine Added basic tests for threaded QPainter drawing onto FBOs and PBOs.
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-0916-65/+332
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Support sub pixel positioning of glyphs in raster engine Added basic tests for threaded QPainter drawing onto FBOs and PBOs.
| | | * Support sub pixel positioning of glyphs in raster engineEskil Abrahamsen Blomfeldt2010-09-0914-44/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the raster engine to provide the same quality of text rendering as the native engine on Mac Cocoa, we need to support rendering to different sub pixel positions for each glyph. The number of subpixel positions is arbitrary and has to be detected, but it's usually three or four. Each position will give slightly different coverages inside the pixel and thus different rasterizations. Other font engines which support sub pixel positioning of glyphs can provide the same functionality by implementing supportsSubPixelPositions() to return true, and then adding the subPixelPosition argument to the x coordinate used in alphaRGBMapForGlyph(). Task-number: QTBUG-5053 Reviewed-by: Jiang Jiang
| | | * Added basic tests for threaded QPainter drawing onto FBOs and PBOs.Trond Kjernåsen2010-09-092-21/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've noticed that under Windows we get some wglMakeCurrent() failed messages in the QGLWidget, QGLPixelBuffer and QGLFrameBufferObject tests when deleting the painter or device wrappers used in the threading tests. It's currently unknown why this happens, as both the contexts and devices are valid at that point.
* | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-09-10584-11967/+25917
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (284 commits) Fixed crash in input methods when using symbols menu and numbers only Fixed crash in input methods when using symbols menu and numbers only Read the data when the stream passed in is of type CArchiveStream Autotest for QTBUG-13454. Changing the Image 'source' should not go through the 'Loading' state if the image is cached. Make sure we blit to the correct FBO in the GL window surface. Some optimizations to the GL pixmap data. QList::toVector()/QVector::toStdVector()/QVector::fromStdVector(): use reserve() When a move is completed, report the source and destination correctly. Fixed the scrolling of text in QLineEdit with right alignment Editable QComboBox popup immediately closes itself after a click Change RLibrary handle in QS60PluginResolver to be process wide Cursor is misplaced in the editors text area Update running animations if a SmoothedAnimation is changed Removing Q_ENUMS declaration in QTransform QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian Fix SmoothedAnimation test and docs Fix qdeclarativeimageprovider autotest compilation on Symbian Fix reversingModes of QDeclarativeSmoothedAnimation Re-add quit button to declarative Twitter demo ...
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-10584-11967/+25917
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-102-4/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed crash in input methods when using symbols menu and numbers only Fixed crash in input methods when using symbols menu and numbers only
| | * \ \ Merge branch '4.6-s60' into 4.7-s60axis2010-09-100-0/+0
| | |\ \ \
| | | * | | Fixed crash in input methods when using symbols menu and numbers onlyaxis2010-09-102-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When inputting only numbers, the symbol menu should not do anything. However in the old code the resource id of the symbol table was still being set, so the symbol key on N97 would look up a table that was not valid for the current input mode and crash. Fixed by setting the symbol table id to zero under those conditions. RevBy: Sami Merila Task: QTBUG-13472 AutoTest: Included (cherry picked from commit 5cef786a651c675d3428060a19bfd9d9ecee6083)
| | * | | | Fixed crash in input methods when using symbols menu and numbers onlyaxis2010-09-102-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When inputting only numbers, the symbol menu should not do anything. However in the old code the resource id of the symbol table was still being set, so the symbol key on N97 would look up a table that was not valid for the current input mode and crash. Fixed by setting the symbol table id to zero under those conditions. RevBy: Sami Merila Task: QTBUG-13472 AutoTest: Included
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-101-0/+13
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Read the data when the stream passed in is of type CArchiveStream
| | * | | | Read the data when the stream passed in is of type CArchiveStreamAndy Shaw2010-09-101-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the stream is of type CArchiveStream then Stat() is not implemented and therefore it will not try to read the data. Therefore if this is not implemented then we try to read the data in chunks instead until there is no more to read or it fails. Reviewed-by: Volker Hilsheimer
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-103-26/+68
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Autotest for QTBUG-13454. Changing the Image 'source' should not go through the 'Loading' state if the image is cached.
| | * | | | Autotest for QTBUG-13454.Yann Bodson2010-09-102-16/+55
| | | | | |
| | * | | | Changing the Image 'source' should not go through the 'Loading' state if the ↵Yann Bodson2010-09-101-10/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | image is cached. Task-number: QTBUG-13454 Reviewed-by: Martin Jones
generated by cgit v0.12 at 2025-01-18 21:29:10 (GMT)