summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
Commit message (Collapse)AuthorAgeFilesLines
* Bump Qt version to 4.8.1Girish Ramakrishnan2012-03-051-2/+2
| | | | | | | | Change-Id: I117e5dcd45397a9fbd1f033fc745ada00c221721 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Change bugreports.qt.nokia.com -> bugreports.qt-project.orgSergio Ahumada2012-02-091-1/+1
| | | | | | Change-Id: Ib13737eac7f7cee3ebca44aa712cb6b152672a81 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Various qt documentation fixes (wk 43)artoka2012-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12389 Task-number: QTBUG-16667 Task-number: QTBUG-6151 Task-number: QTBUG-8625 Task-number: QTBUG-19808 Task-number: QTBUG-12096 Task-number: QTBUG-1231 Task-number: QTBUG-21073 Task-number: QTBUG-8939 Task-number: QTBUG-20399 Task-number: QTBUG-20944 Task-number: QTBUG-7542 Task-number: QTBUG-22095 Task-number: QTBUG-11278 Task-number: QTBUG-15653 Change-Id: Ibc369998d06e7f2f11b01a1ba4c2fb927e3c065b Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1121-22/+22
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Surviving out of memory in Qt Quick appmread2011-11-211-8/+5
| | | | | | | | | | | | | | | | | The QtQuickPlayground app contains a version of samegame which allow the user to edit the code. By setting the ball size to 8, the app can run out of memory. This leaves it in a pretty bad state. But apps on Symbian shouldn't crash due to OOM and should allow some operation. This change fixes the immediate OOM crashes in declarative, gui and corelib. It shows warning dialogs which explain what has gone wrong and leaves the app in a state that can be exited cleanly from the Symbian task list. Task-number: QT-5319 Reviewed-by: Shane Kearns Reviewed-by: Gareth Stockwell Reviewed-by: Martin Jones
* Use Q_FUNC_INFO without line number on GHS compiler.Rolland Dudemaine2011-11-151-1/+1
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-281-1/+1
|\
| * Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-1410-284/+799
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine_p.h src/network/ssl/qsslsocket_openssl.cpp
| * | fix doc typoOswald Buddenhagen2011-09-051-1/+1
| | |
* | | Removed obsolete QWS_ALPHA_CURSOR feature.jaanttil2011-09-274-16/+0
| |/ |/| | | | | | | | | | | | | | | | | QWS_ALPHA_CURSOR was only mentioned in qfeatures.txt and corresponding QT_NO_QWS_ALPHA_CURSOR was not used anywhere in Qt code. Task-number: QTBUG-20337 Merge-request: 1402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-301-18/+19
|\ \
| * | Re-introduce Q_GLOBAL_STATIC_INITJoão Abecasis2011-08-111-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing this macro in abff4d5090c1706c44485bbe3689a0e339c26a9b breaks code that used it in providing their own class-scope safe Q_GLOBAL_STATIC variations, the feature introduced in that commit. There may be other use cases for the macro. Anyway, even if this isn't part of the public API, there isn't a strong reason to remove the macro, so it is back now. Task-number: QTBUG-20627 Reviewed-by: Samuel Rødal
* | | Doc: Fixed date format doc bug in QDateTime/Qt namespaceGeir Vattekar2011-08-221-1/+1
|/ / | | | | | | | | Task-number: QTBUG-12236 Reviewed-by: David Boddie
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-07-122-0/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix license header in qs60keycapture_p.h and qs60keycapture.cpp Fixing WINSCW compile error whitespace fixes Enable key capture and RemCon interfaces for Qt apps on Symbian
| * \ Merge branch 'newmmkey_sym'Honglei Zhang2011-07-042-0/+10
| |\ \
| | * | Enable key capture and RemCon interfaces for Qt apps on SymbianHonglei Zhang2011-07-032-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The volume and other multimedia keys in Symbian are not delivered through the normal key events, but through a seperate API called CRemConCoreApiTarget. The commit implements the feature that multimedia key events are delivered via normal key events to Qt Application, if the Qt::AA_CaptureMultimediaKeys is defined. Task-number: QTBUG-4415 Reviewed-by: Sami Merila Reviewed-by: Miikka Heikkinen
* | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-07-071-6/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: HTTP internals: continue gzip decompression if buffer fills exactly HTTP internals: do not discard data if not receiving gzip end marker Support partial input mode - documentation update Add a null check for the backend in QNetworkReplyImpl. Support partial input mode Fixes switching runtime graphics system when the maximized window is shown or hidden.
| * \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-061-6/+10
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Support partial input mode - documentation updateSami Merila2011-07-051-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the documentation related to the QApplication attribute. Task-number: QTBUG-16572 Reviewed-by: Tomi Vihria
| | * | Update licenseheader text in source filesJyri Tahtela2011-05-1320-327/+327
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | | Add Q_DECL_CONSTEXPROlivier Goffart2011-07-061-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defined to the c++0x constexpr when compiler supports it Change-Id: I82687fe46848eedf3cffc39982106749b3dde8aa Reviewed-on: http://codereview.qt.nokia.com/1247 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> (cherry picked from commit 28f927f8e092a02e233559f6da7fa96cf722c77d)
* | | | Use Q_DECL_CONSTEXPR in QFlagsOlivier Goffart2011-07-061-15/+15
|/ / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I851e0b1c3f80a7b33a38cb1ab2665dc0f3c73adc Reviewed-on: http://codereview.qt.nokia.com/1248 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> (cherry picked from commit c0c6dd2b022cfd667f32b8a48bcac86ac07d3880)
* | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-06-242-16/+5
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-221-12/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: trivial: fix typo in comment changelog docu update for QNX 6.5 get rid of anacronysm massive improvements for the QNX screen driver massive improvements for the QNX mouse driver massive improvements for the QNX keyboard driver disable the Embedded Linux data directory permissions check for QNX skip two subtests that are known to fail on QNX implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends implement POSIX IPC based QSystemSemaphore and QSharedMemory backends add a configure-time check for an IPC support make QProcess really work on QNX make the kernel attempt to emulate an instruction with a misaligned access use RoundRobin scheduler by default on QNX a major refactoring of the mkspecs tree for QNX buildfix for qmake
| | * | get rid of anacronysmRitt Konstantin2011-06-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the QNX4 support was dropped-out - the Q_OS_QNX4 ifdef-ed code is a dead cargo; the Q_OS_QNX6 macro was renamed to Q_OS_QNX Merge-request: 1259 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backendsRitt Konstantin2011-06-211-7/+0
| | | | | | | | | | | | | | | | | | | | Merge-request: 1259 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | implement POSIX IPC based QSystemSemaphore and QSharedMemory backendsRitt Konstantin2011-06-211-4/+2
| | | | | | | | | | | | | | | | | | | | Merge-request: 1259 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | make QProcess really work on QNXRitt Konstantin2011-06-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | a multi-threaded QNX Process can't fork properly so we call spawn() instead Merge-request: 1259 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-172-6/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| | * | Fix building the OpenVG graphicssystem on Linux with static libsBernhard Rosenkraenzer2011-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, building OpenVG would fail because Q_OPENVG_EXPORT wasn't defined at all, causing it to be treated as a variable name Merge-request: 1256 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2421-348/+366
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | | | Doc: Applied pending fixes to API documentation.David Boddie2011-05-111-4/+4
| | | | |
* | | | | move some internal helper functions from qglobal.cpp to qcore_mac*Ritt Konstantin2011-06-091-53/+2
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | namely: void qt_mac_to_pascal_string(const QString &s, Str255 str, TextEncoding encoding = 0, int len = -1); QString qt_mac_from_pascal_string(const Str255 pstr); OSErr qt_mac_create_fsref(const QString &file, FSRef *fsref); OSErr qt_mac_create_fsspec(const QString &file, FSSpec *spec); remove relevant "extern" declarations all over the Qt sources Merge-request: 2615 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-2421-344/+344
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-182-4/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| * | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1321-344/+344
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | | | Fix the build for QUuidLiang Qi2011-05-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a quint8 specialization for qbswap. Reviewed-by: Bradley T. Hughes
* | | | | Fix typo in commentOlivier Goffart2011-05-201-1/+1
| | | | |
* | | | | MSVC do not really support initilizer_listOlivier Goffart2011-05-191-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | std::initializer_list exists, but it is not possible to do bracket initialisation Reviewed-by: Joao
* | | | | Support of lambdas in QtConcurrent::runOlivier Goffart2011-05-191-0/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Joao
* | | | | Add QtPrivate::QEnableIfOlivier Goffart2011-05-191-0/+6
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for QtConcurrent. Like the new std::enable_if (in c++0x) Reviewed-by: Joao
* | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-05-171-4/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (55 commits) Fix thread safety regression of QNetworkConfigurationManager Fix instability in QNetworkConfigurationManager autotest Support word selection list with predictive text from splitview Fix softkey icon positioning in S60 5.3 QDeclarativeMouseArea: block context menu events ListViews loses items if all visible items are removed. Make TextEdit word selection more natural. Clear confusion between QMainWindow and QMainWindowLayout. Fix for rounded corners bug in QMenu Compile QWidgetPrivate::setParent_sys might be using null pointer Ensure the TextEdit cursor delegate is repositioned on mouse events. Don't crash on an invalid replacementStart from an input method. Fix incorrect hardware address on systems without getifaddrs() Enable multisampling on Symbian if hw supports it Fix QtCoreu.def file error Introduce platform extension to QGraphicsSystem Fix Symbian/WinsCW build break Prevent crash in OpenGL engine when scaling images / pixmaps. emit QNetWorkAccessManager::finished on QNetworkReply::abort() ...
| * \ \ \ Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-161-0/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qt_s60_p.h
| * | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-061-4/+6
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | make QLibraryInfo return clean pathsOswald Buddenhagen2011-05-061-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as a side effect, don't use QDir for path resolution - it doesn't buy us anything. Task-number: QTBUG-1371 Reviewed-by: joerg
| | * | make relative paths in qt.conf work inside qmakeOswald Buddenhagen2011-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11602 Reviewed-by: joerg
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-05-171-0/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: (23 commits) Fix QGLWidget::renderPixmap for raster engine on Mac Check if OES_texture_npot is present on OpenGL ES 2. Fix tst_QVariant::invalidColor Move QTextCursor::MoveStyle to Qt namespace Move the painting redirection to the unified toolbar surface. Fix misspelled word in comment. Build fix for tst_qrawfont Add some QRawFont related low level functions to avoid extra copying Compile on Mac Rename QGlyphs -> QGlyphRun Fix QRawFont::setPixelSize() on Mac Remove warning from QColor::setNamedColor(). Add internal documentation for QUnifiedToolbarSurface. Fix QPainter::drawGlyphs() with non-affine transformation Remove misspelled comment in tst_qtextdocument.cpp Only enable design metrics for scalable fonts Add a way to retrieve CTFontRef from QFont Include pixel size of font in exported HTML from QTextDocument Fix the autotest condition. Change the repaint() call to an update(). ...
| * | | Move QTextCursor::MoveStyle to Qt namespaceJiang Jiang2011-05-111-0/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | We cannot use QTextCursor::MoveStyle enums in QTextLine because QTextCursor is not a QObject, while referring to that enum in Q_PROPERTY requires it to be. That's why we need to move the enums in Qt namespace. Reviewed-by: David Boddie
* | | Disable QtConcurrent for Symbian winscw builds.Laszlo Agocs2011-05-121-0/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While QtConcurrent is nowadays usable with RVCT and GCCE compilers, the compiler used for the winscw target has problems with the templates still. To enable building 4.8 on winscw, the patch defines QT_NO_CONCURRENT and QT_NO_QFUTURE in qglobal.h for this target. However this causes further complications in the Q_OBJECT classes of QtConcurrent because moc will be run without having QT_NO_CONCURRENT and QFUTURE defined (as moc is not a Symbian app and for other Symbian targets they must not be defined, which makes differentiation in qglobal.h impossible for the moc run) and having a moc file generated for a class that will be ifdef'ed out during compilation causes build breaks. Therefore additional dummy stubs are provided in QFutureWatcherBase. Reviewed-by: Liang Qi
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-04-281-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: (31 commits) Make QtQuick2 compile on QPA Use maximum ascent/descent/leading from fallback fonts in shaping Another ugly hack to make bidi cursor work with Core Text Make sure layoutData exist before checking for string direction Removed warning from QPixmap::handle(). Take leading space width into account for painting and selection doc: Simplify language in QGlyphs docs doc: Minor cleanup in QGlyphs docs Remove extra comma at the end of enum list Fix compilation with Qt3Support Don't transform glyph positions for Core Graphics paint engine Skip linearGradientSymmetry test on QWS. Turn on HarfBuzz support for Mac/Cocoa Support visual cursor movement for BIDI text Disable tst_QPixmap::onlyNullPixmapsOutsideGuiThread on Mac Revert "Switch the default graphics system to raster on Mac." Fix an race condition in the auto test. Made linearGradientSymmetry test pass on qreal=float platforms. Make sure #ifdef'd tests still have main() function Long live QRawFont! ...