summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename 'plugins\qmldebugging' (work around qmake issues)Kai Koehne2011-02-147-6/+6
| | | | | | | | | | On Windows, qmake places the tcpserver.dll in a 'plugins\qmlreleaseging' folder, which broke remote debugging of QtDeclarative completely. New name 'qmltooling' while being not so specific, avoids the use of 'debug' in the folder name. Task-number: QTBUG-17360 Reviewed-by: Martin Jones (cherry picked from commit 2855782a45b08aedbed960125514fdd9663ff1c8)
* QDeclarativeDebug: Remove unused fileKai Koehne2011-02-142-1/+0
| | | | | Got added in 5336e1838a95d97. (cherry picked from commit 111e306c9991a0d89b0001b476e466891974945f)
* QDeclarativeDebug: Move Tcp server to separate pluginKai Koehne2011-02-1410-68/+136
| | | | | Reviewed-by: Christiaan Janssen (cherry picked from commit 21016c3b28674029a2a205da38f54e362e3635b9)
* QDeclarativeDebug: Move networking code out of QDeclarativeDebugServerKai Koehne2011-02-149-95/+383
| | | | | | | | Move socket handling code out of QDeclarativeDebugServer into a QDeclarativeDebugServer(Tcp)Connection class. Reviewed-by: Christiaan Janssen (cherry picked from commit 5336e1838a95d97d34863b668ff797582c226e79)
* QDeclarativeDebug: Decouple QDDServer, QDDService classesKai Koehne2011-02-145-311/+541
| | | | | | Move QDeclarativeDebugServer class into it's own files and make the classes less interdependent. (cherry picked from commit 5d251ef253065d68967ae3263b3cf7f1d93d7a00)
* Fix declarative autotest compilation on SymbianJoona Petrell2011-02-145-12/+27
| | | | | | Task-number: Reviewed-by: Martin Jones (cherry picked from commit e46c44f9538dbe5b44ce61d3a42403cfa471ae8b)
* QDeclarativeDebug: Include debugger plugin in qmlviewer.sisKai Koehne2011-02-141-0/+5
| | | | | | | | Developers that want to debug qml on their device have to now install qmlviewer.sis. Reviewed-by: Christiaan Janssen (cherry picked from commit 35ae0b8146bca7a61203ee347654aed27951439c)
* Make addImportPath() work for windows paths starting with lower caseBea Lam2011-02-142-3/+15
| | | | | | | | | | | | | Was causing assert failure on windows if the 'c:' was lower case, since it was being added to the import path database with a lower case and thus later lookups with an upper case 'c:' would fail. This change fixes the check for whether the path refers to a local path or not. Task-number: QTBUG-16885 Change-Id: I0a2a2f705443ed453fb2b13f8599e035c2bd2877 Reviewed-by: Martin Jones (cherry picked from commit 33512bc223be373975426ffcc6f8fa783a7582c9)
* Update modules-related tests and docsBea Lam2011-02-148-73/+210
| | | | | | | | Added tests for remote imports and fixed/improved examples and text in the docs. Change-Id: I8f411a0287c4d50ec3cebe5567d803689cd5b1c7 (cherry picked from commit d7e42d7c5b0eb6513526d0c21025939a467e8d68)
* Add test for importing plugins that contain QML filesJason McDonald2011-02-147-1/+91
| | | | | | | | (cherry picked from commit a78f6b1718b8285cb65ae989a070bf8703746b5d) Conflicts: tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro
* Fix QFileDialog Symbian native file dialog filename filtering.Miikka Heikkinen2011-02-141-33/+19
| | | | | | | | | | Now QFileDialog static functions that use Symbian native file dialog should find the same files as non-native QFileDialog for any given filename filter. Task-number: QTBUG-17298 Reviewed-by: Janne Koskinen (cherry picked from commit 5ec67c969dce335a26c402b73bb19a6751401871)
* Don't crash when BMP color table is brokenHarald Fernengel2011-02-111-0/+2
| | | | | | | | | | | If the BMP's number of color table entries is out of bounds, we would resize our color table vector to a silly value, leading to crashes later on. If the number of color table entries is larger than 256, just stop processing the BMP since it's most probably corrupt. Task-number: QT-4534 Reviewed-by: Robert Griebl (cherry picked from commit de1cfc13c66fcb35d0a211bb5136ebc25279041a)
* Change paging attributes for Symbian binariesIain2011-02-113-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed UNPAGED workaround from QtCore and QtSql on OS releases where data paging is supported. Depends on new macro being defined in the OS builds (SYMBIAN_DLL_DATA_EXPORTS_SUPPORTED) to allow us to detect this. Data exports are supported in all S^3 builds after early 2009, however, this macro is only added recently (and thus isn't defined in, eg. Symbian Foundation PDKs (v3.0.4), or current releases (v0.9) of the S^3 SDK from Nokia). Thus building Qt against these older S^3 builds will still result in QtCore and QtSql being unpaged. Also, remove PAGED keyword from all Qt-based software. This changes the code paging field in the Symbian (E32Image) header from "paged" to "default". Thus it is left to the configuration of the particular device whether paging is used for the binary or not. All devices that support code paging should have it turned on (the value is stored in the HAL, so can be checked using eg. fshell); data paging may or may not be turned on depending on the device characteristics. Leaving both code and data paging as "default" means that any limitations in the device (eg. around flash wear) can be controlled by that device by disabling the appropriate types of paging. This change also leaves the way open to deprecated PAGED as a keyword in the Symbian build systems, so you can only opt out of paging. This makes more sense, as the default for code paging will be on, the default for data paging will be on if the device can handle it, and binaries should only be opting out of paging if they have some specific real-time requirements that paging inhibits. Task-number: QT-3503 Task-number: QTBUG-13931 Reviewed-by: Shane Kearns (cherry picked from commit 34aca9f03e25e94b4ca730ddd3c88aa95653a0b5)
* rebuild configure in 4.7.2Oswald Buddenhagen2011-02-111-0/+0
|
* Don't ignore source-text when generating qsTrId translations for QMLTor Arne Vestbø2011-02-103-1/+9
| | | | | Reviewed-by: ossi (cherry picked from commit bb84c5ef4f620af659395b66e6ed792a380b9a1f)
* Fix regression in creating mkspecs/defaultMiikka Heikkinen2011-02-103-29/+66
| | | | | | | | | Copy all files from original mkspec to default one and modify *.conf, *.prf, and *.h to include their original counterparts. Task-number: QTBUG-17258 Reviewed-by: Oswald Buddenhagen (cherry picked from commit b52bf57e46520fb65d3d4c43bdb9c3d972690cb8)
* PathView regression: dragging the path didn't update currentIndexMartin Jones2011-02-103-1/+53
| | | | | | | | | | | Some refectoring while fixing QTBUG-13687 resulted in the private setOffset() method being called rather than the public. The public version was responsible for updating currentIndex. Change-Id: Iac9c7a19d6fa64550b9498e77b8983512e199370 Task-number: QTBUG-17319 Reviewed-by: Michael Brasser (cherry picked from commit eb1db74fb59ecb40d541644ce31ce7ec7b2620d2)
* Remove dependencies to pre-Symbian3 platforms from Symbian3 packagesMiikka Heikkinen2011-02-102-13/+9
| | | | | | | | | | | Qt applications built against Symbian3 SDK will not run on older devices, so remove the platform dependency to those devices so that the user will get a proper warning if he tries to install incompatible software to an older device. Task-number: QTBUG-17187 Reviewed-by: Janne Koskinen (cherry picked from commit 822151edc065dc89ed331e91e02fb8014ef3ecee)
* Doc: Adding documentation on configure options for Qt configureMorten Engvoldsen2011-02-101-0/+287
| | | | (cherry picked from commit 776a00b3e8a29552a5db65fb539c0802654bfdff)
* Fix build failureGareth Stockwell2011-02-102-6/+6
| | | | | | Task-number: QTBUG-17288 Reviewed-by: trustme (cherry picked from commit bf47aa67e286f31db5a8b84060f278f7fea217b2)
* Recreate Symbian raster backing store when WA_TranslucentBackground setGareth Stockwell2011-02-103-4/+42
| | | | | | Task-number: QTBUG-17288 Reviewed-by: Jani Hautakangas (cherry picked from commit ca663a7252637f8066a0e7368650e72094220b69)
* Fix few QFileDialog static method issues in Symbian^3Miikka Heikkinen2011-02-102-5/+9
| | | | | | | | | | | | | | | - The selected file path now uses slashes instead of Symbian native backslashes as directory separator. - If default file is specified in dir parameter of getSaveFileName in addition to directory, that will be used as default suggested filename. - Clarified documentation a bit. Task-number: QTBUG-17135 Reviewed-by: Janne Koskinen (cherry picked from commit 5b89e67619d15e817a81c8f39072a210c7cd5f4c)
* Fixed a bug where the softkeys would leave a see-through "hole".axis2011-02-091-0/+13
| | | | | | | | | | | | | | | | | | | In cases where the widget was created from the event loop instead of main(), the middle three softkeys would not get the right visibility and would leave a "hole" in the application where one could see what was beneath it. It could also be clicked, which would bring the app to the background which was really annoying. Fixed by setting the visibility manually upon creation. It should still be possible to alter the visibility of the toolbar manually after the widget creation, if someone requires that. Task: QTBUG-16578 RevBy: Gareth Stockwell AutoTest: N/A, but tested with various combinations of fullscreen, non-fullscreen and softkey visibility modes. No regressions. (cherry picked from commit 231dcfc8b6a90c3a0ab4869e0a9ab45403fd9a8c)
* Fix native child window Symbian decoration handling.Jani Hautakangas2011-02-092-15/+23
| | | | | | | | | Resizing native child window like QVideoWidget caused S60 cba and status pane to appear. Task-number: QTBUG-17040 Reviewed-by: Gareth Stockwell (cherry picked from commit 9ae73fcd011e26c920f91cf0b609f051c14920a8)
* Fixed compilerwarnings regression in public headers.axis2011-02-091-2/+2
| | | | | RevBy: Trust me (cherry picked from commit 50e7bea8bb4ce5a97ab8ff9c7062fc0fa092aec0)
* Fix duplicate definition errorShane Kearns2011-02-091-4/+0
| | | | | | | | As the metatype declaration is now in the qnetworksession header file, it is not needed in the test code (and causes compile error on some platforms) Reviewed-By: Markus Goetz (cherry picked from commit d0d0763f6e0c7709208ad1c573266ee527f6e4ff)
* Fix namespace errorShane Kearns2011-02-091-3/+3
| | | | | Reviewed-by: Olivier Goffart (cherry picked from commit b1d877e32361e8ca5c092a4df4528e5aa868008f)
* Fix random crashes when bearer suddenly goes downShane Kearns2011-02-094-6/+13
| | | | | | | | | | | | | 1. QNetworkSession being deleted from the closed signal caused data abort or E32User-CBase 49 panics. (both observed) 2. Potential E32User-CBase 46 panic in ConnectionProgressNotifier::StartNotifications() Reviewed-by: Aaron Tunney Reviewed-By: Markus Goetz Task-Number: QTBUG-17196 (cherry picked from commit 8fe811e14b6db6a9637a5bf6d276613786291762)
* Don't crash when creating backtrace for built-in JS function (2nd try)Kent Hansen2011-02-096-5/+76
| | | | | | | | | | | | | | | | | | | | | | | | | Commit 147df10403ba280b3f04c1e3d6c4b1cf386abe5d did not quite fix the issue; other places need the same checks. When the JIT is enabled, frames for built-in JS host calls (such as Array.prototype.forEach) are not fully initialized. In particular, the CodeBlock register of such frames is not set (see comment in JITCall.cpp). We need to check if the codeBlock is actually valid before we start using it. This fixes the crash(es) but not the problem of actually getting the arguments for such frames through the API. There's also a related problem when a QtScript function (newFunction()) is called as a callback of a built-in JS host function (QTBUG-17287). These problems will go away once JavaScriptCore is updated to a more recent version (4.8 at the earliest), since the native-vs-script frame handling has been unified. Task-number: QTBUG-17137 Reviewed-by: Olivier Goffart (cherry picked from commit 640436345645b6cf6ff3334399f33c9d1c089492)
* Don't crash when creating backtrace for built-in JS functionKent Hansen2011-02-092-1/+17
| | | | | | | | | | | | When the JIT is enabled, NativeFunctionWrapper (used for built-in functions such as Array.prototype.forEach) inherits JSFunction, so we must check whether the function is actually a JS (script) function before we start accessing script-specific properties. Task-number: QTBUG-17137 Reviewed-by: Olivier Goffart (cherry picked from commit 147df10403ba280b3f04c1e3d6c4b1cf386abe5d)
* Support seperate versions of installed modulesmae2011-02-0912-13/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML supports versioned types in modules. There's a version major and a version minor. This makes it possible to have a module com.organisation.fancycomponents with version 1.0, and later you could ship a new module com.organisation.fancycomponents which contains a more recent version 1.1 or 2.0 AND also the old versions to keep old code running. This is good. The problem is that this is difficult with certain QA procedures. It's hard to verify that a new module is indeed 100% compatible with the previous versions. The change extends the import mechanism by adding optional versioning to the component patch. With the patch, you can add a new module com.organisation.fancycomponents.2.0 which will be loaded when the QML file specifies "import com.organisation.fancycomponents 2.0". The patch works as follows: if you try to load com.organisation.fancycomponents in version 2.0, the engine first looks for com/organisation/fancycomponents.2.0, then for com/organisation/fancycomponents.2 then for com.organisation/fancycomponents. Reviewed-by: Aaron Kennedy Task-number: QTBUG-16455 (cherry picked from commit dd49b322b327fe87d8420abcce0e6cee877a88d7)
* QSqlTableModel/QSqlQueryModel and insertColumns problem.Michael Goddard2011-02-095-14/+223
| | | | | | | | | | | | | | | After inserting a column, fetching data through QSqlTableModel was off by one or more, since it passed the indexInQuery through to QSQM. Also, the headerData would sometimes return a blank string for an inserted column, and sometimes the column number. The autotests have been beefed up a little to check insertRows and insertColumns play nicely. Change-Id: I7399d4c4d94f958884b67ab9b39b5cf2485d8416 Task-number: QTBUG-12626 Reviewed-by: Charles Yin (cherry picked from commit 9c61e9a40e774fe32b16c133a5cdd6b9d9d29d83)
* Fix some removeRows issues with QSqlTableModel.Michael Goddard2011-02-092-24/+158
| | | | | | | | | Added some better unit testing around the problem areas. Change-Id: Ie4749da298aebbae6aec9558ebe8c8f2196c705f Task-number: QTBUG-14916 Reviewed-by: Charles Yin (cherry picked from commit bdd4a9149789f60974603e1f7621d51378f0a108)
* Namespace compilation - OCI typedefs should be outside Qt namespace.Michael Goddard2011-02-081-3/+3
| | | | | | | | | psql, sqlite2 drivers already do this correctly. Change-Id: I1f02401432d5c39fa1572e2f6255941b8a67e591 Task-number: QTBUG-17076 Reviewed-by: Charles Yin (cherry picked from commit 47a134b9a9136dc961dc5dd07e345aeb94b2d401)
* Update some documentation about what happens with select()/setQuery().Michael Goddard2011-02-082-0/+4
| | | | | | | Change-Id: I5f1afada766d40273526f2cd7537ad68d5f9d09a Task-number: QTBUG-12094 Reviewed-by: Charles Yin (cherry picked from commit 741a5114c2c6bf4d89068d861db90c456cce371b)
* Mention the requirement for OCI when building the SQL oracle driver.Michael Goddard2011-02-081-1/+3
| | | | | | | | | As suggested by Jean-Louis Mounier. Change-Id: I2284d00453ddcb981fe3e1b710d4453323fe1e9e Task-number: QTBUG-8875 Reviewed-by: Charles Yin (cherry picked from commit 594e46bdd36d2964c20cbc5a8de32abd5e343f43)
* Try to document that invalid database arguments use the default database.Michael Goddard2011-02-082-2/+4
| | | | | | | | | Some places documented this, some didn't. Change-Id: Id66678dbcd9af6ec9687db745ba6f5506e951d1d Task-number: QTBUG-3240 Reviewed-by: Charles Yin (cherry picked from commit d300e8208928084b62bbde01fb81bd66bc967bc8)
* Make sure that setRecord emits dataChanged() with OnManualSubmit.Michael Goddard2011-02-082-2/+10
| | | | | | | | | | Since the change is immediately visible through data(), this is needed so that QSortFilterProxyModel etc work correctly. Change-Id: Ied7afce2e6a1f516b502d3501f9d214df54e52f2 Task-number: QTBUG-14831 Reviewed-by: Charles Yin (cherry picked from commit 3bed865c35d8eb920ba5a68276fdf1690c834a64)
* Fix qt.sis platform dependencies for Symbian^3 builds.Miikka Heikkinen2011-02-041-5/+7
| | | | | | | | | Symbian^3 build of qt.sis is not compatible with pre-Symbian^3 devices, so remove the platform dependencies to said devices. Task-number: QTBUG-17150 Reviewed-by: Janne Koskinen (cherry picked from commit cf2f23225414893a7b061fadbde4739165f0c554)
* Fix QMutex can deadlock when calling tryLockOlivier Goffart2011-02-032-1/+42
| | | | | | | | | | | | | | in the unix code, if the QMutexPrivate::wait() with a timeout expires in the same moment that the mutex is released, wakeup would be set, but would be then ignored. (reset to false quickly after) If we waken up between the timeout and the re-aquisition of the internal mutex, we consider that the mutex has been locked. Reviewed-by: brad Task-number: QTBUG-16115 (cherry picked from commit 7987d4cfd3ce86c20a55b5661a5221f12246b27e)
* Fix potential networking crash due to null-pointer dereferenceSimon Hausmann2011-02-011-3/+3
| | | | | | | | | | | | | | | An internal bug report suggests that we unconditionally dereference the backend pointer in QNetworkReplyImpl when checking for the synchronity of the originating request. The dereferencing code was introduced in commit ad1e82323225e996720136e8b2d669166b8d8441. Unfortunately the report does not detail where/how the crash happened, but it appears plausible that the backend pointer became null, and the surrounding code that has extra checks suggests this, too. In an attempt of defensive programming this patch introduces the missing check in the reported line 112 as well as in other places where it seems appropriate. Reviewed-by: Peter Hartmann (cherry picked from commit bdf3782b40b0fc2ebfda960be08c90b549cfd970)
* Invalidate QScriptPrograms when engine is destroyedKent Hansen2011-01-314-7/+42
| | | | | | | | | | | | | | | | | | | If the engine is destroyed before the program, the program must be invalidated; otherwise the program destructor will access a stale engine pointer, which can cause a crash (it crashes on Symbian, but "only" gives a Valgrind warning on Linux for our autotests). We need to keep track of all associated programs, just like we already do for values and strings. This fix follows the exact same pattern, but uses a QSet to keep the patch minimal. No new tests, but the evaluateProgram() test runs successfully on Symbian now, and there are no more Valgrind warnings. Task-number: QTBUG-16987 Reviewed-by: Olivier Goffart (cherry picked from commit b127b1036ec75c625920a6c029b64a95e3702bf9)
* No longer replace dash and dot in TARGET with underscore in SymbianMiikka Heikkinen2011-01-315-81/+89
| | | | | | | | | | | | | | There is no fundamental reason to not have dash or dot in binary names in Symbian, so do not replace them with underscore. One thing that doesn't work with a dot in the filename is launching an application via resources, so automatic resource generation is suppressed for applications that have a dot in filename portion of the TARGET value. Task-number: QTBUG-16888 Reviewed-by: axis (cherry picked from commit 4ec245a3e75470186557d00b2383af3872a720b0)
* Fix alignment issue causing crash in QtScript/JavaScriptCoreKent Hansen2011-01-314-84/+76
| | | | | | | | | | | | | | | | | When creating a substring, JSC::UStringImpl required that the base string pointer was 8-byte aligned. However, on platforms where FastMalloc isn't enabled (such as Symbian), it's possible that the system malloc() returns a pointer that is only 4-byte aligned. (On Symbian, this can happen if the argument to malloc() itself isn't a multiple of 8.) Cherry-picked http://trac.webkit.org/changeset/54743 from WebKit trunk, which fixes this issue. (The commit happened shortly after we rebased QtScript/JSC for 4.7, so it applies cleanly to our copy.) Task-number: QTBUG-16828 Reviewed-by: Simon Hausmann (cherry picked from commit ead20f4c1edc2e1c5c39f47bf7c9e56600d6362b)
* Orientation control implementation for Symbianmread2011-01-313-3/+52
| | | | | | | | | | | | | | | | | | | | This used the orientation control QWidget attributes API from maemo5, and provides a simple implementation for Symbian. The essense of the implementation is that the latest setting of one of these QWidget orientation attributes will set the orientation for the whole app. Testing the attributes will return only the last attribute set, it will not return the app orientation state. A new task, QTBUG-16972, has been created to provide a more comprehensive implementation in the future. This may provide a more effective emulation of the maemo5 behaviour, or may incorporate further reaching concepts for QML rotations. Task-number: QTBUG-11785 Reviewed-by: Shane Kearns (cherry picked from commit e0489b905d6a31c7a904ca2b62a1e60cd12dba4f)
* Application background is incorrect if app locked to landscape.Sami Merila2011-01-281-4/+4
| | | | | | | | | | | | | | | | If application orientation has been locked to landscape and application is started out while device orientation is portrait, QS60Style draws the QPalette::background like device would be in landscape. Style is incorrectly following device orientation, when it should follow application orientation. As a fix, style follows now application orientation. As a bonus, unnecessary fullscreen QPixmap creation is avoided when rotating the device. Task-number: QTBUG-16816 Reviewed-by: Jani Hautakangas (cherry picked from commit 54313b3ba81c276cf06c40c2420b1ff1f30e64c3)
* add autotest for digest authenticationPeter Hartmann2011-01-261-10/+20
| | | | | | Reviewed-by: Markus Goetz Task-number: QTBUG-15070 (cherry picked from commit c6a6448272168f0105c973bef5e531114533fc90)
* Temporary fix for ambiguous cast from four letter char constantEckhart Koppen2011-01-261-2/+2
| | | | (cherry picked from commit cb38007cd3b253fb2e3a8587ae9e64080e707a31)
* Fix QMAKE_POST_LINK in Symbian for targets with special characters.Miikka Heikkinen2011-01-261-1/+1
| | | | | | | | | | Proper fixed targets was not used to generate the dependency for QMAKE_POST_LINK in symbian-sbsv2, causing post linking to happen before actual linking. Task-number: QTBUG-16881 Reviewed-by: axis (cherry picked from commit 41297f2d592ef21327b5c7523c52c1ecd3c727f4)
* Improved QMAKE_POST_LINK support in symbian-sbsv2Miikka Heikkinen2011-01-261-22/+34
| | | | | | | | | | | | | QMAKE_POST_LINK value handling now uses the same automatic replacements as QMAKE_EXTRA_COMPILERS and QMAKE_EXTRA_TARGETS handling. In practice this means that it is now possible to use $$QMAKE_COPY and friends in QMAKE_POST_LINK value also with symbian-sbsv2 mkspec, and that any backslashes in the value are assumed to be path separators and will be converted to forward slashes. Task-number: QTBUG-16753 Reviewed-by: Janne Koskinen (cherry picked from commit 9fec1802952457178a9b31c55b4c6e3ea60fcb80)
generated by cgit v0.12 at 2024-08-24 08:27:21 (GMT)