summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-013-4/+14
|\
| * Doc: Fixing link titles and error color in search resultsMorten Engvoldsen2010-10-011-2/+8
| |
| * Doc: Implementing features to the search feature.Morten Engvoldsen2010-10-013-2/+6
| | | | | | | | Adding search to narrow/slim fit mode
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-0173-229/+171063
|\ \ | |/
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-3070-141/+170911
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-305-5/+53
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added support for unsigned smart installer package creation in Symbian Fix QApplication::desktop()->availableGeometry() for Symbian QS60Style: Possible NULL pointer use when drawing frame
| | | * Added support for unsigned smart installer package creation in SymbianMiikka Heikkinen2010-09-303-4/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make target "unsigned_installer_sis" can now be used to create unsigned smart installer sis. The contained application sis will also be unsigned. Task-number: QTBUG-13902 Reviewed-by: axis
| | | * Fix QApplication::desktop()->availableGeometry() for SymbianMiikka Heikkinen2010-09-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since screen geometry changes before client area geometry is changed in Eikon, we need to send two resize events, one for screen area change and one for client area change. Note that the correct way to detect client area change in applications is to connect to QApplication::desktop() signal workAreaResized(int) instead of filtering for resize events meant for QDesktopWidget. Task-number: QTBUG-14058 Reviewed-by: Jason Barron
| | | * QS60Style: Possible NULL pointer use when drawing frameSami Merila2010-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style::drawControl casts QStyleOption pointer to QStyleOptionFrame, yet never checks if the orginal pointer was NULL or not. The casted pointer is then used to fetch palette information from style option. Thus, this might lead to crash. Reviewed-by: Miikka Heikkinen
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-3054-69/+170564
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Add declarative changelog entries for 4.7.1 connman backend My changelog entries for 4.7.1 updated changes-4.7.1 Update frameGeometry when the unified toolbar visiblity is toggled Update changelog my contributions to dist/changes-4.7.1 My 4.7.1 changes. added my and Jan-Arve's change to changelog for 4.7.1 Changes done for 4.7.1 Updated changes-4.7.1 My changes. Fix for bug QTMOBILITY-448 to list the default network configuration in Bearermonitor example Initialise pointer variables. An aborted QNetworkSession on Maemo must emit SessionAbortedError. Autotest: also enable testing of QtDeclarative Add Qt 4.7.0 baseline symbols to the 4.7 branch Call createpackage without the explicit .bat suffix Improve Qt/Symbian compatibility with unix shells Ukrainian translation updated ...
| | | * | Add declarative changelog entries for 4.7.1Joona Petrell2010-09-301-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Yann Bodson
| | | * | connman backendLorn Potter2010-09-301-0/+1
| | | | |
| | | * | My changelog entries for 4.7.1Markus Goetz2010-09-291-0/+4
| | | | |
| | | * | updated changes-4.7.1Joerg Bornemann2010-09-291-0/+12
| | | | |
| | | * | Update frameGeometry when the unified toolbar visiblity is toggledAndy Shaw2010-09-292-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the unified toolbar visiblity was toggled on Carbon then it would not have a correct frameGeometry as it would have a top position different to what it should have been as the window does not move. Autotest included in this commit. Task-number: QTBUG-14055 Reviewed-by: Prasanth
| | | * | Update changelogOlivier Goffart2010-09-291-0/+24
| | | | |
| | | * | my contributions to dist/changes-4.7.1Bradley T. Hughes2010-09-291-1/+7
| | | | |
| | | * | My 4.7.1 changes.Trond Kjernåsen2010-09-291-2/+11
| | | | |
| | | * | added my and Jan-Arve's change to changelog for 4.7.1Thierry Bastian2010-09-291-0/+11
| | | | |
| | | * | Changes done for 4.7.1Prasanth Ullattil2010-09-291-0/+4
| | | | |
| | | * | Updated changes-4.7.1Samuel Rødal2010-09-291-1/+4
| | | | |
| | | * | My changes.Aaron McCarthy2010-09-291-0/+2
| | | | |
| | | * | Fix for bug QTMOBILITY-448 to list the default network configuration in ↵lsgunda2010-09-291-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bearermonitor example Merge-request: 827 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
| | | * | Initialise pointer variables.Aaron McCarthy2010-09-291-2/+2
| | | | |
| | | * | An aborted QNetworkSession on Maemo must emit SessionAbortedError.Alex2010-09-291-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it emits InvalidConfigurationError Task-number: QTMOBILITY-514 Reviewed-by: Aaron McCarthy
| | | * | Autotest: also enable testing of QtDeclarativeThiago Macieira2010-09-281-0/+1
| | | | |
| | | * | Add Qt 4.7.0 baseline symbols to the 4.7 branchThiago Macieira2010-09-2819-0/+170074
| | | | |
| | | * | Call createpackage without the explicit .bat suffixMartin Storsjo2010-09-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On windows, the .bat file is implicitly called, on unix the "createpackage" shell script wrapper is called instead. The symbian-sbsv2 mkspec already calls createpackage without any suffix. Merge-request: 823 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * | Improve Qt/Symbian compatibility with unix shellsMartin Storsjo2010-09-282-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove an "echo." call that doesn't work on unix, and make the create_temps target work with unix shell syntax (QMAKE_CHK_DIR_EXISTS requires an || before the command to execute on unix shells). Merge-request: 823 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * | Ukrainian translation updatedVictor Ostashevsky2010-09-283-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2485 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * | Don't use translations for console tools under windowsVictor Ostashevsky2010-09-285-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13619 Merge-request: 2486 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | * | GtkStyle: memory leaks in widget map are fixedDenis Mingulov2010-09-282-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13636 Merge-request: 817 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
| | | * | Fixed performance issue in QML clipping with OpenGL 2.0 paint engine.Samuel Rødal2010-09-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 4c515ceb fixed Intersect and Unite-clipping after doing setClipping(false), but also introduced a performance problem. If there was no pre-existing clip we'd convert IntersectClips to ReplaceClips, which is unnecessary since the paint engines already handle this correctly. IntersectClips can be handled much more efficiently in the OpenGL 2 paint engine for example. We only need to convert to ReplaceClip when someone has used setClipEnabled(false) which is anyways expensive and not recommended. Reviewed-by: Trond
| | | * | Fixed antialiased rasterization bug in raster engine.Samuel Rødal2010-09-283-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rasterization in the gray raster fails due to out of memory there might already have been a number of spans flushed. To avoid flushing these spans multiple times and thus getting overdraw artifacts we need to keep track of how many spans to skip when we redo the rasterization. This fixes the rendering error in arthur test paths_aa.qps Reviewed-by: Yoann Lopes
| | | * | Small optimizations the gray raster for 64-bit.Samuel Rødal2010-09-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gray raster uses long to ensure having 32-bit integers since it was originally designed to work on 16-bit platforms as well. On 64-bit platforms switching to use int instead of long gives a performance boost of ~10 % or so depending on the use case. Reviewed-by: Yoann Lopes
| | | * | Fixed a painting glitch with checked menu icons on WindowsXPJens Bache-Wiig2010-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue affected windows XP style. The checked icon would get incorrect border offsets before. The fix was suggested by Jonathan Liu. Reviewed-by:richard Task-number: QTBUG-10796
| | | * | QSslSocket speed up loading of system certificates on Unix (not Mac)Peter Hartmann2010-09-282-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by only reading in a certificate once. Before, we were adding all files from all directories; since they often contained symlinks, the same certificate was added several times. Reviewed-by: Markus Goetz Reviewed-by: Thiago Macieira Task-number: QTBUG-14013
| | | * | Added note to changes-4.7.1Zeno Albisser2010-09-281-0/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Frederik Gladhorn
| | | * | Insert the result of QHostInfo::fromName into the hostinfo cache, too.David Faure2010-09-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way both synchronous and asynchronous lookups are cached, resulting in more reliable behavior: this issue was detected by kde's ktcpsockettest where state() was sometimes HostLookupState and sometimes ConnectedState, depending on whether the previous lookups were done by the thread or by the blocking lookup in QAbstractSocket::waitForConnected. Merge-request: 829 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Markus Goetz
| | | * | Invert the buildkey logic for compilers.Thiago Macieira2010-09-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make ICC use "g++-4" as the official buildkey, since it's supposed to be completely ABI-compatible. Keep the older build key for compatibility with plugins built with ICC prior to 4.7. Reviewed-By: Bradley T. Hughes
| | | * | Use quint64 (long long) instead of long for the GCC assembly code.Thiago Macieira2010-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows 64-bit has sizeof(long) == 4, which doesn't match the register size. Task-number: reported on IRC Reviewed-by: Trust Me
| | | * | Disable NTLM tests again, our server is not working.Thiago Macieira2010-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't know how to configure Squid and Samba. If someone does, please contact us. Reviewed-By: Trust Me
| | | * | fix moc argument quoting on mingwOswald Buddenhagen2010-09-281-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for some bizarre reason, mingw doesn't like double quotes. so instead of building some more elaborate custom quoting, just let qmake do it for us. Reviewed-by: mariusSO
| | | * | SSL: Add benchmark for QSslSocket::systemCaCertificates()Markus Goetz2010-09-284-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14013 Reviewed-by: Peter Hartmann
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-3013-67/+294
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Skip tst_QFont::lastResortFont() for Q_WS_QWS Fixed failure of benchlibcallgrind selftest on some platforms. Fix QFontMetrics::lineWidth() for fonts with defined point size Implemeting, exporting and autotesting QFont::lastResortFont() Fixed compile error on non-Symbian platforms. Fixed regression when typing in QTextControl based widgets on Symbian Fixed incorrect snippet in BLD_INF_RULES documentation Streamlined smart installer package creation
| | | * | Skip tst_QFont::lastResortFont() for Q_WS_QWSAlessandro Portale2010-09-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFont::lastResortFont() may abort with qFatal() on QWS if absolutely no font is found. Just as ducumented. This happens on our CI machines which run QWS autotests.
| | | * | Fixed failure of benchlibcallgrind selftest on some platforms.Rohan McGovern2010-09-291-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | This test may be sensitive to the particular toolchain and valgrind versions on the test machine. We'll work around that.
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-2812-61/+273
| | | |\ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QFontMetrics::lineWidth() for fonts with defined point size Implemeting, exporting and autotesting QFont::lastResortFont() Fixed compile error on non-Symbian platforms. Fixed regression when typing in QTextControl based widgets on Symbian Fixed incorrect snippet in BLD_INF_RULES documentation Streamlined smart installer package creation
| | | * | Fix QFontMetrics::lineWidth() for fonts with defined point sizeAlessandro Portale2010-09-282-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFontMetrics::lineWidth() and ::underlinePos() return value 1 regardless of the font size if the size was defined in points (instead of pixels). (On Symbian) QFontMetrics::lineWidth() calls QFontEngine::lineThickness() which uses its fontDef.pixelSize in order to come up with a suitable line width. If the QFont size was defined in points, Qt needs to make sure that fontDef.pixelSize is set accordingly. This patch adds the code to make sure that QFontEngine::fontDef always has a valid pixel size. tst_QFontMetrics::lineWidth() was added, wich failed before and passes after this patch. Task-Number: QTBUG-13009 Autotest: Passes Reviewed-By: Eskil
| | | * | Implemeting, exporting and autotesting QFont::lastResortFont()Alessandro Portale2010-09-284-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An implementation of QFont::lastResortFont() is still(!) missing in Qt 4.7.0. I only became aware of QTBUG-6921, lately. This patch... 1) implements QFont::lastResortFont() in qfont_s60.cpp by first trying to get the lastResortFamily() and then falling back to a hardcoded font. 2) updates the .def files with one additional entry 3) adds an autotest which verifies that lastResortFamily() does return a non-empty string. In the firt place, that autotest makes sure that lastResortFamily() is implemented and exported, so that something like this issue will not go unnoticed in the next Qt port. Task-number: QTBUG-6921 Reviewed-by: Eskil
generated by cgit v0.12 at 2025-01-29 09:46:34 (GMT)