summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
Commit message (Collapse)AuthorAgeFilesLines
* Use slogger2 for logging on Blackberry instead of writing to stderrFabian Bumberger2012-11-082-0/+62
| | | | | | | | | Backport from Qt5: c86ed49a7989adb3e2e3c42794e44609f12ce493 Change-Id: I09d84b08f7c90348b4104f7e52d76ee27a4837af Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Peter Hartmann <phartmann@rim.com>
* Changed Qt release version to 4.8.4jutaipal2012-10-081-2/+2
| | | | | | | Change-Id: I45f7894f7e79617b6ccb8caa464bbbffaf9dd7b5 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2921-487/+487
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Refactor coreservices -> ios & QT_NO_CORESERVICES -> Q_OS_IOSIan Dean2012-09-181-2/+2
| | | | | | | Similar work was done in Qt5 in Change Id3b02316 Change-Id: I392d2a5bfffb9a335f28d5dbc5ea27b800fc4487 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Bump hex copy of Qt version number to 4.8.3.Jason McDonald2012-08-141-1/+1
| | | | | | | | | | Change-Id: I7bf366fc15aeb86f0d0a19481b81f690feb7af9a Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juhani Taipale <juhani.taipale@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Changed qt version to 4.8.3jutaipal2012-08-081-1/+1
| | | | | | | | | Change-Id: Ib26f4c1d3b236f947d685ef5c376c203bda0e650 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0121-43/+43
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* doc: removed incorrect reference to Q_OS_X11Rohan McGovern2012-07-131-1/+1
| | | | | | | | It's Q_WS_X11, not Q_OS_X11. Change-Id: I1778f6d268ea0ce702e5eb451f7a9dc0e1b5e754 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Add Mac OS 10.8 QSysInfo enumsMorten Sorvig2012-07-102-1/+5
| | | | | | | Change-Id: If52192c5dcd8ba55b7ae7d3e3c4aea75c32d0f99 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* QNX: QtGlobal: compile as a C header againMarc Mutz2012-07-091-1/+3
| | | | | | | | | | | | <utility> is a C++ header, only execute the check for the Dinkumware standard library if we're compiling under a C++ compiler. This is a backport of Qt 5 change b65291bc42c7e071e38efdd9ee6c4683f29aca13. Change-Id: I12d5a2c5c003092127773d9c25623d012976c906 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNX: fix compilation with C++11 enabledMarc Mutz2012-07-081-0/+12
| | | | | | | | | | | | | | | | | | | | | | QNX uses GCC, but by default not libstdc++ as the standard library, but 'libcpp', a Dinkumware-derived implementation that doesn't sport many of the C++11 features, yet. Thus, the compiler detection sets Q_COMPILER_INITIALIZER_LIST, which is correct, in a way, but since we're lacking stdlib support the next #include <initializer_list> will fail. So, simply don't define Q_COMPILER_INITIALIZER_LIST if we're on QNX and detect a Dinkumware signature (taken from Boost.Config). This is a back-port of change Ieeb147251c2935517faba61f75d1580a9e1649c4 from Qt 5. Change-Id: Ic7cd11b19a01ae192f60aae33da5581ff8e4682c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Mac: Remove "unsupported" warning for 10.8Morten Sorvig2012-06-081-1/+4
| | | | | | Change-Id: I4e4447af16ab1aaa6b7a6eecf2e55718e4fb69d4 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add OS version detection for windows 8Andreas Holzammer2012-05-242-0/+6
| | | | | | | | | | Based on consumer preview, the internal version is 6.2 backported-from: I9d6ff6c7614f46a20d489e8a8f4aefeb60c547f6 Change-Id: I543148c22cec622ad04e6bf436acd0e66cbf02d2 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix build with QT_NO_WARNING_OUTPUTAndy Shaw2012-04-191-0/+4
| | | | | | | | | | | | | | When defining QT_NO_WARNING_OUTPUT then qWarning() is not available so it should be defined in the same manner as qDebug() in this context which is as QNoDebug. The cases in QtNetwork are changed to use qWarning("....") to avoid having to add in an extra include of QDebug just so that qWarning() is declared in the QT_NO_WARNING_OUTPUT case. Task-number: QTBUG-25308 Change-Id: I4960d8943e805697d4c05cc6988306e5c25fc2bb Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Bump Qt version to 4.8.2aksalova2012-04-181-2/+2
| | | | | | | | Change-Id: Iecae324b1ae00c0d6fb6ed36a8f4a27f51a31d07 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add new QSysInfo::symbianVersion() enumsPasi Pentikainen2012-04-132-3/+13
| | | | | | | | | | Add new enums for future Symbian platforms. Task-number: QT-4593 Change-Id: I23b616c6d62d9d56d2b8ec6ac7edb8f6a84211e8 Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* 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
|\ \ \ \ | | |/ / | |/| |
generated by cgit v0.12 at 2025-04-09 22:22:17 (GMT)