summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove QFontEngineFT::loadGlyphMetricsJiang Jiang2011-05-042-101/+0
| | | | | | | It is no longer used and was accidentally merged back in. Reviewed-by: Eskil (cherry picked from commit 782535ac548c582542bd1c17207e288e816870a8)
* Add required font metrics functions to QRawFontJiang Jiang2011-05-042-0/+56
| | | | | Reviewed-by: Eskil (cherry picked from commit 2c8df8bfb679885c3cbd2ee02f5e4053fdd554c2)
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-stagingGunnar Sletta2011-05-042-0/+34
|\
| * 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 (cherry picked from commit 5aa5c2e2935c1829cc6965198968699f17c24ec0)
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-stagingGunnar Sletta2011-05-0463-123/+275
|\|
| * Added .tag file with Git revision.axis2011-05-032-0/+2
| |
| * new configure.exe binaryJoerg Bornemann2011-05-031-0/+0
| |
| * qmake nmake generator: pass MAKEFLAGS to sub-make callsJoerg Bornemann2011-05-034-14/+27
| | | | | | | | | | | | Unlike other make tools nmake doesn't do this automatically. Reviewed-by: ossi
| * Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-0244-95/+164
| | | | | | | | | | | | | | This will allow us to expose private headers in a controlled manner, and ensure that they are not used by accident. This also means that we internally will have to enable the private headers for the modules we wish to use in the project.
| * Install syncqt, and ensure it runs fine for external modulesMarius Storm-Olsen2011-05-022-2/+12
| |
| * Moved QtUiTools to CONFIGPrasanth Ullattil2011-05-021-2/+4
| | | | | | | | | | | | QtUiTools is a staic library now. If this is added to QT variable qmake will treat this as a framework on Mac. This patch is to avoid that.
| * Add module.prf, and install MODULE_PRI for each moduleMarius Storm-Olsen2011-05-0211-5/+48
| | | | | | | | Output warning if not present
| * Make sure we don't always pull in modules from installed mkspecsMarius Storm-Olsen2011-05-021-1/+1
| | | | | | | | | | | | | | | | | | When building Qt, qmake should not pull in mkspecs from an installed version, as this will lead to incorrect paths for the current build. So, here we ensure only to pull in modules from there we detected the qconfig.pri, and ensure we still handle the QMAKEPATH case used by some.
| * QNetworkConfigurationManager: Fix network polling.Martin Petersson2011-05-022-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | startPolling() is called by each engine, so before it would start multiple singleshot timers. So I moved the timer to the class and check if it has already been started before it is activated again. So that we just use one timer. Task-number: QTBUG-17219 Reviewed-by: Iiro Kause Reviewed-by: Kranthi Kuntala (cherry picked from commit 2506b86828ca8140c2f22d85a4378df40899b132)
| * QAbstractSocket: Fix waitForReadyRead infinite loop.Martin Petersson2011-05-021-2/+2
| | | | | | | | | | | | | | | | Make sure that waitForReadyRead times out if the read buffer is full. Task-number: QTBUG-16123 Reviewed-by: Peter Hartmann (cherry picked from commit 8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba)
| * Fix compile warning on WindowsMartin Petersson2011-05-021-0/+1
| | | | | | | | | | Reviewed-by: Prasanth Ullattil (cherry picked from commit 800ad68e4f000e65b0a83ef1da2a29d595964156)
* | Merge branch 'qtquick2'Gunnar Sletta2011-05-04104-755/+2078
|\ \ | |/ |/|
| * Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into ↵Gunnar Sletta2011-05-0431-160/+240
| |\ | | | | | | | | | qtquick2
| | * Compile on WindowsEskil Abrahamsen Blomfeldt2011-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The SPI_FONTSMOOTHINGCONTRAST macro is not defined everywhere. When the code was refactored, the workaround for this was lost. This resubmits the work-around to make it compile. Reviewed-by: Samuel (cherry picked from commit 4c3630c1fcd2b3008f540a8906a19c533604f36a)
| | * Remove warningsJørgen Lind2011-05-043-1/+3
| | | | | | | | | | | | (cherry picked from commit 9625c564877414695a9706acf34bc8719018ef06)
| | * Fix Wayland plugin so it works with the wayland bind apiJørgen Lind2011-05-045-50/+26
| | | | | | | | | | | | | | | | | | This is mostly for the xcomposite api, but also we needed to readEvents after doing a connect (cherry picked from commit 16c054125949b8f8ceec9626156d8790254a63a2)
| | * wayland: Track wayland changesKristian Høgsberg2011-05-045-21/+12
| | | | | | | | | | | | | | | | | | Pass version number when creating proxies, use wl_ prefix when looking up interfaces and drop wl_egl_display. (cherry picked from commit c2adf9395214d711a3a40516c6c2afa64b3b4ca3)
| | * Support GL ES 2 with uikit.con2011-05-046-43/+101
| | | | | | | | | | | | | | | | | | | | | For GL ES 2 teach the paint device about the fact that it is doing rendering backed by a framebuffer object, not a system framebuffer (which doesn't exist). (cherry picked from commit 3b437a7706efbaaafdc4861393cbe21354cf4ee2)
| | * Lighthouse: Fix virtual desktopwidgetJørgen Lind2011-05-042-9/+4
| | | | | | | | | | | | (cherry picked from commit 69c759f5b84c2f6a44377e5f72cfe9d5bf7344c6)
| | * Support gamma correction of text on GLEskil Abrahamsen Blomfeldt2011-05-036-12/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the SRGB framebuffer extension in GL is available, we can support gamma correction of text with a gamma of 2.1. On Mac this is sufficient for gamma correcting subpixel antialiased text. Gray antialiasing should not be gamma corrected on Mac. On Windows, the user can potentially set the gamma value to anything between 1.0 and 2.2 (or something like that). We support anything that resembles 1.0 closely enough by pushing the text out without any correction (like before). We also support anything that resembles 2.1 (the gamma hardcoded in GL's SRGB extension) by turning on the extension before blending the text. In between the two, we'll use gray antialiasing to avoid differing too much from the raster engine (which is our reference in this.) For gray antialiasing on Windows, we use a constant gamma of 2.3 which has been determined by experimentation. Since this is close enough to 2.1 we do gamma correction with SRGB extension. The distance limit of 0.2 is determined by some experimentation. Reviewed-by: Samuel (cherry picked from commit 79ba7cceca5e4029876ace2121edd25b08ae14ce)
| | * Make pixel size a qreal in QRawFontEskil Abrahamsen Blomfeldt2011-05-023-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | The pixel size in the font engines is already a floating point value. For maximum flexibility, we should expose this in the public API. Task-number: QTBUG-18817 Reviewed-by: Jiang Jiang (cherry picked from commit ac9e63b58533a3215106ed9da82cff3a3e3dda3a)
| | * Support more items for QTextCharFormat::VerticalAlignment enum for custom ↵Dmitry Zelenkovsky2011-05-022-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text objects. * QTextCharFormat::AlignNormal - support text format descent, place text object bottom on (baseline - descent). * QTextCharFormat::AlignBottom - place text object bottom on baseline. * QTextCharFormat::AlignTop - Still not supported. * Any other vertical alignment is mapped QTextCharFormat::AlignBottom. Add new enum AlignBaseline for custom inline objects to take into account font baseline. Merge-request: 2578 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> (cherry picked from commit ee9455ed2a83084692d969c398ecb91bcd4fc33a)
| * | Make it possible for animation driver to specify the advance time deltaGunnar Sletta2011-05-043-23/+61
| |/
| * Use maximum ascent/descent/leading from fallback fonts in shapingJiang Jiang2011-04-296-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When shaping a QScriptItem with a multi font engine, currently we only take the ascent/descent/leading from the primary (first) font engine in that multi font engine, however, subsequent engines used during shaping may have larger ascent/descent/leading, disregarding them may cause clipping issues in some cases. It's fixed by checking each font engine used in the shaping process and take the maximum value instead of the first one. On ATSUI we merely make it compile. Task-number: QTBUG-16719 Reviewed-by: Eskil (cherry picked from commit c501403cb5a0c9ec21b00e0c2f640ae85566e0cf)
| * Another ugly hack to make bidi cursor work with Core TextJiang Jiang2011-04-292-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | If the text is wrapped with LRE/LRO/RLE/RLO override/embed marks, Core Text in Mac OS X 10.5 doesn't produce an empty glyph at the beginning of the glyphs (while it does in Mac OS X 10.6), thus we need to prepend an empty glyph here, otherwise cursor position calculation will consider the first two characters as a ligature of the same glyph. Reviewed-by: Eskil (cherry picked from commit a36ac6c34bafa801c2c30d76f59e4a3594efc4d5)
| * Make sure layoutData exist before checking for string directionJiang Jiang2011-04-291-0/+2
| | | | | | | | | | | | | | Otherwise accessing that through QTextEngine::alignLine may cause crash. Reviewed-by: Samuel Rødal (cherry picked from commit dcdb62c3d1a76d951c4b65bc1b1bd930e2ad14ec)
| * Take leading space width into account for painting and selectionJiang Jiang2011-04-292-1/+4
| | | | | | | | | | | | | | | | | | | | When painting horizontally centered RTL text and selection with trailing spaces, we need to take that space width into account because line.textAdvance doesn't include it. Task-number: QTBUG-18612 Reviewed-by: Eskil (cherry picked from commit 224226727f07e8940e0d3131fe7587b11cc4a6ca)
| * Remove extra comma at the end of enum listJiang Jiang2011-04-291-1/+1
| | | | | | | | | | | | | | It fails compilerwarnings test. Reviewed-by: TrustMe (cherry picked from commit 1e847c00dcf4948b8892d0a552576e1d3ea554b9)
| * Don't transform glyph positions for Core Graphics paint engineJiang Jiang2011-04-291-2/+3
| | | | | | | | | | | | | | | | Since it already transformed text positions based on transform matrix on QPainter. Reviewed-by: Eskil (cherry picked from commit b86c9120710bf1481df5f6541618169a82fd65b8)
| * Turn on HarfBuzz support for Mac/CocoaJiang Jiang2011-04-293-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible to enable HarfBuzz text layout on Mac by either: - Set QT_ENABLE_HARFBUZZ environment variable when running a Qt app. - configure with -harfbuzz to build Qt, then HarfBuzz support will be turned on by default. HarfBuzz will only be used when the font explicitly requested is supported by HarfBuzz (aka. TrueType/OpenType font), other fonts (AAT fonts) will still be handled by Core Text. Using HarfBuzz for text layout will hopefully solve most tricky complex text shaping bugs on Mac. Task-number: QTBUG-17728 Reviewed-by: Eskil
| * Support visual cursor movement for BIDI textJiang Jiang2011-04-2917-273/+998
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bidi input can in some contexts be more intuitive if the cursor works in visual way: pressing left arrow key always make cursor move one character to the left regardless the language of text, pressing right arrow key always make cursor move to the right. It is also the behavior of Mac OS X. Based on the above reason and requests from Symbian we implemented this support for visual movement in BIDI text. 3 public properties are added to QTextDocument, QTextLayout and QLineEdit respectively: - QTextDocument::defaultCursorMoveStyle can be used to control the cursor behavior in all widgets based on QTextDocument, like QTextEdit, QPlainTextEdit, etc. When set to QTextCursor:: Visual, it will enable visual movement for all the cursors in the corresponding text edit. Default is QTextCursor::Logical. - QTextLayout::cursorMoveStyle is used for low-level cursor manipulation. When set to Visual, it will enable visual movement behavior for all the cursor related methods, including cursorToX, xToCursor and drawCursor. Default is Logical. - QLineEdit::cursorMoveStyle is used to control cursor movement behavior in QLineEdit. Default is Logical.: Task-number: QTBUG-13859 Reviewed-by: Eskil (cherry picked from commit c480dd641f5d22d1ee72cb27bf39e24c6df65658)
| * Disable tst_QPixmap::onlyNullPixmapsOutsideGuiThread on MacJiang Jiang2011-04-291-2/+2
| | | | | | | | | | | | | | No need to check it anymore after the switch to raster engine. Reviewed-by: Eskil (cherry picked from commit e004701bd7ba9e4a7cd5ac1bf784829feae16cae)
| * Make sure QFont's resolve mask is copied on compilers with C++0x supportEskil Abrahamsen Blomfeldt2011-04-291-1/+1
| | | | | | | | | | | | | | | | | | The QFont consists of a d pointer and a resolve mask, and they should both be copied in the assignment operator. Task-number: QTBUG-18921 Done-by: Friedemann Kleint (cherry picked from commit cb5e526c6023237c36aac3446a0a18288f39f3a9)
| * Fix glyph position issue with fallback fontsJiang Jiang2011-04-291-0/+3
| | | | | | | | | | | | Task-number: QTBUG-18933 Reviewed-by: Eskil (cherry picked from commit 18fcbf7ae41504324cd453ba9b9655f3e94f6495)
| * Fix crash in raster on X11 when text contains unsupported charactersEskil Abrahamsen Blomfeldt2011-04-291-1/+1
| | | | | | | | | | | | | | | | | | We would assume the font engine was a FT engine and do a static cast here, which would cause a crash if the box engine was in use instead. Task-number: QTBUG-17443 Reviewed-by: Samuel (cherry picked from commit c9c54682bcd23598ac7a8db3b10e9f18c978e268)
| * doc: Minor cleanup in QGlyphs docsEskil Abrahamsen Blomfeldt2011-04-291-1/+1
| | | | | | | | | | | | | | | | Just a minor clean-up in the QGlyphs docs. Mainly to try to trigger CI. Reviewed-by: TrustMe (cherry picked from commit 774b5b8c6a627fc90fb7382bc907db5d2e8193bf)
| * doc: Simplify language in QGlyphs docsEskil Abrahamsen Blomfeldt2011-04-291-2/+2
| | | | | | | | | | | | | | Mainly to trigger CI. Reviewed-by: TrustMe (cherry picked from commit 1a1683c2d57debbb3e7f3ae6001eb2c8685dca02)
| * Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into ↵Gunnar Sletta2011-04-2821-126/+202
| |\ | | | | | | | | | qtquick2
| | * Make QtQuick2 compile on QPAEskil Abrahamsen Blomfeldt2011-04-2821-126/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the logic to set pixel size into the font engines to avoid making the platform plugin interface too complex, and added a function in QPA to make an isolated font engine based on font data. Currently none of the QPA back-ends supports it, but it compiles and spits out a warning if you try to create a QRawFont from data there. This isn't used in QtQuick2 anyway. Reviewed-by: Jiang Jiang
| * | QT += declarative implies += opengl too, so hardcode it to make stuff workGunnar Sletta2011-04-281-0/+3
| |/
| * Merged master into qtquick2.axis2011-04-27359-868/+3228
| |\
| * | Initial import from qtquick2.Qt by Nokia2011-04-2733-152/+465
| | | | | | | | | | | | | | | Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
* | | Added dependency information to the sync.profile.axis2011-04-271-0/+41
| |/ |/|
* | Add .gitignore to each moduleaxis2011-04-271-0/+261
| |
* | Fix the target for QtUiTools debug on MacPrasanth Ullattil2011-04-271-2/+0
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 05:43:53 +0000