summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Register QtQuick 1.0 module.Aaron Kennedy2010-10-015-31/+146
| | | | | | | | Qt 4.7 is still supported, but deprecated. Reviewed-by: Martin Jones Task-number: QTBUG-13799 (cherry picked from commit 4fcf055f66cc23c9e60a7add489e394420e71914)
* If a type is registered under several names, share the attached property objectAaron Kennedy2010-10-019-10/+62
| | | | | Task-number: QTBUG-13799 (cherry picked from commit 746954581f06e0bca98f25eb95dca09c663d47bf)
* Fixed compile error on non-Symbian platforms.axis2010-10-011-0/+2
| | | | (cherry picked from commit 3e3ce984b54a0b199bf5d4f5e3dcb0a9d5b5bd79)
* Fixed regression when typing in QTextControl based widgets on Symbianaxis2010-10-012-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 (cherry picked from commit 3bb3af84bef3c0472ca8ed0d5c6bb3c82320956d)
* Fix QApplication::desktop()->availableGeometry() for SymbianMiikka Heikkinen2010-10-011-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 (cherry picked from commit 0725abc4607755833a1eb7cb9e083add48d03a88)
* fix moc argument quoting on mingwOswald Buddenhagen2010-10-011-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 (cherry picked from commit fa5c83003db5dea46fc045b2fd90e6308a0d8911)
* QDeclarativeDebugService: Add bc autotestKai Koehne2010-10-013-2/+95
| | | | | | | Although it's a private header we use qdeclarativedebugservice_p.h in creator / qmljsdebugger library. Working with a copy of the header in the autotest hopefully catches some bc breakages. (cherry picked from commit 31dcf2b4028b1f76301fc69fccff0a9474a0a135)
* Added support for unsigned smart installer package creation in SymbianMiikka Heikkinen2010-10-013-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 (cherry picked from commit 6d5309c2fbdbf15948b430de103f393c5af5b7cd)
* Fix crash when trying to append a null transform to QDeclarativeItem.Michael Brasser2010-10-013-1/+26
| | | | | Task-number: QTBUG-13893 (cherry picked from commit 085a121cb1ebba38d62c924500dbc71806b29b3c)
* QAxBase::dynamicCall() returns invalid QVariantPrasanth Ullattil2010-10-011-2/+4
| | | | | | | | | | | Starting from 4.7.0, QVariant is recognized as a standard type by the meta type system. ActiveQt needs to consider this while converting COM VARIANT types to a QVariant. Task-number: QTBUG-13845 Reviewed-by: Volker Hilsheimer Reviewed-by: Olivier Goffart (cherry picked from commit fc50d7ecaacfbfef1dbefd6ffdc083cb66c5633c)
* Fixes cursor shape when widget becomes native on X11.Denis Dzyubenko2010-10-011-1/+3
| | | | | | | | | | When a native window handle is created for a widget that has override cursor set, we should reset the cursor on the parent and set the cursor on the new window handle. Task-number: QTBUG-6185 Reviewed-by: Olivier Goffart (cherry picked from commit 9e9a7bc29319d52c3e563bc2c5282cb7e6890eba)
* Streamlined smart installer package creationMiikka Heikkinen2010-09-302-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 (cherry picked from commit bc8409b9d04be54d98ca97d96c32473039f58a80)
* Fixed incorrect snippet in BLD_INF_RULES documentationMiikka Heikkinen2010-09-302-1/+8
| | | | | | Task-number: QTBUG-13988 Reviewed-by: TrustMe (cherry picked from commit 1e4f736c2825c8c36ec74719efbc723f6374d072)
* Fix assert when placing a .qml file inside $QTDIR/importsKai Koehne2010-09-291-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 (cherry picked from commit 0aa6360b7648ddeb8a905960265eb46d8c12448f)
* Fixed floating point overflow issues in QRasterizer::rasterizeLineSamuel Rødal2010-09-292-61/+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 (cherry picked from commit 93199a5b7082fd484b7f21ad4825d71693ecead2)
* Fixed scaled point drawing with square cap in raster paint engine.Samuel Rødal2010-09-292-24/+39
| | | | | | | | | | | | 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 (cherry picked from commit 7c673a4cf64ba043bb27f90287517bdcdd7a21db)
* Removing libconninet 3rdparty component.Aaron McCarthy2010-09-2943-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 (cherry picked from commit f532d8fcd236be9933e4186a95561e1c264de277)
* Closes properly the dbus connection in icd backendAaron McCarthy2010-09-291-0/+2
| | | | (cherry picked from commit 2ff0dee1b97348a750532223f0a318596c93d412)
* Connect/Disconnect requests needs to use the same dbus connection to ICD for ↵Aaron McCarthy2010-09-292-5/+6
| | | | | | | the refcounting to work in ICD. Fixes NB#188145 - Network interface doesn't go down after last client disconnects (cherry picked from commit 4acbb418b1ad093ad848143218a10ee2957db282)
* Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2Simon Hausmann2010-09-2811-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 (cherry picked from commit dbf1d0339a0cfbe60e6b3e45f39e6c02aa3de0a8)
* Update QtDeclarative .def files.Jason McDonald2010-09-272-0/+4
|
* Move includes after copyright blockMartin Jones2010-09-271-5/+2
| | | | (cherry picked from commit b750bb085029117497d26a24dcd590fbe34fe281)
* Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-274-0/+187
| | | | | | | | | | | Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a private header, where we nevertheless can make some BC checks/guarantees. Aaron Kennedy agreed with the idea. Task-number: QTCREATORBUG-2179 (cherry picked from commit c1a7deedf1628e0dd3a5fbf92d97c4151d17fb5a)
* Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-277-3/+140
| | | | | | | | | | | Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a private header, where we nevertheless can make some BC checks/guarantees. Aaron Kennedy agreed with the idea. Task-number: QTCREATORBUG-2179 (cherry picked from commit 63c4c0449361ced03838e51d18e1113740f27fa9)
* fix RSS listing examplePeter Hartmann2010-09-273-47/+59
| | | | | | | | | ... by handling HTTP 30X responses and using QNetworkAccessManager instead of QHttp. The server now sends back a HTTP 302 instead of a 200. Reviewed-by: Markus Goetz Task-number: QTBUG-13892 (cherry picked from commit 15ddcea2d15b7d7731e24151b0a30990e77efe74)
* Improved Symbian4 platform detectionMiikka Heikkinen2010-09-274-57/+93
| | | | | | | | | | | Now returns correct value for Symbian4 platforms with QSysInfo::symbianVersion(). SYMBIAN_VERSION .pro file variable should also return correct value even if it doesn't get set in environment.prf. Task-number: QTBUG-13802 Reviewed-by: Shane Kearns Reviewed-by: Janne Anttila (cherry picked from commit 0aad0d2043e061469b7139483c489dc6f823490b)
* QHostInfo: Fix a crash when a new request is pushed while resolving.Jocelyn Turcotte2010-09-271-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 (cherry picked from commit 45c2ac4f1e1218f595b1d21691c8dec4eaa1a021)
* QML Debugging: Documentation fixesLasse Holmstedt2010-09-271-15/+3
| | | | | | | | Many things have changed with QML debugging in Qt Creator. Now docs simply refer to Qt Creator documentation. Reviewed-by: Leena Miettinen (cherry picked from commit f61d2d16310aa0a87ec1ba823f903f19575aed7c)
* Fix dependency on the plugins rule for multimediaAndy Shaw2010-09-271-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 (cherry picked from commit c52224f8010bf90732e5b2ad6cef84f9bd248787)
* Avoid OpenVG rendering errors when stroking an aliased path.Jason Barron2010-09-241-1/+6
| | | | | | | | | | | | | | | Stroking a path can sometimes result in inconsistent rendering especially when combined with a clip. For example, if the logical edge of a clip rect coincides with the logical edge of a path then it can happen that the edge is not painted correctly because the stroke lies outside the bounds of the clip rect. To workaround this problem, we add the 'aliasedCoordinateDelta' such that the rounding will err on the side of caution. This improves the correctness when using the raster engine as a reference. Task-number: QTBUG-13165 Reviewed-by: Samuel (cherry picked from commit 74f09c794d5fdcb8f4b547b1c55bcd512ef07b95)
* Incorrect translations for application menu items on Mac OS X.Prasanth Ullattil2010-09-241-2/+7
| | | | | | | | | | | This is a regression fron 4.6 release. Menu entries with some specific roles are automatically merged to the application menu. They are now translated based on the context "MAC_APPLICATION_MENU" instead of "QMenuBar" context. This patch eanbles the use for both contexts. Task-number: QTBUG-13878 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 7d878ba53909157cf1911c30ce973378589c2cc0)
* Fix a crash with D&d on mingwThierry Bastian2010-09-241-6/+6
| | | | | | | | | The Drag&Drop callbacks need to be correctly aligned to not crash in the graphics SSE code. Task-number: QTBUG-13787 Reviewed-by: benjamin poulain (cherry picked from commit a7c28aa588417c0a75f82d55019814443f889340)
* QTreeView: do not scroll to top if last item is removedFrank Reininghaus2010-09-242-0/+26
| | | | | | | | | | | | | | When the last item is the current item and is removed, QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's viewItems member is cleared. This commit makes sure that viewItems is restored by calling QTreeView::doItemsLayout() in this case, preventing that the scroll bar range is set to zero temporarily and the view is scrolled to the top unexpectedly (this was a regression in 4.7.0: QTBUG-13567). Merge-request: 2481 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> (cherry picked from commit 6da6b7099d4e0b49329793e4b90703ec3d868048)
* Fix text direction setting in QTextBlock layoutJiang Jiang2010-09-231-6/+0
| | | | | | | | | QTextControl should no longer inherit the layout direction of parent widget as its default text direction. Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: Lars Knoll (cherry picked from commit 6397e5bc49f11e20a9d1838d8d8df46dd9486263)
* Fix text direction handling in QLabelJiang Jiang2010-09-232-11/+17
| | | | | | | | | | For QLabel, text direction should be determined by actual text (if it's a simple text label) or the textDirection() property of the defaultTextOption of corresponding QTextDocument. Task-number: QTBUG-13552 Reviewed-by: Lars Knoll (cherry picked from commit 9b20aac0ad83b917c46cc44b78dc90fb1d238fe8)
* Update QtDeclarative def filesJoona Petrell2010-09-232-3/+9
| | | | (cherry picked from commit 90431a96ca0558ac82ccd588faf1b0aed55abbfe)
* Fix example after changes to font.letterSpacing.Yann Bodson2010-09-231-1/+2
| | | | (cherry picked from commit 5372b313127302d94c748732052dd62d0e38a1cd)
* Autotest and small fix for QDeclarativeFontLoader.Yann Bodson2010-09-233-5/+43
| | | | (cherry picked from commit eef26bc8521da62db0dced6796eceb7c27f64160)
* Fix a crash in QDeclarativeVisualDataModelJoona Petrell2010-09-233-3/+44
| | | | | | Task-number: QTBUG-13754 Reviewed-by: Martin Jones (cherry picked from commit 46e49547f8e4614cd504b0af0d52d4e2768b57c3)
* Rebuild configure.exe.Jason McDonald2010-09-231-0/+0
|
* qmake: fix quoting of moc callsJoerg Bornemann2010-09-231-2/+2
| | | | | | Task-number: QTBUG-13782 Reviewed-by: ossi (cherry picked from commit 36fc9e830b828b69c4df775c68c07c25c9bab4cf)
* QNAM: Use QFileNetworkReply for qrc:/ URL schemaMisha Tyutyunik2010-09-232-3/+6
| | | | | | | | Resources do not need network access and can be quicker loaded with QFileNetworkReply. Reviewed-by: Markus Goetz (cherry picked from commit 5120dfec47475dd37f51df4dda9a4ef8494036ab)
* Fixed drawing a large number of glyphs with the same font under GL.Trond Kjernåsen2010-09-234-9/+30
| | | | | | | | | | | | | | | Our glyph caching system doesn't take GL texture size limitation into account, and assumes you can create an infinitely large texture. On top of that, the cache will never create a cache that is wider than 256, or QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH, which means we'll hit the texture size limit even faster. With this patch the entire texture is utilized. However, to fix in properly we need to support having multiple texture for each font engine. That will be fixed shortly (see task QTBUG-13784). Task-number: QT-3971 Reviewed-by: Eskil (cherry picked from commit eb2926a2f9607e985b8bca54346e6fdf91343247)
* Update QtGui def filesJoona Petrell2010-09-232-2/+10
| | | | (cherry picked from commit 36705197479337ccf341a4c39a6e5f44d3fb2322)
* Fix Symbian def file for a9e5329168Kai Koehne2010-09-231-0/+1
| | | | | Reviewed-by: Thomas Hartmann (cherry picked from commit a371562d870abb421682dcf83d447e5d5c9e82fa)
* Make qml debugging work with command line argumentsLasse Holmstedt2010-09-2310-20/+114
| | | | | | | | | | | The environment variables do not work for Symbian devices, so without this change, QML debugging cannot be done on them. In addition, configure now contains an option to disable qml debugging entirely, due to it being a major security risk. Reviewed-by: kkoehne (cherry picked from commit a9e5329168cd9113bf41293c05193d8b099494c6)
* Update QtCore bwins def fileJoona Petrell2010-09-231-2/+2
| | | | (cherry picked from commit 580fbb6a48b9cc2fbd0a011449d0c3a73c939ff9)
* Qt headers must be included before X11 headersBenjamin Poulain2010-09-221-3/+3
| | | | | | | | X11 symbols are conflicting with some of the Qt ones. Qt headers needs to be included before the X11 ones in order to compile on Maemo. Reviewed-by: Samuel Rødal (cherry picked from commit f1f986dfe40f82fca1a8a27f5f02e1a9f7818fd0)
* Fixed compilation of MeeGo graphics system without eglext.hSamuel Rødal2010-09-221-1/+0
| | | | | | | We don't rely on this header, so there's no need to include it. Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com> (cherry picked from commit a65f53a09c2a5950bd8b98fd791dc413bb11f9bf)
* Avoid creating copy of an image in memory when storing as jpegaavit2010-09-221-28/+13
| | | | | | Task-number: QT-3871 Reviewed-by: Kim (cherry picked from commit 7efe816d028876487a6a44d97ed58a807da7d4d8)