summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-302-1/+4
|\ | | | | | | | | | | | | | | | | 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
| * 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-3014-39/+110
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * Update frameGeometry when the unified toolbar visiblity is toggledAndy Shaw2010-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | 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
| * 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
| * 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
| * 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
| * 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
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-285-3/+23
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | 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-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-283-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-271-2/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed regression when typing in QTextControl based widgets on Symbian Fixed incorrect snippet in BLD_INF_RULES documentation Streamlined smart installer package creation
| | * Fixed regression when typing in QTextControl based widgets on Symbianaxis2010-09-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The bug was that when querying for the maximum text length, the case where an invalid QVariant was returned (which is allowed) was not handled properly. This would lead to input being blocked by the input context when it shouldn't. RevBy: Sami Merila
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-2848-4609/+691
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compile warnings (unused variables). Removing libconninet 3rdparty component. Closes properly the dbus connection in icd backend Connect/Disconnect requests needs to use the same dbus connection to ICD for the refcounting to work in ICD. Added my changes to the changelog. Clarified documentation of loadFinished() signal. Added a condition to skip obsolete functions during the threadness check. Doc: call qApp->precessEvents after QSplashScreen::showMessage Doc: Said that QApplication exits when not able to open X11 display Doc: maintainance - fixing grammar and spelling Doc: Added a note to qmake INSTALLS docs Doc: Fixing overlapping text problem in columns Doc: Added info on QWidget::render to printing docs Added default value documentation for two variables.
| * | Fix compile warnings (unused variables).Aaron McCarthy2010-09-282-1/+9
| | |
| * | Removing libconninet 3rdparty component.Aaron McCarthy2010-09-2843-4595/+650
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of libconninet caused Qt to have a cyclic build dependency. Which was solved by embedding a copy as a 3rd party library. Maemo has since donated the libconninet code to Qt because (1) it was a private Maemo API and (2) the Qt ICD plugin is the only user of the library. This commit moves the relevent code from src/3rdparty/libconninet to src/plugins/bearer/icd and deletes the rest. Task-number: QT-3893
| * | Closes properly the dbus connection in icd backendAaron McCarthy2010-09-281-0/+2
| | |
| * | Connect/Disconnect requests needs to use the same dbus connection to ICD for ↵Aaron McCarthy2010-09-282-5/+6
| | | | | | | | | | | | | | | | | | the refcounting to work in ICD. Fixes NB#188145 - Network interface doesn't go down after last client disconnects
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-274-8/+24
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Added my changes to the changelog. Clarified documentation of loadFinished() signal. Added a condition to skip obsolete functions during the threadness check. Doc: call qApp->precessEvents after QSplashScreen::showMessage Doc: Said that QApplication exits when not able to open X11 display Doc: maintainance - fixing grammar and spelling Doc: Added a note to qmake INSTALLS docs Doc: Fixing overlapping text problem in columns Doc: Added info on QWidget::render to printing docs Added default value documentation for two variables.
| | * Merge commit 'oslo-staging-1/4.7' into week39Morten Engvoldsen2010-09-273-2/+13
| | |\
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-261-8/+11
| | |\ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2459-410/+1006
| | |\ \ \
| | * | | | Clarified documentation of loadFinished() signal.Jerome Pasion2010-09-241-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:David Boddie Task: QTBUG-10178
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-2437-258/+234
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2237-258/+234
| | | |\ \ \ \
| | * | | | | | Doc: call qApp->precessEvents after QSplashScreen::showMessageGeir Vattekar2010-09-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13734 Reviewed-by: Jerome Pasion
| | * | | | | | Doc: Said that QApplication exits when not able to open X11 displayGeir Vattekar2010-09-241-0/+6
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13377 Reviewed-by: Jerome Pasion
| | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-215-13/+40
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2029-251/+742
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'doc-4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-201-3/+4
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'doc-4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Jerome Pasion2010-09-2054-3632/+1690
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Added default value documentation for two variables.Jerome Pasion2010-09-171-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie:
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-272-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add export to QDeclarativeBasePositioner Fix assert when placing a .qml file inside $QTDIR/imports
| * | | | | | | | | | Add export to QDeclarativeBasePositionerMarco Bubke2010-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bauhaus needs this export to manage layouts.
| * | | | | | | | | | Fix assert when placing a .qml file inside $QTDIR/importsKai Koehne2010-09-271-0/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assert "Internal error: Plugin imported previously with different uri" happens on Windows. $QTDIR\imports, which is prefixed to the search path, is still written with backslashes. Unify this to forward slashes for all paths. Task-number:QTBUG-13994 Reviewed-by: mae
* | | | | | | | | | Moved the partial deployment section to qbase.pri.axis2010-09-274-45/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way it will be available to all modules, not just selected ones. RevBy: Miikka Heikkinen
* | | | | | | | | | Made the Symbian menu close when switching native focus.axis2010-09-271-0/+4
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was required to avoid windows appearing on top of the popup menu, preventing both the menu and the softkeys from being used. Task: QTBUG-9965 AutoTest: Included RevBy: Jason Barron
* | | | | | | | | Document PropertyAnimation::targets propertyBea Lam2010-09-271-1/+8
| | | | | | | | |
* | | | | | | | | Fix test.Michael Brasser2010-09-271-0/+4
| | | | | | | | |
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-261-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-241-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-241-1/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| | | * | | | | | | More declarative autotests.Michael Brasser2010-09-241-1/+1
| | | | | | | | | |
generated by cgit v0.12 at 2025-02-03 13:02:23 (GMT)