summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* build: Fix the FreeBSD build due build system change.Holger Hans Peter Freyther2012-08-141-1/+1
| | | | | | | | | Revision 6f4ff81380862ad0e788151b35d742f548241d5a broke the QtDeclarative build. FreeBSD's ld.so is using the LD_LIBRARY_PATH environment variable as well. Change-Id: I0a91cedfb9d1935a08d348212f5ff1a54bfe3e53 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Group functions in QAccessibleTextInterfaceJan-Arve Saether2012-08-142-17/+31
| | | | | | | | | | Do the same in QAccessibleTextWidget I got a bit annoyed by this, should hopefully make life easier when forward porting QPlainTextEdit Change-Id: Ib4b90d1892974ea39ecfcbc5cad6ed0694207b58 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* tst_QToolBar: fix "might be used uninit'ed" warningsMarc Mutz2012-08-141-6/+6
| | | | | | | | | | | GCC 4.8 warns: src/testlib/qtestmouse.h:219:67: warning: ‘popupMenu’ may be used uninitialized in this function [-Wmaybe-uninitialized] { mouseEvent(MouseClick, widget, button, stateKey, pos, delay); } tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp:862:12: note: ‘popupMenu’ was declared here Change-Id: I19cfd1790fbd948e97bf740d4412ccf3bb98a330 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix sockets for Windows CEAndreas Holzammer2012-08-141-2/+2
| | | | | | | | | Version numbers for CE are higher then for the desktop, so insert a check for this, as the api is not working as for windows 7 and above. Change-Id: I79baba9183e11c714cffd0bb43327c197043d6e0 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Remove relic QT_VERSION from qmake testRafael Roquetto2012-08-141-1/+1
| | | | | Change-Id: Ic9095e3e924543d4f3e6d0f7c3a7b27f842cd300 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Tidy up QEvent::Type enums.Mitch Curtis2012-08-141-13/+13
| | | | | | | Corrected the list's ordering and added punctuation. Change-Id: I36a477801cd0cfd3d36db308b4263982b582106b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Implemented QAccessibleTextWidgetJan-Arve Saether2012-08-143-378/+533
| | | | | | | | | | | | | | | | | | A new class called QAccessibleTextWidget was added. This class should implement all methods of QAccessibleTextInterface and QAccessibleEditableTextInterface which only need a QTextCursor, and it defines two pure virtual methods, to obtain and set the text cursor, so accessible implementations of widgets which use a text cursor can implement these two methods. QAccessibleTextEdit is now a subclass of QAccessibleTextWidget and most of its methods were moved to QAccessibleTextWidget. This is a forward port of ba5d7d608cc31fc63354fd74d85a1bad7780fc45 from Qt 4.8, and is a prerequisite for forward-porting QPlainTextEdit Change-Id: I6093c4fa7e0a77b84de779479c6074db006efec1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Document QFile::open() argument "handleFlags"Jeremy Katz2012-08-141-0/+2
| | | | | Change-Id: I5ef909b21ddd4782062dd4ebd0ea7bca33f3387f Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Add Linux Accessibility BridgeFrederik Gladhorn2012-08-1426-8/+4917
| | | | | | | | This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* qsql_oci: use OCI_COMMIT_ON_SUCCESS for SELECT without transactionMark Brand2012-08-131-7/+2
| | | | | | | | | | Otherwise, the open statement, say in QSqlQueryModel, will prevent other statements from running. Task-number: QTBUG-18608 Change-Id: Icdd6817fb981678be6fb70ade21a8123e152dcf6 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Fix declaration of qt_gettime for Q_DECL_NOTHROWThiago Macieira2012-08-133-1/+5
| | | | | | | | Since the #include wasn't present in the qelapsedtimer_{mac,unix}.cpp files, we did not notice that the declaration missed the macro. Change-Id: I3e4f23b28e127d41b12690cf306f47986be53d89 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* fix some QElapsedTimer doc grammar issuesJeremy Katz2012-08-131-3/+3
| | | | | Change-Id: I9bdb0b93b101119477a560b28396f88ea8103745 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use Qt::WindowFlags, not Qt::WFlags.Stephen Kelly2012-08-132-2/+2
| | | | | | | | | The latter seems to date from the Qt 1 days, and such abbreviations are not current Qt style. Change-Id: I83bc8722a309f4ece7e51881590d07b40fbe6bef Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Sync .pr[oi] with the Makefiles so qmake builds againMarius Storm-Olsen2012-08-132-4/+9
| | | | | Change-Id: Ief766ac61f98859b84fc61b03b8c1292d3c06525 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make QElapsedTimer always store nanoseconds in t2Thiago Macieira2012-08-131-18/+15
| | | | | | | | | | | | | Up until now, the value stored in t2 depended on whether we had found a monotonic clock or not. Fix that by always storing nanoseconds: we avoid extra calculations and accessing a global variable all the time. The impact is contained to the actual getting of the time. And we mitigate by using clock_gettime to get the realtime clock instead of gettimeofday, if that's available. Change-Id: Iceef2d050fd9472f1a66e11e7ded79fe5163a132 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix a ### Qt5 issue: remove limits.h from qreadwritelock.hThiago Macieira2012-08-131-1/+0
| | | | | Change-Id: I1fc54561aabd1be693f179e668031ddb0f86a130 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Speed up tst_QGraphicsView::mapToScene testThiago Macieira2012-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This test is doing a brute-force mapping. Coupled with changes to QCOMPARE last year, this now allocates and deallocates a lot of memory per iteration. On my Sandybridge, it takes two minutes to run: 111136.781153 task-clock # 0.999 CPUs utilized 371,692,633,238 cycles # 3.344 GHz 182,641,818,708 stalled-cycles-frontend # 49.14% frontend cycles idle 57,951,552,830 stalled-cycles-backend # 15.59% backend cycles idle 477,216,332,971 instructions # 1.28 insns per cycle # 0.38 stalled cycles per insn 86,959,637,669 branches # 782.456 M/sec 309,185,237 branch-misses # 0.36% of all branches 111.264868818 seconds time elapsed Changing the iteration step from 1 to 5 reduces the runtime to about 5 seconds. Change-Id: I9cad6f85f535f472319da7cd6c4aa28e12ddf1b7 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Use POSITION_INDEPENDENT_CODE for these tests.Stephen Kelly2012-08-132-0/+4
| | | | | | | | These projects are expected to fail, but we need to make sure they fail for the right reason. Change-Id: I8a7caaa663060712c5c7113ef3b054feba2e2287 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add hints for where to find packages for projects expected to fail.Stephen Kelly2012-08-132-4/+12
| | | | | | | | In the CI system, an environment variable is used to convey the CMAKE_PREFIX_PATH, but that can not be relied upon. Change-Id: Ie4fbacaac6ae18f95a3b4d1e796a4b4c91a418c4 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add the minimum CMake version to projects built standalone.Stephen Kelly2012-08-132-0/+4
| | | | | Change-Id: If9d2a464d94faee0dccd77bc54946d91dd117db3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tst_qgraphicsview: increase test timeout furtherRohan McGovern2012-08-131-1/+1
| | | | | | | | This test has recently timed out in CI, but appeared to be making progress. Give it more time to complete. Change-Id: Ied0fb7aad35ed6d5889dd585a7545687617e5e19 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* QImage{Reader,Writer}: remove unused local typedef (GCC 4.8 warning)Marc Mutz2012-08-112-2/+0
| | | | | | | | | GCC 4.8 warns: warning: typedef ‘PluginKeyMapConstIterator’ locally defined but not used [-Wunused-local-typedefs] Change-Id: I0225708b590ac3d72ab3cb8f61e686091c187053 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QModelIndex: remove user-defined copy operationsMarc Mutz2012-08-111-3/+1
| | | | | | | | | | | | They're identical to the ones the compiler will synthesize and their presence prevents move constructor and assignment operators from being synthesized alongside their copy counterparts. The destructor can go, too. Change-Id: Ia9cc26ba1ffaa670f03642af457e632f44bd69c2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* support -rpath for modules which are not installed to QT_INSTALL_PREFIXOswald Buddenhagen2012-08-114-7/+14
| | | | | | | | | | | | | a module's project file may set MODULE_INSTALL_LIBS before loading qt_module.prf to have an alternative RPATH linked into the users of that module. this is relevant only for linking against non-installed -prefix builds of that module, as otherwise .libs from the module's pri file is used for rpath. Change-Id: Ib240e748cf130a71a5991dc643c368a983092ead Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix -rpath-link handling for non-installed prefix buildsOswald Buddenhagen2012-08-113-7/+55
| | | | | | | | | forwarding module pris get rpath_link{,_private} fields, which are used accordingly by qtAddModule(). Change-Id: I0abc2dc8b1e8744dbf7f439aa7fed9ae159c2c74 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix order of namespace/include guards.Frederik Gladhorn2012-08-111-3/+2
| | | | | Change-Id: I9ed1e82c90e38a65c15bb9d05ff789270218d4b5 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* qtAddModule(): put search paths directly into LIBS{,_PRIVATE}Oswald Buddenhagen2012-08-111-7/+12
| | | | | | | | | QMAKE_LIBDIR and QMAKE_FRAMEWORKPATH have the downside that they always effectively end up in LIBS, which makes for weird prl files. Change-Id: Iaf61b0038504ff91ae5ec7f9b1255fe3a2d134f1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* assemble the complete tool commands already in qt_tool.prfOswald Buddenhagen2012-08-112-27/+25
| | | | | | | | this saves some repeated calculations. also, it's nicer to have most logic in one place. Change-Id: Iea362d40f5e6203709ced94d29ca61a4163b8e69 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix error message about bad qt modulesOswald Buddenhagen2012-08-111-1/+1
| | | | | | | the variable name is a function parameter now Change-Id: I46f3ce37c157312e7f70291a0cef2d666d50664c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix vcproj file generation for incredibuild handling of moc etc targetsAndy Shaw2012-08-111-1/+2
| | | | | | | | | | | | | | When incredibuild-xge had been turned on by configure then it was not ensuring that the generated vcproj files had the right extra comments needed to make incredibuild run moc and other tools in parallel. By fixing the prf file to get around a problem in the parser this is now respected. Task-number: QTBUG-14482 Change-Id: Ifd24bde2db7d80d3a52719c733d15f228c7b3534 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Make rowIntersectsSelection take account of the parent argument.Stephen Kelly2012-08-102-4/+32
| | | | | | | Task-number: QTBUG-22370 Change-Id: I497194793eab624b760deea93dac0df767850330 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QtWidgets: use new qEnvironmentVariableIs{Empty,Set}()Marc Mutz2012-08-102-5/+5
| | | | | | | | | Incidentally, this patch shows that Qt isn't consistent in how it treats empty environment variables used as flags, but that is something for a separate commit. This patch aims to be behaviour-preserving. Change-Id: I5390cda314858762b76384291373a6f0167d323a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Take scroll position into account when painting drag pixmap.Stephen Kelly2012-08-103-2/+43
| | | | | | | | Task-number: QTBUG-26793 Change-Id: Ic19cb6581cd5838d26713998e152772a5d12da4f Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Revert "Added default argument for color profile to QImage constructors."Alexandros Dermenakis2012-08-102-20/+12
| | | | | | | | | | Reverting change after request in the developers mailing list. This reverts commit 50a5bd5429e0c8b99be81b86d3730737cb7f8514. Change-Id: Ic4a420d6ad0995810ed61d31edd28e7b603cca5e Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* make currentText the USER property for QComboBoxMark Brand2012-08-101-2/+2
| | | | | | | | | | | | | QItemDelegate takes the USER property as the value to be set using model->setData(). The text is what is expected. follow-up to b1b87a73012342dc1619a8e907ea9954d59ca564 which in Qt 4.8.0 broke the interaction between QComboBox and QItemDelegate used by QDataWidgetMapper and item views. Task-number: QTBUG-26501 Change-Id: I005a0a6af5265ee22baf417957e520992d16d6e1 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Require CMake 2.8.9 for the qt5_use_modules function.Stephen Kelly2012-08-102-16/+4
| | | | | | | | | | | The newer CMake version has the POSITION_INDEPENDENT_CODE property which is what we need here. The CMake 2.8.8 implementation uses awkward and incomplete string manipulation which I don't want to maintain for any amount of time when Qt 5.0 is released. Change-Id: If7ace9c6925ccdbf800f1863fa2368e55fa44d7f Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Doc: Added a Qt Network landing page.Jerome Pasion2012-08-106-14/+44
| | | | | | | | | | -fixed generated HTML file names -removed qt-network group in qt/qtdoc and removed \ingroup instances Change-Id: Ida5ded5da30e6db1978382f6742a5da8036e055e Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* Use an include guard for qelapsedtimer.h that matches the file nameThiago Macieira2012-08-101-3/+3
| | | | | | | The class used to be called QTimeStamp before. Change-Id: I6e543f4f131a80299eb5dae78d8852b7899bab8a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use Q_LIKELY instead of doing an #ifdef for GCCThiago Macieira2012-08-101-7/+2
| | | | | | | | This code predated the Q_LIKELY macro. Now that we have it, use the official macro. Change-Id: I0e43609f8d6827f8fef7b928655a965cba579b8d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Correct QTransform::QTransform documentation re m13 initialisation.Mitch Curtis2012-08-101-1/+1
| | | | | | | | | Documentation incorrectly states that it is m13 that is set to 1, when it is instead m33. Task-number: QTBUG-10232 Change-Id: If3c7d3eb1c478ebef4f13b4842235445afc48049 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Handle "-psn_XXX" command line args on MacMorten Johan Sorvig2012-08-101-0/+4
| | | | | | | | | | | | Finder on Mac OS X sends a command line argument of the form -psn_0_3523420 when launching applications. Eat the argument like we do in Qt 4. Change-Id: I09db9dea035e62c0b816a833c9ad6fcd78f83735 Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* kms: Restore VT settings when crashedLaszlo Agocs2012-08-102-2/+29
| | | | | | | | | | This does the job of keeping the terminal keyboard working when the application segfaults but is somewhat unsafe because ioctl() is not async-signal safe. Change-Id: Ie6728a4252e18c29bba8f8308e6c00d4a1eb6a8e Reviewed-by: Elvis Lee <kwangwoong.lee@lge.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* QtGlobal: (new) qEnvironmentVariableIs{Set,Empty}()Marc Mutz2012-08-093-1/+75
| | | | | | | | | | | | | These functions are a faster version of {,!}qgetenv().is{Null,Empty}(), a common pattern in Qt code. Their main advantage is that they don't need to allocate memory, so they can be used in noexcept functions, or dynamic initialisation of namespace-scope statics, because throwing in these contexts invokes std::terminate(). Change-Id: I651c5bd72f450b5d7df76590f8791572fe992af5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove code duplication in QStandardPaths implementationsDavid Faure2012-08-096-68/+20
| | | | | | | | Using the new getter to access the "test mode" setting. Change-Id: Id26a350cd3fab4bf2e5f58ba67bc7323f99c9cc3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add bool QStandardPaths::isTestModeEnabled()David Faure2012-08-098-0/+37
| | | | | | | | | Library code might need to know this, e.g. when calling an external process, to give it the right configuration. (For instance when ksycoca code calls kbuildsycoca to recreate the DB at the right place). Change-Id: I343ddefff816586f9d391973c08ff1e1ad86bf0e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* OpenGL: Allow querying OpenGL extensions via the QOpenGLContextSean Harmer2012-08-093-0/+38
| | | | | Change-Id: Ia88470554bbfd2a56738dadfcafafe42a990382d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix qlayout autotest build for WinCE.Janne Anttila2012-08-092-3/+1
| | | | | | | | | SRCDIR was not defined for WinCE but it should no longer be used. Fixed test case to use QFINDTESTDATA instead. Change-Id: I07cbf7d42790d33e2d205d1682ec10e7577a92bd Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* Use native handles for parent change check in QWindowsWindow.Miikka Heikkinen2012-08-091-13/+17
| | | | | | | | | | | | | QWindow::setParent() sets the parent to zero instead of the desired parent, if platform window has not yet been created for the parent. This caused QWindowsWindow::setParent() to skip setting the parent later, when correct window was specified, as the QWindow parent-child relationship hadn't changed. Fixed by changing the the check to use native handles instead. Task-number: QTBUG-26791 Change-Id: I292a1ddf746583a7268f2d07c20166995c0dd7d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Need to have the XI2 import to detect XI_TouchBeginMaskShawn Rutledge2012-08-091-0/+1
| | | | | | | | | | Followup to I5c925ae3e191244c7ab9415e4ba2fe49b93dd2af : touch was not actually working by default. A major symptom was getting double-clicks instead of clicks on buttons and such, making it quite hard to interact with anything. There are some problems remaining. Change-Id: I09fa5965036bac242ccc1f4db71f6d912445ca01 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* fix conditions in embed_manifest_*.prfJoerg Bornemann2012-08-092-2/+2
| | | | | | | MSVC 2012 was ignored. Change-Id: I41b2dff85c037ce8057c91036434aa26cd9b5d5c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 03:50:45 +0000