summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Trivial fix in qjsonobject.h for -Werror=shadowJani Uusi-Rantala2012-02-021-2/+2
| | | | | | | | | | There was a few errors coming from other components using qtbase - error: declaration of 'o' shadows a member of 'this' [-Werror=shadow]. Change-Id: Ib394f404370f001e68fde8b424cd5fff527d8fe7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Move QPlatformDialogs from QtWidgets to QtGui.Friedemann Kleint2012-02-019-25/+15
| | | | | | | | - Remove dependency of the Windows platform plugin on QtWidgets. Change-Id: Iceb876ba7df46b49966af0fc101816654eedb5c5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* qabstractitemmodel.cpp: Fix warnings.Friedemann Kleint2012-02-011-0/+5
| | | | | | Change-Id: I10ef89e2fab31c7f1c9ac67b2234f509fb3f28ab Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Use QBasicMutex instead of Q_GLOBAL_STATIC QMutexOlivier Goffart2012-02-0111-61/+47
| | | | | | | | | | | | | | QBasicMutex is a POD and can be used as a static global object. in qpicture.cpp factoryLoader is used only once, and under the mutex, so there is no need for Q_GLOBAL_STATIC for it, it can be a function static in qhostinfo_unix.cpp the code seemed wrong while compiled with namespace and QT_NO_GETADDRINFO. I also could get rid of one include because it was included earlier. Change-Id: I3c700203c3e067266c20733f4bda8031446dbb86 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Fix parsingMode not used anymore, detected by compiler warningDavid Faure2012-02-011-2/+3
| | | | | | | | This came from replacing d->parsingMode with parsingMode when moving the method to the Private class. Change-Id: I5a025ea1128dacda97d265d401a329dbbbfb0ff7 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Added WindowOverridesSystemGesturesHint to our window flags.Gunnar Sletta2012-02-012-0/+5
| | | | | Change-Id: I42c3d3e5ef71960d16f85969b66380999fb15922 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Prevent data loss when an ssl socket is closed by remoteShane Kearns2012-02-012-12/+22
| | | | | | | | | | | | SSL context was destroyed on disconnect. This makes it impossible to decrypt buffered encrypted data. So if there is encrypted data in the receive buffers, then don't destroy the ssl context until the socket is destroyed. Task-Number: QTBUG-23607 Change-Id: I16a7b4fa006647ec73049c90cdbc72686696850f Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Richard J. Moore <rich@kde.org>
* Remove Symbian specific code in 3rdparty.Xizhi Zhu2012-02-014-105/+4
| | | | | | | | | | | | | Symbian specific code in libtiff was added by commit 6ddf09085f1e8a3cc83c4ee0c77c433d26819c35 in Qt4, code in libpng was added by commit 66fb4038649cfd1d660204bf7c70f99a409ede4f in Qt4, so they are removed. Symbian specific code in freetype was copied from upstream, so kept untouched. Change-Id: I74f169d9283eefd91ec2e97cbd1b8f03dc449380 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Windows configure: make -mp affect the Qt build itselfJoerg Bornemann2012-02-011-3/+4
| | | | | | | | | | | Before -mp and -no-mp affected only projects built with Qt. There was no way to turn off msvc_mp for the Qt build. Qt projects can add msvc_mp themselves. Task-number: QTBUG-23929 Change-Id: I08b9ec762c59d2604635d73396044a74f717728c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix QDnslookup build on FreeBSDJeremy Lainé2012-02-011-3/+1
| | | | | | | | | Unify the includes for resolver function on unix-like platforms to avoid build failures on BSD platforms. Change-Id: I9accd7077d5a319a2c93642e011492d0fc779394 Reviewed-by: Holger Freyther <holger+qt@freyther.de> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Extending the auto test for QHeaderViewThorbjørn Lund Martsum2012-02-011-3/+501
| | | | | | | | | This is a test that verifies correct behaviour of qheaderview. It includes test of swapSections, moveSection, rowcount-change, resizeSection, hideSection and position lookup. Change-Id: Idc1fe8167f2d95dee5c5b1161cb633cbf9495d17 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QHeaderView - Do not try to remove non-existing sectionThorbjørn Lund Martsum2012-02-011-1/+1
| | | | | | | | | The end parameter passed to removeSectionsFromSpans is off by one. removeSectionsFromSpans can currently handle/ignore it, but it is still wrong. Change-Id: I9148bd106504a37a5c8fd72928ab84c669eebcdb Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* SQL driver implementation to signal notification sourcesTorben Dannhauer2012-02-014-6/+24
| | | | | | | | | | | Implements the new notification signal in all QSql drivers which use notifcation. In qt5 only ibase and psql have a notification implementation. PSQL differentiates correctly between 'SelfSource' and 'OtherSource' whereas ibase only signals 'UnknownSource' as a default implementation. Change-Id: Ifcaa139b7a980ed852cf817b3f93284609360ca7 Reviewed-by: Torben Dannhauer <torben@dannhauer.info> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Interface definition to provide notifications with a source information.Torben Dannhauer2012-02-012-0/+13
| | | | | | | | To differentiate between signals of different sources types, this submission adds an enum and extra signal to provide it. Change-Id: Iad711739c41894e9c74d83072c50ae17edc695f2 Reviewed-by: Torben Dannhauer <torben@dannhauer.info> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Remove the API duplication from QApplication.Stephen Kelly2012-02-012-55/+0
| | | | | | | | | The quitOnLastWindowClosed API is present in the base class QGuiApplication. Change-Id: Ib2f78e48a198aa835302dcb9a31637a2c3655532 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: David Faure <faure@kde.org>
* Windows: Fix inclusion of <windows.h>Friedemann Kleint2012-02-0154-190/+152
| | | | | | | | | | | | | - Always use <qt_windows.h> as the last file to be included. - Remove it from some headers, use Qt::HANDLE instead of HANDLE. - Clean up #ifdef, use Q_OS_WIN for Windows/Windows CE. - Add NOMINMAX to qt_windows.h to avoid problems with the min/max macros. - Remove <windows.h> from qplatformdefs.h (VS2005) Change-Id: Ic44e2cb3eafce38e1ad645c3bf85745439398e50 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Adding a QHeaderView benchmarkThorbjørn Lund Martsum2012-02-013-1/+273
| | | | | | | | | | This is a small QHeaderView benchmark. It measures visualIndexAt, hideSection, showSecion, moveSection, insert, remove and trunc rows. Change-Id: Ibca6a2e130f4ab27d68f51e5e341a78579abd1bf Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Revert "Put the generated <module>version.h into build tree"Bradley T. Hughes2012-02-0112-33/+16
| | | | | | | | | After discussion with Liang, I'm reverting it as he requested. This change put every header into the SYNCQT.HEADER_FILES twice for in-source builds, and the qtMODULEversion.h header did not include a path component. This reverts commit 2fbc45b58bba860abf67fb28aa1319c9f4ededaf Change-Id: Ie84cef19193ce5e49072f1f67a41140d9d2673b8 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Accessibility: Use new updateAccessibility() API in widgets.Friedemann Kleint2012-02-0122-60/+60
| | | | | Change-Id: Id69cc28a54abc675a991f2c657a446f38313ac6e Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Introduced BufferQueueingOpenGL capability in platofrm integrationGunnar Sletta2012-02-013-1/+25
| | | | | Change-Id: Iedb7255862fd3a11aceae0e06e90a5539febc7e7 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QtDebug: Include file, line, function informationKai Koehne2012-02-0114-139/+674
| | | | | | | | | | | | | | Record the file, line, and function where a qDebug, qWarning, qCritical or qFatal call happens, and make this information available in a custom message handler. The patch uses the C preprocessor to replace qDebug, qWarning, ... with a line that also records the current file, line, and function. Custom message handlers can access this information via a new QMessageLogContext argument. Change-Id: I0a9b89c1d137e41775932d3b1a35da4ebf12d18d Reviewed-by: David Faure <faure@kde.org>
* Compile with clangMorten Johan Sorvig2012-02-011-0/+1
| | | | | | | | | | Add back friend declaration removed in e8105e4. QListViewPrivate uses QAbstractItemView:: DropIndicatorPosition, which is protected. Change-Id: Ie9fa9422bf4fb7846637dac24a644d4814cfe622 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Emit QSslSocket::error in case of openssl gives an error.Jonas M. Gastal2012-02-013-25/+38
| | | | | | | | | | | Create new QAbstractSocket::SocketError value that denotes a error in the SSL library: SslInternalError Create QAbstractSocket::SocketError value that denotes a error in data provided by user cauding an SSL library error: SslInvalidUserDataError Change-Id: I466a9389d9d7052efd8eddd1a2d6067ba26dfddb Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* QHeaderView - preventing negative section sizes.Thorbjørn Lund Martsum2012-02-012-1/+11
| | | | | | | | | | | | | | This patch removes the posibility to call resizeSection with negative sizes. Sections with negative sizes affect the other sections, and it does not seem to have a useful, well-defined semantic. The length can also become negative - and visualIndexAt work strange. Change-Id: I632beb160649fa10e2106314557b8c5a106aa3cf Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Change syncqt default parameters for shadow buildingKalle Juhani Lehtonen2012-02-012-3/+4
| | | | | | | | | | | | | | | | | | | | For shadow builds configure creates syncqt script to shadow build directory tree calling the original syncqt from qtbase source tree. This wrapped script will add two default parameters when calling the original script. Both parameters are overridden in qtbase/mkspecs/features/default_pre.prf and are not needed except by configure script itself in latter stages where the parameter should be applied explicitly in shadow build condition branch. In addition, it adds the qtdir parameter for the forwarded syncqt call to indicate the location of qt sources for the syncqt. This also will give correct qmake path for qtmodule-configtests script triggered from syncqt. Changes are done both for Linux and Windows configure. Change-Id: I307b2e76c203ee14b849f10ff629f9668da2f223 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add the event loop quitlock feature to QtCore.Stephen Kelly2012-01-3117-62/+979
| | | | | | | | | | | | | | | | A feature of a ref-counted quit (managed by a quit-lock class) is added to both QEventLoop and QCoreApplication. This allows, for example, an event loop to quit() when there is no more work for it to do. quitOnLastWindowClosed is implemented in terms of the refcount in QCoreApplication so that jobs can be completed before the application quits. Change-Id: I14c8f4e7ee12bbf81a6e5849290d4c8ff37fa110 Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Don't compile UIC with -O2 inside ScratchboxTor Arne Vestbø2012-01-311-0/+6
| | | | | | | It makes QEMU crash when running the resulting binary. Change-Id: I94e5d703205827dea88770336a8c5201e7333486 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* add virtual destructor to QWindowSystemInterfacePrivate::WindowSystemEventjian liang2012-01-311-0/+1
| | | | | | | | | | | Add a virtual destructor to QWindowSystemInterfacePrivate::WindowSystemEvent class. Otherwise, in QWindowSystemInterface::sendWindowSystemEvents() "delete event" can't destruct the subclass of WindowSystemEvent properly. Change-Id: Ic708f4ab61de88cd0015aa6e472d356b2de64583 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QHeaderView - fix to resizeSection patch (Ia812a747)Thorbjørn Lund Martsum2012-01-311-0/+2
| | | | | | | | | | | | | | | | | | | A minor simple adjustment to the update-patch for resizeSection. ( http://codereview.qt-project.org/#change,11267 ) We can't just return and ignore that we might needed to call d->doDelayedResizeSections Just because the header does not have updates enabled does not mean that the view hasn't updates enabled - and even in that situation we actually still wanted to keep this. (It is only if the parent is not visible we safe can/should skip this - but I will look into that later) Change-Id: I771de086a07d1e7612a6bfea132d4d15f277ceb3 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QHeaderView::setOffsetToSectionPosition documentation updateThorbjørn Lund Martsum2012-01-311-4/+6
| | | | | | | | | | | | | | | | The documentation has used the word visualIndex for the argument to this function. That is however very misleading since this visualIndex is not the same as 'visualIndex' as we have in visualIndex(int logicalIndex) logicalIndex(int visualIndex) or visualIndexAt(int position) Beside the above a variable name has also been changed from visualIndex to actualVisualIndex. Change-Id: I43808adfd7c287a349474ab1e2656c417c8cf3e9 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QDir::NoDotAndDotDot is now QDir::NoDot|QDir::NoDotDot.Jonas M. Gastal2012-01-315-6/+6
| | | | | | Change-Id: I8ef7782258c2ec02ad2ec2a5d5cab90f53c62aa3 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Maliit: Fix enter on VKB not resulting in text input field acceptanceSimon Hausmann2012-01-312-3/+28
| | | | | | | | | | | Pressing enter on the VKB should result in the emission of the accepted() for text input fields in QML or the returnPressed() signal in QLineEdit. In that case the Maliit input server calls our keyEvent method over DBus, which this patch implements. Change-Id: I46170c30315adaf21db0e232f53780ccaa67e4bf Reviewed-by: Jan Arne Petersen <jpetersen@openismus.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Rename meego to maliit platforminputcontextJan Arne Petersen2012-01-3111-68/+67
| | | | | | | | | Also build the plugin on linux systems with D-Bus. There is nothing MeeGo or Maemo specific about this plugin or Maliit. Task-number: QTBUG-22994 Change-Id: Idcccfb01f79166a54c5809741389b29ccac05a15 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Add support for cleanup functions for data-constructed QImagesSimon Hausmann2012-01-314-23/+96
| | | | | | | | | | | | | | | | A QImage can be constructed with a provided buffer, that has to be kept alive for the live-time of the QImage and all its copies. Frameworks like CoreGraphics or Cairo offer a similar method of creating image objects and also offer the ability to provide a callback function that is called when the image is destroyed. This patch adds this functionality to QImage by extending the QImage constructors that take a raw image buffer pointer. Change-Id: Ia6342408c560ef49b498c9e4664b4602febb0fcd Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Michalina Ziemba <michalina.ziemba@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Allow function types to be registered without workaroundsJoão Abecasis2012-01-315-26/+19
| | | | | | | | | | | | | | | | | Commit 4b8ceb41aed352f10d36db5284453f425dbc5f3f added the requirement that pointed-to types need to be registered when registering pointer types. Unfortunately, the implementation also affects function pointer types. This change whitelists 0, 1, 2 and 3 argument functions as not deriving from QObject, forgoing the need to workaround details of the type registration implementation when registering those function pointer types. Change-Id: I4d855e9d70a8179a6e31b84623ad5bf063e0d6d8 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove many deprecated methodsLars Knoll2012-01-3127-218/+62
| | | | | | | | | | Remove methods that have been marked as deprecated before Qt 4.6. Keep others, but inline them where possible and mark them as QT_DEPRECATED_SINCE(5, 0). Change-Id: If881821ae095f054b31cc13464f19e2007c20ed7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* MinGW build fixes for QWindowsPipeReader and friendsJoerg Bornemann2012-01-313-3/+6
| | | | | Change-Id: Ie4d6017c6fb918e7796d1a5e8863e9368e4e1894 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Windows: Fix compilation with -qtnamespaceKai Koehne2012-01-3111-13/+38
| | | | | Change-Id: Ib006d74299d65e5872a5a524eaa937e127306ec7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Mac: Fix compilation with -qtnamespace setKai Koehne2012-01-315-4/+20
| | | | | | Change-Id: Id3b9f4e3edf2caeac32c8a44278cdf05a1fc70fb Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* mkdtemp() support for QNX platformRafael Roquetto2012-01-311-0/+36
| | | | | | Change-Id: I30feebbbcdbe065e899a048da20ac887d4d48a4f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: David Faure <david.faure@kdab.com>
* Moving tiff image format support and libtiff out of qtbaseaavit2012-01-31284-71076/+24
| | | | | | | | | | The tiff plugin and bundled libtiff is moving to the qtimageformats project on Gerrit. Task-number: QTBUG-23887 Change-Id: I4c848232fdccddd7e7f54215f9eaa78dc4c3a53d Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Use events for accessibility updates.Frederik Gladhorn2012-01-318-45/+104
| | | | | | | | | | | | | The problem with the old updates is that it was impossible to send details about the update. For the Linux implementation to work properly with AT-SPI I need to know which state changed (currently I only get a generic "state changed" event) or which part of the text was changed for long texts (imagine a word processor sending updates). This also gives us more options when updating with events generated from not QObject based objects. Change-Id: If0b6c83c523092565eb48e79f3f6de5a1b905ea8 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Add public role names setter to QStandardItemModelChris Adams2012-01-313-0/+31
| | | | | | | | | This allows QStandardItemModel to be usable in QML without requiring clients to subclass it. Task-number: QTBUG-15067 Change-Id: I867fcd8137132affdf21f37a9fa293e855a09a13 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QDirectPainter is gone in Qt5Lars Knoll2012-01-317-345/+0
| | | | | Change-Id: I3ba8985c9c38be978198a4abd58775aa6f525968 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Escape path names in qmake-generated Makefiles.Andreas Hartmetz2012-01-311-1/+1
| | | | | | | | | | | qmake-generated Makefiles since 4.6 (according to bug report) contain recursive qmake invocations with absolute paths to .pro files, where the absolute paths are not escaped. Task-number: QTBUG-11776 Change-Id: I49772c7d9147efea3bb7b9623c61d92aa0bb6857 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Removing bad ###Qt5 note.Jonas M. Gastal2012-01-311-1/+0
| | | | | | | | | Implementating this would cause massive SC breakage and give little gain. Change-Id: I56a6d302fdd0e8b53d1f9154f3eaf9e1ee429f9d Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* Remove Symbian specific code from qtbase.Xizhi Zhu2012-01-3126-1522/+4
| | | | | Change-Id: I27d37d914b71e1e43c94e2a975ffec49e1ecd456 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove Symbian specific code from QtGui.Xizhi Zhu2012-01-3111-737/+80
| | | | | Change-Id: I450a78863462936d0b18e211763f274b59497109 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix QGuiApplication::topLevelWindows(), introducing allWindows()Anselmo L. S. Melo2012-01-313-1/+65
| | | | | | | | | | | | | As discussed on the development mailing list, the window list returned by QGuiApplication::topLevellWindows() included all QWindows, even the non top-level ones. This commit introduces the new method allWindows(), which returns the list of all QWindows, fixes the list returned by topLevelWindows() and also introduces tests for both methods. Change-Id: I761f0fcdec79f83949012c628655ed12cd18572c Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove Symbian and Maemo 5 code from QtWidgets.Xizhi Zhu2012-01-3132-565/+39
| | | | | Change-Id: I715c0ec70cbad05a6ba9737e49be9da7cbd65bf9 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 03:57:57 +0000