summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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/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
| | | | | | | | | |
* | | | | | | | | | QHostInfo: Fix a crash when a new request is pushed while resolving.Jocelyn Turcotte2010-09-261-8/+11
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The loop looking for posponedLookup in the lookup thread wasn't locking the mutex before trying to access/modify the list. Reviewed-by: Andreas Kling
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-09-2411-5/+332
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2
| * | | | | | | | | Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2Simon Hausmann2010-09-2411-5/+332
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes Jay's fix for the JSC memory consumption on Symbian https://bugs.webkit.org/show_bug.cgi?id=34349 See also commit 03b7a3cffba609df56b4ccadacae6b6f985e96e9
* | | | | | | | | Do not set DESTDIR to the current directoryDenis Dzyubenko2010-09-243-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting DESTDIR=. shows an error from mv trying to move the file from the current directory to the same current directory. Reviewed-by: axis
* | | | | | | | | Fix dependency on the plugins rule for multimediaAndy Shaw2010-09-241-1/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When configuring with -no-multimedia then the plugins rule should not be depending on multimedia, otherwise it will not try and build any plugins. Task-number: QTBUG-13912 Reviewed-by: Rohan McGovern
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-243-113/+103
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed floating point overflow issues in QRasterizer::rasterizeLine Fixed scaled point drawing with square cap in raster paint engine. Don't try to use the texture_from_pixmap extension in GL on desktop/X11.
| * | | | | | | | Fixed floating point overflow issues in QRasterizer::rasterizeLineSamuel Rødal2010-09-231-60/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 7c673a4cf64ba04 introduced some autotest failures in the fpe_steepSlopes test in QPainter. Since the other rasterizers all deal in a 26.6 fixed point coordinate space we should snap the line vertices to this to prevent floating point overflows due to very steep slopes. This also necessitates keeping track of four different slope / inverse slope increments for each of the four edges. This also fixes a previously QEXPECT_FAIL'ed test case. Task-number: QTBUG-13429 Reviewed-by: Trond
| * | | | | | | | Fixed scaled point drawing with square cap in raster paint engine.Samuel Rødal2010-09-231-24/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a large pen width and a small scale, due to the hacky way we draw points (stroking a line from (x, y) to (x + tiny_amount, y)), we some times end up snapping these two points to the same in rasterizeLine(). If we instead apply the SquareCap before we do clipping / snapping we don't get this problem. Task-number: QTBUG-13429 Reviewed-by: Trond
| * | | | | | | | Don't try to use the texture_from_pixmap extension in GL on desktop/X11.Trond Kjernåsen2010-09-232-29/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are far too many problems with this extension for it to be usable on desktop at the moment, so disable on desktop GL for now. It's still enabled for EGL, where it seems to have better driver support. Task-number: related to QTBUG-11158 Reviewed-by: Samuel
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-243-16/+37
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Disallow patching capabilities of executables Made it more clear what the okToRun function does by renaming it. Fixed event starvation on Symbian if timers were constantly recreated Fixed deployment when using shadow builds. Marked a test as XFAIL on Symbian. Made posted events part of the round robin queue. Avoid OpenVG rendering errors when stroking an aliased path.