summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Strip prepending <hostname>: string from currentPath() for VxSimPasi Petäjäjärvi2013-02-131-1/+9
| | | | | | | | | | | VxWorks simulator (VxSim) maps SDK rootdir usable as normal directory. Mapped directory name is either host: or <hostname>: and can be used without prepending prefix containing colon. Strip prepending string and colon to get valid native path to host SDK rootdir running VxSim. Change-Id: I15f4bf4d9eb2cea87268bad9b1a95973962cb2c8 (cherry picked from qtbase/cd5a4279f38ac6cca8ff8da4d75c2577d9b0bbcd) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Cocoa: Do not use NSOpenGLPFAAccelerated flag for GL contextJonathan Liu2013-02-121-3/+0
| | | | | | | | | | | | The NSOpenGLPFAAccelerated flag indicates that only hardware-accelerated renderers are considered. It is used when direct rendering is enabled in QGLFormat. As direct rendering is enabled by default in QGLFormat, this prevents software rendering fallback if no hardware acceleration is available. Task-number: QTBUG-29641 Change-Id: I438bd5ce4e803962fd68c7e9d79f40840760e2d5 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* QLocale: Update the Japanese and Czech localeEl Mehdi Fekari2013-02-121-5/+5
| | | | | | | | | | | - Japanese locale: Year should be displayed in 4 digits instead of 2 in short format - Czech locale: monthName should be displayed in lower case N.B: The changes above are already fixed on Qt 5 that uses an updated version (v22.1) of CLDR Change-Id: I40535ea60b1f6abdd3717a28adbcddaa63b39997 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* BB10 systemProxyForQuery: query system proxy also for non-URL requestsPeter Hartmann2013-02-122-4/+28
| | | | | | | | | | | | | | | ... like e.g. in QAbstractSocket::connectToHost(). We can set the scheme on the query URL based on well-known ports; even if the port is not well-known, we can just query the URL anyhow and let the netstatus API resolve the right proxy for us. In addition, return early for local schemes like "file" and "qrc". Task-number: QTBUG-29425 (cherry picked from commit 28d526db74c50977215133159e565e7c15fd18e3) Change-Id: I40a4865aa7765aad9145e956c0069e78c54670e7 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* QProcessEnvironment: Permit magic cmd variablesDaniel Teske2013-02-081-1/+2
| | | | | | | | | | The cmd shell inserts magic variables starting with a = into the environment. Task-number: QTCREATORBUG-8716 Change-Id: I2f140032aea4fb1d77633c6baf90d7b536e2812a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/e7a242b27b961c64613542c75c69954d1c7bd315)
* QNX: Don't let eglMakeCurrent() fail when using two contexts.Sergio Martins2013-02-082-29/+8
| | | | | | | | | | | | | | | | When calling eglMakeCurrent(), egl config and window format must match, otherwise it fails with EGL_BAD_MATCH. egl config and window format were static variables, this could lead to a context setting the window format in the ctor but, at the time of creating a surface, another context had changed the window format. elg config and window format are now member variables. This is the same approach taken in Qt5. Change-Id: I4fa0bc59273b856c1eaf43fafd15b551363f2fe2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixed crash in image reader when reading certain BMP files.Samuel Rødal2013-02-081-4/+4
| | | | | | | | | | | | | | | | If the high bit in a mask is set, for instance if the mask is 0xff000000, and we shift it to the right by 24 positions, since the mask was not declared as unsigned we ended up with a mask value of 0xffffffff. We then add 1 to this value and divide by the result, causing a division by zero crash. The masks need to be declared unsigned to prevent sign bit extension when shifting right. Task-number: QTBUG-29194 Change-Id: I1003d546a70d540b5c135b6b75dee9b4962a7210 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from qtbase, af84313c622af880e95d461ea8b7dbca58d2dffa)
* Fix TIFFTAG_RESOLUTIONUNIT handling.Leonard Lee2013-02-061-4/+5
| | | | | | | | | | | If there is no TIFFTAG_RESOLUTIONUNIT record, the value of resUnit should be RESUNIT_INCH and not RESUNIT_NONE. Task-number: QTBUG-22322 Change-Id: Iedc3120d331308cea9f743de2e4d61cb52cb14c3 (Cherry picked from commit qtimageformats/44ea4280b20179eea5520fd1ef5ac814c528c45e.) Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Actually use EGLint - EGLconst does not exist.Milian Wolff2013-02-061-1/+1
| | | | | | | | | | | This fixes a build error introduced by commit with change id: I3ace17447aa9a83655b6fa6b4246a6a16592936c and git hash 33bbdb88216e72bcc3149f52e7a961609f5406a0. Change-Id: I548866c1e0958811f66bc4b5d7f048822e59274c Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@digia.com>
* remove misleading statement from ~QSqlDatabase()Mark Brand2013-02-051-3/+0
| | | | | | | | | | | | | | | | | The presence of the sentence "If this is the last QSqlDatabase object that uses a certain database connection, the database connection is automatically closed" is misleading, whether or not the statement is true. It is about an internal detail of QSqlDatabase's implementation. As such it is not appropriate for user documentation. The user should be focused on how to use addDatabase(), cloneDatabase() and removeDatabase() correctly. Task-number: QTBUG-29481 Change-Id: I0c39584be260e13340834c34098368fcce4a7419 Reviewed-by: Florian Paul Schmidt <mista.tapas@gmx.net> Reviewed-by: Sune Vuorela <sune@vuorela.dk> Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from qtbase/0b8065b5819efd8ba3741ea5703d5b95954b16c2)
* BlackBerry bearer plugin: check whether device is online several timesPeter Hartmann2013-02-032-0/+25
| | | | | | | | | | | | | | | | This is supposed to workaround a race condition in the underlying netstatus API: Sometimes we get an event that the Wifi interface changed, but it is not up, e.g. no gateway (yet). In that case we need to check back (currently: 300 ms) whether the interface has come up or not. This commit can be reverted again once the race condition in the netstatus API has been resolved. Task-number: QTBUG-29421 (cherry picked from commit 3dc47622a469ded1c99397fdedc2053b73d57189) Change-Id: I252c39411340fe3f6af8440a8f21482ca9b6e62d Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* BlackBerry: The MeasurementSystem port was for BlackBerry OS not QNXSamuli Piippo2013-02-012-11/+11
| | | | | | | | | | (cherry picked from qtbase/18260ed21240fe4c2d1892def80353448096e54c) Change-Id: I4de18389fc3ad7743d80b3f72b44083708d72e77 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Kalle Viironen <kalle.viironen@digia.com> Reviewed-by: Mehdi Fekari <mfekari@rim.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Ensure QDeclarativeTextLayout uses the correct penChris Adams2013-02-011-1/+12
| | | | | | | | | | Backport of commit: 3a0cec6525be6bf843c597c19693785e2c893ee9 with change id: I6bcc43fbcf7fb2c680959d27b1422364ebb473ae from qt5/qtquick1 to qt4. Task-number: QTBUG-28135 Change-Id: I0d84dcb87b03d7b64797c4d633ae0ae8e6bfcb1e Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Only allow one dir to be selected for getExistingDirectory() on WinAndy Shaw2013-01-301-1/+1
| | | | | | | Task-number: QTBUG-21372 Change-Id: Ifcb625a0c974c5ee51fb42736bd3b309bd017296 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Make compile with QT_NO_FILESYSTEMITERATORThomas Zander2013-01-305-0/+10
| | | | | | | Change-Id: Ie79dda5a48288a1d9cd4b7e0a7934ee9db48c953 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Thomas Zander <zander@kde.org> Reviewed-by: João Abecasis <joao@abecasis.name>
* Make sure the correct name filter is selected in the Mac file dialogAndy Shaw2013-01-301-5/+9
| | | | | | | | | | | | | | Since we have to add the filters one by one to the Mac file dialog it was finding the one that would match the filter by comparing the start of the filter string. However it would continue to check the start of other filters even if it had already found the one it should be using. Now it uses either an exact match or the first one that it matches the start of. Change-Id: Ie6441acd48e45ec9c712afc12a2ea47755835bb3 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> (cherry picked from commit d6506c129d698c677f2d7418759b147007ca15a2)
* Add a means to specify that the VM_POOL_SIZE can be 1gb and not 2gbAndy Shaw2013-01-301-0/+4
| | | | | | | | | | | | Due to a reported problem where the reserving of 2gb was too big under certain circumstances then in order to provide a means for people who hit this problem a define is added so that the VM_POOL_SIZE is set to be 1gb instead. This is an optional define and the default is for the size to be 2gb which keeps it to current behavior. Change-Id: I73200e1bcfcf7b37c6ba62f8b7bcf217f239dfcb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> (cherry picked from commit f32c98f4876fd6f4d28d710d6ee1d59707b2ac62)
* Observe GL context loss in ShaderEffectItemChris Adams2013-01-302-38/+7
| | | | | | | | | | This is a backport of commit: 01928c91ff0ae76cdb02f50af3c62368e28cafb6 with change id: I8281e77f7285ea0046bdf092ab827cae3b00a6d2 from qt5/qtquick1 to qt4. Task-number: QTBUG-28136 Change-Id: Idbeffce919d85f55df5184f8a8c9a89649687f93 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Make sure QGraphicsItem notifies changes to focusScopeItem.Andreas Aardal Hanssen2013-01-291-5/+7
| | | | | | | | | | | | | | | | | | | A glitch in QGraphicsItem's logic made it update the focusScopeItem pointer, but fail to notify the change to QDeclarativeItem through the d_ptr->focusScopeItemChange() virtual function, hindering QDeclarativeItem from emitting focusChanged() correctly for focus scopes that do not have focus. Two lines were moved, and a comment updated to reflect the reason why the "return" is needed at this point. It's clear that the calls to focusScopeItemChange() are unrelated to the return. Task-number: QTBUG-29260 Change-Id: I12ba9161b16d34c3689401a92c86d2047989f7bd (cherry picked from qtbase/6476d6728eb3cde8e4a5fd0eb607b92977932296) Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* don't prematurely reduce LIBS when adding sql link listsMark Brand2013-01-294-4/+4
| | | | | | | | | | | It's possible that different database libraries share dependencies. We need to keep their link lists intact here so that QtSql's .prl and .pc files will have them in the right order. Particularly important when building the drivers into QtSql and using static linking. Change-Id: Id371b127099f2790fe7cccd0c7059607600f447d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qt5/qtbase commit 9ef48277f959ff759bd9fba36c907ef5ed67f5b1)
* Call endSheet when the QFileDialog was shown as a sheet on MacAndy Shaw2013-01-291-0/+2
| | | | | | | | | | If the sheet is not ended then subseqent calls to show a sheet will not work correctly. Change-Id: Ib8a43a1c96a3dadff196c433e822f7579ad87b8b Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> (cherry picked from commit 7024bc70917b6837e2d1e37b1d52350a28d978c5) Reviewed-by: Laszlo Papp <lpapp@kde.org>
* Use correct variable type EGLint for EGL attributesPasi Petäjäjärvi2013-01-283-4/+4
| | | | | | | | EGL property is type EGLint and is defined in eglplatform.h header as typedef khronos_int32_t EGLint; Change-Id: I3ace17447aa9a83655b6fa6b4246a6a16592936c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* VxWorks process (RTP) mode does not have taskLock/taskUnlock functionsPasi Petäjäjärvi2013-01-281-0/+5
| | | | | | | | | | VxWorks does not support to globally lock and unlock the scheduler from process. In kernel mode (DKM) above functions disable preemption from requested task and such functionality does not exist for process. Change-Id: Id41eab4c1973e4181e82539d08707659e0780f99 (cherry picked from qtbase/49b8e21429c7ab785fb11e8ef84bd7e65c943861) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Add support getting memory page size to RTP mode on VxWorks.Pasi Petäjäjärvi2013-01-282-1/+7
| | | | | | Change-Id: Id71bf7fd8e7371284076247558cba7edb0307e13 (cherry picked from qtbase/00faa09aadfc6c6db9da639ba6b7866c72447e39) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Use Qt defined gettimeofday for VxWorks and no fallback to X11 versionPasi Petäjäjärvi2013-01-282-1/+9
| | | | | | | | | | | | VxWorks don't have gettimeofday function so we always use the one implemented in Qt. VxWorks DIAB compiler is not supported building Qt for VxWorks 6.9.2. Anyone using older VxWorks should also not be affected so use new defines VXWORKS_DKM and VXWORKS_RTP for VxWorks version 6.9.2 onward. Change-Id: I2e9546a101256ea0557b65163b40cd0f28be8519 (cherry picked from qtbase/7e3d5a720752900b1ccbb3d8dcbf12cc02b01b63) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* VxWorks header only available in DKM mode and not in RTP mode.Pasi Petäjäjärvi2013-01-281-1/+1
| | | | | | | | Check if _WRS_KERNEL is defined so we are compiling for DKM mode. Change-Id: I15801b0575d3fe6e543f81a177fd01d015d9085f (cherry picked from qtbase/baad50e97946c4b99998f215aa5c023c17be29ea) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Use taskIdSelf() function instead of taskIdCurrent global variablePasi Petäjäjärvi2013-01-281-2/+2
| | | | | | | | | | | The uniprocessor taskIdCurrent global variable (declared in taskLib.h) does not exist in VxWorks SMP, because of concurrent execution on multiple CPUs. Any uniprocessor code that reads taskIdCurrent should make calls to taskIdSelf() instead. Change-Id: I4e0efef32297f339d6121c7d4bca3820e0fc9294 (cherry picked from qtbase/608cd1ad84484448ac9b0b8b4d88e0e8ff4a9cf1) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Use stub functions getpwuid and getgrgid for VxWorksPasi Petäjäjärvi2013-01-281-2/+2
| | | | | | | | | | VxWorks has no concepts of users and groups, therefore no such functions exists on VxWorks. Use stub functions from qfunctions_vxworks.h for those, so we don't need to make major source code changes. Change-Id: Iaad80ec18441e3d3e9c0f96e92ccc3766b27d976 (cherry picked from qtbase/ae229b91929955e7418da938bace6d0cc6a2cde5) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Do not define QT_NO_DYNAMIC_LIBRARY for VxWorks process (RTP)Pasi Petäjäjärvi2013-01-281-1/+1
| | | | | | | | | Shared libraries cannot be used in kernel mode (DKM), only at process mode (RTP). Change-Id: I8cecc12461aa4417b16577db3bc9cd85a1aa7efa (cherry picked from qtbase/2d44f879a2af258ce5bba75ab3a478e2066f3c10) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Use sched_get_priority_* functions only for SCHED_RR and SCHED_FIFOPasi Petäjäjärvi2013-01-281-2/+14
| | | | | | | | | | In VxWorks set default values for scheduling priority to use SCHED_FIFO_HIGH_PRI and SCHED_FIFO_LOW_PRI defines for other scheduling policies than SCHED_RR or SCHED_FIFO. Change-Id: If78b84cd9ef94d7712206e9442e96cdba727610f (cherry picked from qtbase/eae8faabed151fd32219f2f333fb632c104c73a7) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix comments to use pre C99 standard style insteadPasi Petäjäjärvi2013-01-281-5/+5
| | | | | | | | VxWorks compiler fails to compile *.c file with C99 style comments on it Change-Id: Ib5c5ff14006c17f9392b77363232b8b7cc112d34 (cherry picked from qtbase/2aaffe1800db0d8a170b278ac9a43f2e00ef0e8f) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Undefine overlapping variable names defined in VxWorks headersPasi Petäjäjärvi2013-01-281-0/+38
| | | | | | | | | VxWorks has defined variables with same name as in Qt's headers. Undefine those variables to avoid naming conflict. Change-Id: Ia8ca04a66acece683cd6c7f71df7e5a2800ec98d (cherry picked from qtbase/f7bd8652caab2f53ced739ce90c640924d4962dc) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Use stub function gettimeofday for VxWorksPasi Petäjäjärvi2013-01-281-0/+4
| | | | | | | | | Vxworks does not have gettimeofday function, use function implementation from qfunctions_vxworks.h/cpp instead. Change-Id: Iad0b811049b974c555febe1e47398b7df9ddda34 (cherry picked from qtbase/1309d9a9d68af902821d0ba5f76aa6e994aa6963) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Use QDir::homePath() for tilde expansionPasi Petäjäjärvi2013-01-281-1/+3
| | | | | | | | | | VxWorks does not have concept of users and therefore has no function getpwnam. Use QDir::homePath() which returns actually QDir::rootPath() if there is no HOME env variable set. Change-Id: I0786ace2c05a14380dd725384972a19ccc07d916 (cherry picked from qtbase/2d8a4c2d3f86e3ae40b4a388de57021b98b9778d) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Use time.h related includes from qfunctions_vxworks.h file.Pasi Petäjäjärvi2013-01-281-3/+1
| | | | | | | | | | In VxWorks qfunctions_vxworks.h file includes correct time related headers and it is included already at file qplatformdefs.h for all mkspecs targets. Change-Id: Icf970e28bf6deba9201fa33d7f728cc2251f7e5c (cherry picked from qtbase/2d2da44f6381fdeaa195319c0dc66e3909c2ca7b) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Only send the enter/leave event when it makes sense to do soAndy Shaw2013-01-271-8/+12
| | | | | | | | | When show/hide is called on a widget on Mac then it needs to send an enter/leave event. But it should only do that if the widget under the mouse is actually the one that is being shown/hidden. Change-Id: I53c782f5deee740cbc34e1fcc7b551a108230081 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Fix postgres notification support in the QPSQLDriver.Matt Newell2013-01-271-37/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a critical bug in the qsqlpsql driver where notifications aren't delivered when received. Any blocking libpq function(specifically PQexec) will read all the incoming data from the socket, including any pending notifications. This would cause the socket notifier to never be fired for incoming notifications that are already queued inside libpq. The qsqldriver test case was skipping the postgres notification test because of this bug, now its enabled and passing. In order to fix this bug I made a wrapper function for PQexec in QPSQLDriverPrivate that calls _q_handleNotification via QMetaObject::callMethod QueuedConnection in order to deliver pending notifications when control returns to the event loop. I also added a flag to ensure only one call is made each time the event loop is entered. This backport omits the changes to the NotificationSource version of the "notification" signal that were included in the original commit, since NotificationSource itself has not yet been introduced into Qt4. (Backport of qtbase aea684506945a12312fc05fb3bb4f549da93f7f5) Change-Id: I19f5297094ae7ae46bfb0717e4fca744d69f7b92 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* qkeymapper_win.cpp: Define missing constant for MinGW.Friedemann Kleint2013-01-251-0/+3
| | | | | | | | | | | Fix MinGW compile breakage introduced by 68331c5436506b6f9b4c2a49692a09020e4eef27 . Task-number: QTBUG-8764 Task-number: QTBUG-10032 Change-Id: I26bcefc382010eee7d79b806b3d9f08b6cb2ff8d Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* set pkg-config *_location directly to install dirOswald Buddenhagen2013-01-251-8/+10
| | | | | | | | | | | | | | | | qmake tries to replace all occurrences of the install prefix with a literal ${prefix}. of course this would mess up build paths which happen to live under the prefix (this is untypical, but still), which would break the sed magic in the subsequent install step. as qmake itself has no use for the .pc files, it's ok to target them directly for the install dir. we do the same with the include and lib dirs already. qt5 is already doing the right thing. Task-number: QTBUG-28807 Change-Id: I82c17284d1dbac4a96845db2ddec9680e251e7a5 Reviewed-by: Davide Pesavento <davidepesa@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix TextInput test failures.Andrew den Exter2013-01-231-0/+2
| | | | | | | | | | | | | | | | emitCursorPositionChanged won't emit cursorPositionChanged if the cursor position hasn't changed but that doesn't mean the micro focus hasn't changed, so emit updateMicroFocus changed when cursorPositionChanged isn't. Task-number: QTBUG-21017 Task-number: QTBUG-21011 Task-number: QTBUG-20719 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> (cherry picked from commit 6e0e834e0398192a6da11d1e1bca6b74769fb75d) Change-Id: Ia0d244eea051f2a870a084742c4c22f5a45a87bc Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Don't update the input method if the im hints haven't changed.Andrew den Exter2013-01-221-0/+2
| | | | | | | | | | | | | | | | | Depending on the implementation updating an input method can be expensive and various widgets will at times call setInputMethodHints with unchanged hints. QGraphicsView being a notable offender due to the complexity of the circumstances in which the hints can change. Skipping the update here ensures the input method isn't updated unnecessarily for all widgets. Task-number: QTBUG-19854 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from commit 40e6b1d0b8c1804dfb33032fa70b6604b91f6f90) Change-Id: I36ae35585ee20a4e01ca0d62c71e896dbdb51a3f Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fix glitch on MNG animation Loops when QMovie caching is enabledDavy Durham2013-01-221-0/+8
| | | | | | | | | | | | libmng delivers the last animation frame with a 1ms delay, and delivers an extra blank frame after that with the proper delay time, but this confuses QMovie when QMovie::cacheMode() == QMovie::CacheAll. This was commited as 313d60c107d9659efd5e93ba5a036054f6b1ebba in qt5 Task-Number: QTBUG-28894 Change-Id: I1dd585cd6f0ced8c777bd1f15ac2c9f36ca63f41 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Removed unused include headers <time.h> and <sys/time.h>Pasi Petäjäjärvi2013-01-221-5/+0
| | | | | | | | Nothing is used from the above header files so these dead includes can be removed. Change-Id: I381ea62e5a0bc623bb984c764be55c7a2f2ee317 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* To support QT_NO_IM on Linux/Windows/MacJing Bai2013-01-2120-28/+79
| | | | | | | | | | Fix compilation issue when QT_NO_IM is defined. Also fixed references in tests. But fixing plugins/examples seem not necessary at this point. Task-number: QTBUG-26109 Change-Id: I2067051951616012117efa6716640cbf198fdb2a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* fix illegal reference to a destroyed variableGatis Paeglis2013-01-201-1/+1
| | | | | | | | | | | | | The char array 'dash_o' is an automatic variable. The string "-o" is copied into this array. Later the address of the array dash_o is assigned twice to lpargs[++i]. After leaving the block, the array dash_o is gone and lpargs[...] contains an illegal reference. This was discovered in a release mode when compiled with gcc version 4.7.2 Patch doesn't apply for Qt5 where 'lpr' support has been removed. Change-Id: I4f99badfa380ad3b29893a350f0d699bfb934c68 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix a -Wunused-private-field] warningJan Kundrát2013-01-201-0/+5
| | | | | | | | | | | | | ABI compatibility dictates that these members cannot go. On the other hand, new Clang warns about these being unused. Konstantin Tokarev suggested adding Q_UNUSED to any method; this one looks as good as the other one. Change-Id: Icfb47bff7662d1f31f191a702416983776ce42e3 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jason McDonald <macadder1@gmail.com>
* Update the Indonisian and Catalan locales in CLDR data:Mehdi Fekari2013-01-181-215/+214
| | | | | | | | - Indonisian locale (in.xml): to return correct AM/PM text and correct time Fomat - Catalan locale (ca.xml): to return correct time Format Change-Id: I65bbabdc6311dc3c958605cbc04e7a034243e9db Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QTBUG-15319: fix shortcuts with secondary Xkb layout.Aurelien Lourot2013-01-181-1/+4
| | | | | | | Change-Id: Iadb89137ec017b9dcd4d1588fd582ea46a9d7cc1 Reviewed-by: Aurelien <aurelien.lourot@gmail.com> Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QtDBus: Garbage collect deleted objects now and then.David Faure2013-01-181-0/+17
| | | | | | | | | Fixes performance issues in apps which register and deregister objects very frequently (like nepomukstorage). Change-Id: Id7d6ef508336758c55fa894868241f143b3e30e0 Backport-Of: ac9ab9703ff299c94dca7585d5a12ecde28931bb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Change all shmget calls to user-only memoryThiago Macieira2013-01-186-9/+9
| | | | | | | | | Drop the read and write permissions for group and other users in the system. Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 (cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) Reviewed-by: Richard J. Moore <rich@kde.org>
generated by cgit v0.12 at 2025-04-22 04:25:38 (GMT)