summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* TGA imageformat: fix broken canRead plugin functionAlexander Anokhin2012-03-201-3/+5
| | | | | | | | | | Plugin is now moving QIODevice pos to 0 before exiting from canRead function, so it doesn't break other existing imageformat plugins functionality. Task-number: QTBUG-24201 Change-Id: Ib58b0458215cf5ad705dffa0aaf6a7463d1f089e Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Fix bug in qsslsocket peek()Kalle Viironen2012-03-193-0/+165
| | | | | | | | | Calling peek() for qsslsocket caused socket data to be copied into qiodevices buffer and therefore make it unaccessible in qsslsocket. Task-number: QTBUG-18498 Change-Id: Ie27a90a468be8158bd8afcd259dbb34483623c36 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Cherry picking qt5 bugfix 437da962c2b486b1a1722aac003bfa00b93ac204 to qt4.Arnt Witteveen2012-03-191-8/+10
| | | | | | | | | | | | | | | | | | | | | Original description for bugfix: Fix bug showing folder icons for files Fix an issue where the cache was updated with the folder icon, even though this is never used from the cache. This caused files to sometimes be shown with a folder icon: If a folder has an extension (e.g. a folder named 'folder.ext'), this means the folder icon will be written to the cache for the 'ext' extension, and from that point on all .ext files will be shown with the folder icon. The fix is to not save an icon in the cache for those cases where it will not be used from the cache anyway, by using the same condition for updating the cache as for reading it (which is in line 8 of the same function). Change-Id: I349526ff017b1a2409e3dcc494b86bb541740790 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fixed MSVC2011 buildEugene Shcherbina2012-03-198-22/+20
| | | | | | | | | | | | | | | | | It consists of 2 fixes: 1. JavaScriptCore fix is relevant to changed ctor of the std::pair in C++11. Due to that change some code has been broken. Fix makes using std::pair compliant to both standards 2. Clucene is broken in MVS2011 due to changed stdext::hash_map which is used as the ancestor in inner CLucene classes. It ended up with names collision and double inheritance from the one base class. Fix reflects that change. Change-Id: I77a1fe4b137480b51c24267b7aacb5b688dbddb3 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Kervala <kervala@gmail.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Fix QDeclarativeItem::hasActiveFocus().Andreas Aardal Hanssen2012-03-192-2/+33
| | | | | | | | | | | | | | | | | | This function returns true if the item (or, in case it's a focus scope, one of its children,) has focus (i.e., will receive key events now), or will receive focus once the scene is activated. It also returns true if the item has not yet been added to a scene, but has subFocus, implicating that someone has called setFocus() on it prior to it being added to the scene; the latter case seen most commonly in unit tests. Cherry-picked from qt/qtquick1: bb364c14157df635cf166b293f8cab6c22534aa1 Task number: QTBUG-24681 Change-Id: I2f2d9dd81820e94202a44393a38972c868a774b7 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update the links in the titlebar of Online HTML template.Casper van Donderen2012-03-173-6/+6
| | | | | | | | The links were still pointing to old URLs, this change changes the links to point to qt-project.org Change-Id: Ie0b7b5aef693c54174e5400d6a16bdbfb540c763 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Bump Qt version to 4.8.1 for Symbian specific files alsoJuha Kukkonen2012-03-164-3/+3
| | | | | | | | | | | | | This continues work done in commit "Bump Qt version to 4.8.1" 8ced172dd250277f38cc3d2753692cda0fa183da by updating version number to Symbian specific files also. Updated Qt version to 4.8.1 in pkg files and ROM stub file. Task-number: ou1cimx1#987442 Change-Id: Ia71dff65956453a0eceb4b8ebba187289f20eebf Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Removing Symbian fast allocator implementationMurray Read2012-03-1612-6467/+3
| | | | | | | | | | | | | | An implementation of the Symbian fast allocator was added to Qt before it was available in all Symbian devices, to allow Qt the benefit of it in all installations. Now it is available in all Symbian devices and there is no need to keep a copy in Qt. So it is being removed to simplify the code. Task-number: ou1cimx1#946699 Change-Id: I937faca61beb4ef66a858766ebfa3deff564c786 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Crash in Symbian text codec creation without CleanupStackMurray Read2012-03-151-1/+5
| | | | | | | | | | | | | | The Symbian text codec is creating a CCnvCharacterSetConverter with its NewL() function. This requires the CleanupStack, otherwise you get a E32USER-CBase 69 panic. But sometimes apps have been using text streams and other objects in static data construction or destruction which use the text codec where there is no CleanupStack. This change detects is a CleanupStack is present and temporarily creates one if not. Change-Id: Ia68fa60b4f0e3d675ee302208a625c6e9493a6f1 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Make sure QGlobalNetworkProxy is created for QNetworkProxy.Xizhi Zhu2012-03-151-0/+8
| | | | | | | | | | | Otherwise, you don't have any socket engine handler created when directly setting a proxy to a socket. Cherry-picked from Qt5 / QtBase commit: 92659bacda53da782c84dff44d3caa2590dbc7cc Change-Id: Id87a13cf496553e85ca1f92f0cb5093752f3f5f5 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix compiling qvfb on Linux/X11Pasi Petäjäjärvi2012-03-151-2/+0
| | | | | | | | | | | | | Qvfb fails to compile on linux. Fixed by removing duplicate source and header file inclusion from qvfb.pro file when embedded flag is not set in CONFIG. Task-number: QTBUG-19804 Change-Id: I09278c8042204f913ca2c2bbdee4d4163fae213d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Handle -sysroot option in configure scriptGareth Stockwell2012-03-151-1/+1
| | | | | | | | | Although the code for processing a sysroot was already present, the -sysroot command-line option was ignored. Change-Id: Idde473d4b5f9cf3d56b508c71614d4cbc0248492 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixed compiler warnings about unused q and d pointers.Janne Anttila2012-03-152-2/+1
| | | | | | | | | | The q and d pointers were not used in these functions at all, or they were used only inside some #ifdef quard such as QT_NO_ACCESSIBILITY. Moved the Q_D and Q_Q macros inside the appropriate scope. Task-number: QTBUG-22512 Change-Id: I1624a1d800c7ce21cde4af1678d93e6f615edd45 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* WEC7 build fix - use ptrdiff_t from std namespace.Janne Anttila2012-03-141-1/+1
| | | | | | | | | | | WEC7 does not have ptrdiff_t outside std namespace, switched to use ptrdiff_t from std namespace correspondingly as OwnArrayPtr.h does in operator[]. Task-number: QTBUG-22502 Change-Id: I5c2ffd271cccd12c1fcdca3975ace3e8224e00bf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix generating the qdoc3 manual in 4.8Casper van Donderen2012-03-142-3/+4
| | | | | | | | There were some qdoc errors when generating the qdoc manual. This change fixes thoise qdoc errors. Change-Id: I9e12abbc6688f0fefc3534d830d581a80f5b973a Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Update the footer for qdoc output for qt-project.Casper van Donderen2012-03-148-116/+114
| | | | | Change-Id: I6518c03715cd485330a6550bd62d385477a45c7a Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Fixes potential memory leak in qtextcodec.cppNick Ratelle2012-03-141-17/+9
| | | | | | | | cherry-picked from qt5/qtbase 4560ea230f40 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Change-Id: I06fc265fcc34bcc671c44b7041c0c461e588d193 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix q_atomic_decrement for 64-bit SolarisSamuli Piippo2012-03-141-0/+2
| | | | | | | | | | | | | | | | q_atomic_decrement and q_atomic_increment did not set return value correctly. They expected the %eax return value register to be empty, when it was not necessarily so. This could occur when when compiler inlined e.g., ~QByteArray -> QBasicAtomicInt::deref -> q_atomic_decrement chain to application code. Data would not to be freed and leak memory. Fixed so that %eax is now zero'd before setting return value. Task-number: QTBUG-24470 Change-Id: I83495e3ddb938713863a7b00714215c331b9562b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Harfbuzz-thai - fix buffer overflow when setting item attributesJohn Tapsell2012-03-142-2/+36
| | | | | Change-Id: I19eeb4ec25a7c6cb3f584e6290169f9f327b8713 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Fix documentation errorShane Kearns2012-03-131-1/+0
| | | | | | | | The function wasn't introduced in 4.8, we just documented its behaviour properly in that release. Change-Id: I0560be978612eaed4e632ea191c4b2ba19b4e7a8 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Optimise QFile::seek that doesn't move the file pointerShane Kearns2012-03-133-0/+162
| | | | | | | | | If the seek position matches the current file position, then avoid doing an implicit flush that could be expensive. Change-Id: I019858ffb36fe832b9aee8da0a7803cafc8f7f75 Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Harfbuzz GPOS hinting- do not consider a subtable to be invalid if it is ↵John Tapsell2012-03-121-0/+3
| | | | | | | | | | | | just empty Considering a subtable to be invalid when it was empty meant that it returned an error causing all further hinting to be aborted. This means that we get no hinting in certain cases with certain fonts. Change-Id: I840c016dc85935b4f2c4373c66a79b4bd8b3a30d Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Removed invalid assert in BMP loader code.Kim Motoyoshi Kalland2012-03-121-2/+0
| | | | | | | Task-number: QTBUG-24505 Change-Id: Icec4d2c06175e29c5995399d0584c1ca76dc39d2 Reviewed-by: aavit <qt_aavit@ovi.com>
* Improve type detection for query resultsAndy Shaw2012-03-122-4/+147
| | | | | | | | | | | | | | | When an aggregate function is used for a column in a SQL resultset then it should ensure that the right data type is reported for that column. This also concerns expressions when the returned column does not map directly to a table column. Test included for this. Task-number: QTBUG-22038 Change-Id: I681297accc979081d14b44d190ab9d5f83aac215 Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com> (cherry picked from commit 678ab52ccba0b6a6903e9aee404dbe84fb74c91d)
* Hang on to the correct screen index in QWidgetNick Ratelle2012-03-121-0/+1
| | | | | | | | | | | | Hang onto the screen index that this widget should be placed on in case the platform cannot move the window onto the screen yet, when window is not yet created and the plugin cannot access the topData to update the screenIndex. When this variable is later referenced after the window is created, it defaults to screenIndex 0, so the window is never moved correctly. Change-Id: Ica78fd90aa3dacc29f81b2f6bd6c8b45d2fb2961 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Support changing locales at runtime in QPA plugins.Nick Ratelle2012-03-126-4/+64
| | | | | Change-Id: Id65798b81db2fa9fb5b1d929e4a94103995c6707 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fixes mismatching delete operatorRafael Roquetto2012-03-111-1/+1
| | | | | | | | cherry-picked from qt5/qtbase 657f634c0e8a1bf4f544b Change-Id: I35cbdd6fa947a98a6afa70bdc72631c4213c288a Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fixed wrong iconv_open call under QNXRafael Roquetto2012-03-111-1/+1
| | | | | | | | | | | The wrong macro logic was causing iconv_open to never be called under QNX. cherry-picked from qt5/qtbase 8a15c41d36b1905a2 Change-Id: I0a1e3fb01d726daca637f8f51abfc924cd493311 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* mkspecs: don't forget to add 'qnx' when building for x86Marc Mutz2012-03-101-1/+1
| | | | | | | | | | | | | | | | When building for the QNX/x86 target, we forgot to add the 'qnx' tag to CONFIG. This causes failures when third-party libraries using qmake try to scope on qnx. This change mirrors what's in the ARM target. Change-Id: I28e1df4d8636385c5555a2bb4087d26a8a9b4220 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Rework QNetworkProxyFactory::systemProxyForQuery autotestShane Kearns2012-03-091-21/+120
| | | | | | | | | | | | | | | | | | Rather than requiring specific hardcoded proxies in the system, it now checks the proxies returned by the system have the required capabilities for the request. Note the test will pass if no proxy is configured (as QNetworkProxy::NoProxy has all required capabilities) The test prints the returned proxy lists and elapsed time diagnostic for manual comparison and debugging. Change-Id: I621ef4d1d7264a98c3e8bd485c30bc1166fcbdf0 Task-number: QTBUG-19454 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 3c529933612ff022d139975d661e37c77b1b2e99) Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Windows - handle both auto detect proxy settings togetherShane Kearns2012-03-091-7/+31
| | | | | | | | | | | | | | | | | If both "automatically detect settings" and "use automatic configuration script" are selected in internet options, then respect that. Because of performance issues, these are tried separately, and disabled if they fail. Task-number: QTBUG-13957 Task-number: QTBUG-10238 Change-Id: Ibc824d3039afeaf12c5ea82ed95287e5cf4e1776 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> (cherry picked from commit 4cc8209998c386a4372f10496f0c97f3d86f92bb)
* Fix a number of bugs with windows system proxiesShane Kearns2012-03-091-6/+75
| | | | | | | | | | | | | | | | | TcpServer requests always returned no proxy, even if socks was available Tag handling was broken for empty tag (if system proxies were tagged) Tag handling was broken for unknown tags - now handled the same as if no tag was given at all. When there are different proxies for http and https, windows returns the http proxy first. However we should prefer to use the https proxy for general sockets, as it's more likely to support the CONNECT method. Change-Id: I55dcadf2e142367e857f94e55fdbb0c4ddb513a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> (cherry picked from commit ea92d02b6ba873c10153dc6ab7472edf07f99f03)
* Windows - fall back on static proxy config if autoproxy failsShane Kearns2012-03-091-23/+17
| | | | | | | | | | | | | If both manual proxy settings are configured and the autodetect setting is enabled, fall back on the manual configuration when auto detection fails. Task-number: QTBUG-10428 Change-Id: If008c7c967eec6256ce3c614fff0ec258190d451 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> (cherry picked from commit 276f64d21d7b877044fddd646b855829950099b0)
* Windows - handle proxy autoconfiguration resulting in no proxyShane Kearns2012-03-091-0/+2
| | | | | | | | | | | | The PAC file may result in direct connection, in which case WinHttp returns null strings for the proxies and the connection type marked as direct. In this case, return the default list (no proxy) Change-Id: I601033f56a841bb92ea80a28174bb993b024ad79 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 25c05ce3bb8b53ed937363492b8222ee3b83d749) Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Windows - fix proxy types for manually specified proxiesShane Kearns2012-03-091-8/+15
| | | | | | | | | | | | | | | | | When the windows internet options are used to specify a different proxy for each protocol, assume the proxy server type matches that protocol too. e.g. "socks=qt-test-server:1080" is both tagged for socks, and assumed to be a socks server. "ftp=qt-test-server:2121" is assumed to be an ftp proxy "ftp=http://qt-test-server:3128" is overridden to be a http proxy used for ftp. Task-number: QTBUG-10502 Change-Id: I70615c89d6ede53f0e7d62e6d0754b90d042aa2e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit a7489b2ba3f2f3ea28d6fff0c835c12b0666af45) Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Windows - fix QWindowsSystemProxy global static raceShane Kearns2012-03-091-1/+1
| | | | | | | | | | Loser of the race would try to delete an uninitialised pointer Task-number: QTBUG-15765 Change-Id: Ie184ee2306e102aa8fbad752ef09b95c3ede00c2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 2cf8e487a5c546382daaa954c23d3926668b0a85) Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* BlackBerry Plugin: support 8 mouse buttons, instead of just 3.Kevin Krammer2012-03-091-3/+10
| | | | | | | | | | | | | | | | The mask of possible mouse buttons in QNX provides tracking for the up/down State of up to 8 mouse buttons. This update adds support or 2 of buttons which we previously ignored in Qt on this Platform. Backport of a0933f4d7485d22f38b80c67f79b8d3f721b19a2 in Qt5/qtbase reduced to the 5 buttons Qt4 has support for Related to task-number: QTBUG-24682 Change-Id: I4253b96b2d7ed3f806749432b2eb7f884fd0f580 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Use QSocketNotifier instead of sleeping in an endless loopKevin Krammer2012-03-092-35/+51
| | | | | | | | | Event driven listening for navigator events, basically a backport of the respective QPA plugin code in Qt5/qtbase Change-Id: I120a755af614d35a9e5a0e755c521bbf8bf0d13d Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fixes codecs.pri to reflect new QNX mkspec nameRafael Roquetto2012-03-091-1/+1
| | | | | | Change-Id: I7d22d48b189e8abfd6164a51b1e025360ef3da5a Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix platforms.pro to match new qnx mkspec nameRafael Roquetto2012-03-091-1/+1
| | | | | | | | | cherry-picked from Qt5/qtbase 4ba895a86 Change-Id: Ic15d00df4b83d4510ea9622d74e988515fbfbae5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Renaming QNX mkspecsv4.8.1Rafael Roquetto2012-03-087-3/+3
| | | | | | | | | | Renamed from blackberry-* to qnx-* in order to match he <platform>-<compiler> pattern. cherry-picked from qt5/qtbase 6e58dd34ac96e2cf0807a227caaef74d15e272e7 Change-Id: I793af8d1a2053ccf37aaefd5849267797d0ee021 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Enable storage of global Qt settings in app-local settings file on MacPasi Matilainen2012-03-082-2/+84
| | | | | | | | | | | | | The Mac App Store has limitations on where applications can write their settings, and com.trolltech.plist is not allowed. Changed the settings code to store all settings in the app-local file when the application runs in sandbox, or when the application's Info.plist contains a key "ForAppStore" with value "yes". The application's bundle identifier is also used for naming the settings file in these cases. Task-number: QTBUG-16549 Change-Id: Idd2241fbd7eb346da987226f05460642b0d6e5a3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Don't allow app panic on QProcess destruction, kill or terminateMurray Read2012-03-081-4/+12
| | | | | | | | | | | | | | | | QProcess destruction will call kill() if the process is still running. PRocess::Kill() and Terminate() both require the PowerMgmt capability to operate on Symbian, otherwise a KERN-EXEC 46 panic happens. An app should be able to use QProcess safely if it doesn't have PowerMgmt capability, it should just be prevented from trying to kill the created process. Now a debug message is issued on ~QProcess(), kill() or terminate() if the capability is not present, rather than actually trying to kill/terminate the process. Task-number: ou1cimx1#985227 Change-Id: I3242ca2c39528c70c2c79e39f6a6384dd72f6ae6 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Windows - fix getsockopt calls for narrower than int optionsShane Kearns2012-03-072-2/+35
| | | | | | | | | | | | | | | | | | | Windows unhelpfully writes to only one byte of the output buffer when getsockopt is called for a boolean option. Therefore we have to zero initialise the int rather than initialising to -1 as was done before. This in general only works for little endian architecture, because the word would look like 0x01000000 on big endian. So I have added some compile time asserts in the assumption that windows is always little endian. This is ok for comparisons with 0/false, but not comparisons with true or nonzero values. Task-number: QTBUG-23488 Change-Id: I3c586d1ada76465fc045a82661f289920c657a4c Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> (cherry picked from commit 46e4a9d5231e2d9e35424259858713ca539b8e30)
* Fix for QTBUG-21466: References to deprecated mouse driversPasi Petäjäjärvi2012-03-072-21/+8
| | | | | | | | | | | | | References to deprecated and removed mouse and keyboard drivers in documentation. Removed references. Task-number: QTBUG-21466 Change-Id: I0ea9db679023a5e9a60663d64a9797df4310e662 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* escape *_script_file usages in MingwMakefileGenerator::writeObjectsPartMax Desyatov2012-03-071-4/+4
| | | | | | | (cherry picked from qtbase commit 9d5e721e96f19812a766a4c7d3f8b41f455f507c) Task-number: QTBUG-24595 Change-Id: I761e4ffb0e473c35784cf1ba5289a79dae5a012b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make qget manual test compile without ssl supportShane Kearns2012-03-072-0/+6
| | | | | | Change-Id: I35f92328b79df1cfcae52fa6ff8290f260183aea Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit 3fe79f23a97323521eb0182f8b46b0d0fc9ce44b)
* Fix error handling in QHostInfo windows backendShane Kearns2012-03-071-10/+18
| | | | | | | | | | | If the DNS server returns a non authoritative host not found response, then windows returns WSATRY_AGAIN error code. This is now reported as HostNotFound and not UnknownError Change-Id: I212985acd4e85ff4b2bdb6c57ec403405a7695fb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit 844b096d674c3b803923357502435ef89ce0c738)
* Move qws/qnx-* mkspec files from unsupportedSamuli Piippo2012-03-0711-51/+51
| | | | | | | | As QNX in now a supported platform, move mkspec files away from unsupported folder. Change-Id: I31f806b5d5217cfb0420dc74dc7a5eea33c1598d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Prevent stack corruption when using OpenGL Core Profile on WindowsSean Harmer2012-03-071-1/+1
| | | | | | | | | | | This is the backport of commit 1c5b2de9b75a5e74fd7d511fea71edc382d539b6 to qtbase. Change-Id: I8680c20c8b804fb4e77062f52b8f4188b49263a8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 04:56:03 +0000