summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
| * Fixed compile error on non-Symbian platforms.axis2010-09-281-0/+2
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-276-61/+228
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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-272-55/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Fixed incorrect snippet in BLD_INF_RULES documentationMiikka Heikkinen2010-09-272-1/+8
| | | | | | | | | | | | | | | Task-number: QTBUG-13988 Reviewed-by: TrustMe
| | * Streamlined smart installer package creationMiikka Heikkinen2010-09-272-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously manual editing of the pkg file was required to publish application using smart installer. Now a proper app_installer.pkg will be created as long as application has protected range UID. Also changed "make installer_sis" to always generate the application sis as publishing process supports signing both application and its smart installer wrapper packages in single step. Task-number: QTBUG-13991 Reviewed-by: axis
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-2857-4653/+861
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Added lisence header to snippet Doc: Fixing QTBUG-13595 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.
| * | Doc: Added lisence header to snippetGeir Vattekar2010-09-281-0/+39
| | | | | | | | | | | | (cherry picked from commit a21b6be2e97b2678111930bc04eaa843b42fa22b)
| * | Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-09-281-0/+3
| |\ \
| | * | Doc: Fixing QTBUG-13595Morten Engvoldsen2010-09-281-0/+3
| | | |
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2722-57/+220
| | |\ \ | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-2857-4653/+819
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2713-52/+152
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Added my changes to the changelog.axis2010-09-271-0/+12
| | | | |
| | * | | Merge commit 'oslo-staging-1/4.7' into week39Morten Engvoldsen2010-09-2714-11/+164
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-265-55/+71
| | |\ \ \
| | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2495-501/+1824
| | |\ \ \ \
| | * | | | | Clarified documentation of loadFinished() signal.Jerome Pasion2010-09-241-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:David Boddie Task: QTBUG-10178
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-09-242-0/+13
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-2474-470/+655
| | | |\ \ \ \ \
| | | * | | | | | 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
| | * | | | | | | Added a condition to skip obsolete functions during the threadness check.Jerome Pasion2010-09-241-16/+19
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Task:QTBUG-13786
| | * | | | | | Doc: maintainance - fixing grammar and spellingMorten Engvoldsen2010-09-233-28/+28
| | | | | | | |
| | * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2271-442/+627
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-228-13/+46
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-218-13/+46
| | | |\ \ \ \ \ \
| | * | | | | | | | Doc: Added a note to qmake INSTALLS docsGeir Vattekar2010-09-221-0/+3
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-3171 Reviewed-by: David Boddie
| | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-2152-802/+12445
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2050-799/+12440
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'doc-4.7' into 4.7Morten Engvoldsen2010-09-201-3/+4
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ 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-20364-4131/+3265
| | | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Added default value documentation for two variables.Jerome Pasion2010-09-171-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie:
| | | * | | | | | | | | | | Doc: Fixing overlapping text problem in columnsMorten Engvoldsen2010-09-201-0/+1
| | | |/ / / / / / / / / /
| | * | | | | | | | | | | Doc: Added info on QWidget::render to printing docsGeir Vattekar2010-09-202-0/+65
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2210 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
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-276-45/+54
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Moved the partial deployment section to qbase.pri. Made the Symbian menu close when switching native focus.
generated by cgit v0.12 at 2024-11-15 01:00:09 (GMT)