summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Doc: add missing LayoutMirroring to QML ElementsTasuku Suzuki2013-01-271-0/+1
| | | | | | Change-Id: Id088effb7b38353c05b4f0baba89ddaa637aa016 Reviewed-by: Casper van Donderen <casper.vandonderen@gmail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix postgres notification support in the QPSQLDriver.Matt Newell2013-01-272-41/+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>
* Update Traditional Chinese translationYou-Ruei Tzeng2013-01-251-102/+146
| | | | | | Change-Id: I7119ddfd8fb135adc7561451d5b5a25f3f4f7d4c Reviewed-by: Franklin Weng <franklin@goodhorse.idv.tw> Reviewed-by: Liang Qi <liang.qi@digia.com>
* Fix checking QT_NO_QWS_MULTIPROCESS before using QWSSharedMemSurfacePasi Petäjäjärvi2013-01-241-0/+4
| | | | | | | | | QWSSharedMemSurface is not available if we don't have multiprocess QWS, which requires QSharedMemory support. On VxWorks DKM mode, we don't support QSharedMemory and there no multiprocess QWS. Change-Id: I647a576ee4d718b3dcddb0dc4d629ffcd2e163f2 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix TextInput test failures.Andrew den Exter2013-01-232-6/+14
| | | | | | | | | | | | | | | | 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>
* Doc: Updated HTML copyright year to 2013.Jerome Pasion2013-01-2212-12/+12
| | | | | | Change-Id: I62fa2443cc7cfd187458eb99d370472d553600f8 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
* 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>
* Fix temporary file leak in tst_qfileinfo.Friedemann Kleint2013-01-211-4/+3
| | | | | | Change-Id: I0d679638d5a9564f612ae5e70717f164b74aefb0 Reviewed-by: David Faure (KDE) <faure@kde.org> (cherry picked from qtbase/52e14e05fa83f19f64cedda2291b3a055bdead06)
* Qt Designer: Use multiline validation for dynamic string properties.Friedemann Kleint2013-01-211-0/+20
| | | | | | | | Task-number: QTBUG-26394 Change-Id: Idbaa4bad71125b74d8407bb56ee9fdbf83831fe0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qttools/a7d61534acdb90b925d7f250665dcd30c3f37668)
* ActiveQt Designer plugin: Load control string correctly.Friedemann Kleint2013-01-211-1/+3
| | | | | | | | Task-number: QTBUG-29234 Change-Id: I5762c75efc24bf5322ff767a9dbecfdfc02c3377 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qttools/8695c1753964eeb06b5d9306010b56be5fc151c0)
* To support QT_NO_IM on Linux/Windows/MacJing Bai2013-01-2123-34/+117
| | | | | | | | | | 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>
* Fix crashes in tst_qthreadpool on Windows.Friedemann Kleint2013-01-181-6/+28
| | | | | | | | | | | | Qt 4.8 shows frequent crashes in runMultiple apparently caused by the QMutex construction in the free functions by different threads. Use a common QMutex class member instead. Change-Id: I851d4e2d3637a7b4f404ed843f5360c10caa21f5 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from qtbase/ced523af7a3559b0f30dd2a4406e05418ff7ec89)
* Update the Indonisian and Catalan locales in CLDR data:Mehdi Fekari2013-01-184-215/+562
| | | | | | | | - 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-188-12/+12
| | | | | | | | | 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>
* Define Q_COMPILER_AUTO_FUNCTION in Qt 4.8.Thiago Macieira2013-01-181-0/+2
| | | | | | | | | | | | | | This definition was missing. It's clear MSVC supports this feature because it has been in use in qtconcurrentrun.h under an #ifdef Q_COMPILER_DECLTYPE, which is defined for MSVC. This is needed in order to re-enable lambdas and other functors in QtConcurrent after the bug fix for QTBUG-28984. Task-number: QTBUG-28984 Change-Id: I8c3994096dad120a47ad5f0a7dac6bdbe304fcae (partly cherry-picked from Qt 5 commit 932034b3df322e7a9dc3d7979584019b46277e50) Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QDateTime auto test: stabilize currentDateTimeUtc2 testPeter Hartmann2013-01-171-1/+1
| | | | | | | | | ... by trying more often to get dates close enough to each other. (backport of commit 170bf2a59aa863e724097825e5a0c8e8148ce109) Change-Id: Ib713ed13cf5b8bcf469ade148026d5bfa239b304 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Add missing -system-proxies configure option.Leonard Lee2013-01-171-0/+3
| | | | | | | | | | | | | This task is valid for Qt 4 only. Under Qt 5, the "Configuration Option for Qt" documentation page removed by https://codereview.qt-project.org/40852 commit. Use 'configure -help' to see all available options. Task-number: QTBUG-2069 Change-Id: Idd98208338549a0c62d80c35b5eac45b6bfd6db4 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove QPerformanceTimer now that QElapsedTimer contains the necessary bitsRobin Burchell2013-01-1710-554/+13
| | | | | | | | | | | | QPerformanceTimer was a copy of QElapsedTimer with some additional functionality which has since been subsumed into QElapsedTimer, so remove the forked code. (backport of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e from qtdeclarative) (backport of d733f6a942e40e58ebc09f1d4414e2f8fa3f6a28 from qtquick1) Change-Id: I261f0e957ffe3fc5fe42cd50672d2dd99b080f1e Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Fixed dead keys on MS WindowsJuan Luis Boya García2013-01-161-3/+9
| | | | | | | | | | | | | | | | | | | | Since Qt4, there is a bug which causes Qt to drop dead key modifiers (like graves and acutes) if the user types enough fast on MS Windows. This happens because of an extrange behavior of Windows, which drops dead keys on ToUnicode() calls. This patch tries to workaround that. Task-number: QTBUG-8764 Task-number: QTBUG-10032 Conflicts: src/plugins/platforms/windows/qwindowskeymapper.cpp Change-Id: Ifdde25817743194fd5c0b7533c27f46a7a108ca4 (cherry picked from commit 5d2bb24cc90194a3458f8741e30ae7afe0b45f5c) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix malloc errors from legacy realpath on Mac OSX.Jeremy Nicholl2013-01-161-2/+9
| | | | | | | | | | | | | | | Avoid using realpath(X,0) on Mac OSX at all, since even on versions of OSX where realpath(X,0) is supported, we still get the legacy version due to our compiler flags. If we were to change the -mmacosx-version-min to 10.5 or higher then this patch would be safe but unnecessary. Task-number: QTBUG-28282 (cherry picked from commit 67195dc394001ee1c9adc7db97fd6ff9d88e9b0c) Change-Id: I0e763321aed71b03e6bf256d112cf4b743411626 Signed-off-by: Peter Hartmann <phartmann@rim.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QNX: Make QWidget::hide() work immediately.Sergio Martins2013-01-151-0/+5
| | | | | | | | Backport from qtbase d5257644302e349fec8df5750d100fd4918ddd6b Change-Id: Ib46a8aecf5c4abe83d0161f72c480094002719e3 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Use a UUID for the NSToolbar in unified title and toolbar.Jake Petroules2013-01-152-1/+29
| | | | | | | | | | | | | | | | | When two NSToolbars in an application share the same identifier, Cocoa tries to synchronize their state (item position, view mode, etc.), and this behvavior interferes with and crashes Qt applications in certain cases when toggling the unified toolbar on and off. Therefore it is necessary to use a unique identifier for each native toolbar created. Does not affect Qt 5. This functionality has been removed and an equivalent will be provided by QtMacExtras which uses a completely different approach, though I7d5c8d58e45a504480a1ce67065add15cb35ad8f could be considered Qt 5's rough equivalent to this. Task-number: QTBUG-19207 Change-Id: I9030d56941d12a2c1f7a328337bf986f1b51eeb8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix QVistaHelper::disconnectBackButton().Friedemann Kleint2013-01-152-1/+7
| | | | | | | | | | Restrict disconnect() to the clicked() signal, leaving connections to destroyed() (as used by QStyleSheetStyle) intact. Task-number: QTBUG-20292 Change-Id: I7471b4d1262ec0684e4446b5c17513717c502749 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/273713b81f5e580748c281c17e08e8b3e2e8ee70)
* Prevent a crash when hiding a window on Mac OS X 10.7 or laterAndy Shaw2013-01-141-0/+4
| | | | | | | | | | If a tool window is ordered out when there is a full screen widget around then it would cause a crash because of a new animation from Lion. This seems to be provoked by the fact that we are faking the fullscreen functionality in Qt. Change-Id: I07cdfddc6c2bb766df7809912fb97c4f1ba8873b Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Limit the range of the QUrlPrivate::port to -1 to 65535Thiago Macieira2013-01-142-1/+12
| | | | | | | | | | | | | The internal parser can read values outside this range (and cannot report an error), but QUrl::port() must not return something outside that range. The correct solution would be to report an error, like in Qt 5, but that cannot easily be done. The rewritten parser in Qt 5 is not affected by this issue. Task-number: QTBUG-28985 Change-Id: I3cf595384f14272197dcfb85943213c8f8ddeba0 Reviewed-by: David Faure (KDE) <faure@kde.org>
* QMenu: Fix nested popup when keyboard shortcut is usedOrgad Shaneh2013-01-142-1/+18
| | | | | | | | | | Task-number: QTBUG-20403 Change-Id: I2a5fe00dd16e9dc1ec0d742a8f48083fc2954996 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qtbase/b6963f109ad54c6f03b3391d57db9a536d49ba7d)
* QUrl::fromUserInput: fix for urls without a host.David Faure2013-01-142-2/+5
| | | | | | | | | | QUrl::fromUserInput("http://") was invalid, which doesn't make sense since QUrl("http://") is valid. Same for "smb:" which is actually even more a valid URL from a user's point of view. Change-Id: I371ac393d61b49499edf5adbbc2a90b426fe9e5d (cherry-picked from qt5 commit 8b2728ec382565c5bd57148600e34740a3c3fe52) Reviewed-by: David Faure (KDE) <faure@kde.org>
* BlackBerry: change SSL root cert folderPeter Hartmann2013-01-141-1/+1
| | | | | | | | | | | Currently /etc/openssl/certs is symlinked to /var/certmgr/web/user_trusted, but this will be changed in the future. /etc/openssl/certs is the folder to be used to read the root certs. (cherry picked from commit 4c8d8a72ec65f409394075ef50401265e495c1dd) Change-Id: I80820374586b5a9038e8b69206b6c9b05f486a07 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Check for gtk_adjustment_configure as this is not always implementedAndy Shaw2013-01-141-1/+3
| | | | | | | | | | | | | | Some implementations seem to not have the gtk_adjustment_configure function implemented so we check for this so that there is no problem when it tries to use it. Task-number: QTBUG-23569 QTBUG-25760 Change-Id: I777ce09268f86907f3da3cede408c9a41be566cf Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Karim Pinter <karim.pinter@digia.com> (cherry picked from qtbase/7fcf1cf674d09d9dd1d41e2913252017f1d599ca)
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1311720-11793/+11793
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Stabilize tst_QDeclarativeMouseAreaAlan Alpert2013-01-111-0/+2
| | | | | | | Adding qWaitForWindowShown removes a potential source of instability. Change-Id: I6dc6ef13762d897b387ca9bc15a8a1f49c05bdf2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix Blackberry QPA plugin clipboard implRafael Roquetto2013-01-111-2/+4
| | | | | | | | | | | | | QBBCliboard::setMimeData was not cleaning the system clipboard aproppriately when m_mimeData != 0 but m_mimeData->userMimeData == 0, as it would return early before the empty_clipboard() statement. Also, we must not dataChanged() signal after the clipboard has been changed, because this is done by the parent class. cherry-picked from qt5/qtbase 0a977e36e06a69583d8e4edc27ca3df634c53404 Change-Id: I694490e26035d75c3c54e76c538982037c3ef799 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix title bar height of Aero wizard on Windows 8.Friedemann Kleint2013-01-102-9/+23
| | | | | | | | | | | | Windows 8 no longer allows for negative values to WM_NCCALCSIZE to shrink the title bar. Task-number: QTBUG-28435 Change-Id: Ib6aa95a98663c4dc8e9a18407b5d49a0daeab8f9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/5fb6331a17a5c43b91daddf4a30e46ccbd1419b5)
* Do not use getuid() and getgid() functions in VxWorksPasi Petäjäjärvi2013-01-101-1/+1
| | | | | | | | VxWorks has no concepts of users and groups, therefore no such functions exists on VxWorks. Change-Id: I56e1c80ffd4e8d88ae41e3a0bb97df05c6a2f98f Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Add struct keyword for timeval variable to remove ambiguityPasi Petäjäjärvi2013-01-101-1/+1
| | | | | | | | | | VxWorks does not have gettimeofday function, so make sure we pick correct definition for timeval. This is not needed in Qt5, because there is already struct keyword used for timeval variable. Change-Id: Iedb47e7c50610f64b0178527127fc003ee67ff4a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* QSqlTableModel: fix dataChanged() index for removed edited rowMark Brand2013-01-102-1/+13
| | | | | | | | | | | | Last column index is columnCount() - 1 This change is not applicable to Qt 5. Task-number: QTBUG-28961 Change-Id: Ib962ab5f737bf9c216423ee9d0632757d33f3bd2 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>