summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-1610-112/+202
|\
| * Add autotest that checks that copy and cut don't work when echomode is set ↵Joona Petrell2010-08-131-0/+24
| | | | | | | | | | | | | | to hide text/password mode Task-number: QTBUG-12086 Reviewed-by: Michael Brasser
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-134-2/+65
| |\ | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Clear previous animation data for non-triggering animations. Fix configure -help output. declarative module is built by default.
| | * Clear previous animation data for non-triggering animations.Michael Brasser2010-08-133-0/+63
| | | | | | | | | | | | | | | | | | | | | We need to clear the data from the last run if the animation doesn't match any of the state actions (or if there are no actions). Task-number: QTBUG-12805
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-134-104/+100
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Clean up rasterfallback mechanism in DirectFB QNAM HTTP: Fix crash related to aborted uploads
| | * | Clean up rasterfallback mechanism in DirectFBDonald Carr2010-08-122-103/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Being able to debug which paint operations are slow with Qt/DirectFB is currently only possible in debug builds (which defeats the purpose somewhat) or by frequent recompilation (with different defines). This patch cleans up the mechanism somewhat and makes it available in release builds as well. The overhead is a single int comparison so it really isn't a performance issue to have this code in place at all times. Reviewed-by: Anders Bakken <agbakken@gmail.com>
| | * | QNAM HTTP: Fix crash related to aborted uploadsMarkus Goetz2010-08-122-1/+5
| | | | | | | | | | | | | | | | Task-number: QTBUG-12285
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-122-8/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Make bld.inf target in Symbian mkspecs to depend on .pro file
| | * | | Make bld.inf target in Symbian mkspecs to depend on .pro fileMiikka Heikkinen2010-08-122-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to .pro file weren't previously noticed and therefore qmake wasn't rerun. Qmake command itself was also incorrect. Task-number: QTBUG-12716 Reviewed-by: Shane Kearns
* | | | | emit countChanged where appropriate in RepeaterMartin Jones2010-08-162-1/+7
| |_|_|/ |/| | | | | | | | | | | | | | | Task-number: QTBUG-12905 Reviewed-by: Bea Lam
* | | | Fix configure -help output. declarative module is built by default.Martin Jones2010-08-131-2/+2
|/ / / | | | | | | | | | Task-number: QTBUG-12840
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-08-122-15/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QAudioOutput(ALSA); Fix check for available devices. Phonon; Update CMakeLists.txt
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-08-122-15/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QAudioOutput(ALSA); Fix check for available devices. Phonon; Update CMakeLists.txt
| | * | | QAudioOutput(ALSA); Fix check for available devices.Justin McPherson2010-08-121-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ALSA can return a list of one empty item when no devices are available. Task-number: QTBUG-12690 Reviewed-by: Andrew den Exter
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Justin McPherson2010-08-12330-8853/+20799
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-08-06172-1975/+4228
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into 4.7
| | * | | | | Phonon; Update CMakeLists.txtJustin McPherson2010-08-041-1/+1
| | | | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-124-5/+31
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Properly emit geometryChanged() when the position change. QCoreApplication::library path, ensure mutex lock ordering Fix memory leak.
| * | | | | | Properly emit geometryChanged() when the position change.Alexis Menard2010-08-122-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also emit the signal at the very end, so people can rely on the resize event to adjust some stuff in their item. Reviewed-by:yoann
| * | | | | | QCoreApplication::library path, ensure mutex lock orderingOlivier Goffart2010-08-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not keep the libraryPathMutex locked while calling QFactoryLoader::refreshAll QFactoryLoader also lock a mutex, and recurse into QCoreApplication::libraryPath Reviewed-by: Brad Helgrind warning for reference: ==8442== Thread #1: lock order "0xDEBA470 before 0xDF63600" violated ==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so) ==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102) ==8442== by 0x8025A8E: QCoreApplication::libraryPaths() (qcoreapplication.cpp:2234) ==8442== by 0x8006FDC: QFactoryLoader::update() (qfactoryloader.cpp:109) ==8442== by 0x8006F32: QFactoryLoader::QFactoryLoader(char const*, QString const&, Qt::CaseSensitivity) (qfactoryloader.cpp:99) ==8442== by 0x6DE4351: qt_guiPlatformPlugin() (qguiplatformplugin.cpp:101) ==8442== by 0x6DE7A5B: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:934) ==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111) ==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323) ==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793) ==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712) ==8442== by 0x41350F: main (tst_examples.cpp:227) ==8442== Required order was established by acquisition of lock at 0xDEBA470 ==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so) ==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102) ==8442== by 0x8025FC3: QCoreApplication::addLibraryPath(QString const&) (qcoreapplication.cpp:2335) ==8442== by 0x6DE792D: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:927) ==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111) ==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323) ==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793) ==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712) ==8442== by 0x41350F: main (tst_examples.cpp:227) ==8442== followed by a later acquisition of lock at 0xDF63600 ==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so) ==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102) ==8442== by 0x80086A9: QFactoryLoader::refreshAll() (qfactoryloader.cpp:249) ==8442== by 0x802607E: QCoreApplication::addLibraryPath(QString const&) (qcoreapplication.cpp:2344) ==8442== by 0x6DE792D: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:927) ==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111) ==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323) ==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793) ==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712) ==8442== by 0x41350F: main (tst_examples.cpp:227)a
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-121-3/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix memory leak.
| | * | | | | Fix memory leak.Sarah Smith2010-08-121-3/+8
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mac only bug - run examples/opengl/overpainting under leak detect instrument on Mac OSX to see it. Memory leak in any application that called getProcAddress() - CFStrings have to be cleaned up if the name of the function you got them from contains the word "Create" - and we weren't doing that. Reviewed-by: Gunnar Sletta
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-128-31/+30
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Destroy the old runtime system only when existing pixmaps were migrated. Fixed autotest failure in tst_qgl::clipTest. Added way to destroy the share widget in the GL graphics system. qdoc: All references to -assistant and -base were removed.
| * | | | | Destroy the old runtime system only when existing pixmaps were migrated.Michael Dominic K2010-08-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2448 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | | Fixed autotest failure in tst_qgl::clipTest.Samuel Rødal2010-08-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change fb00d5003ac5d91953a95d8164180f8f56a2b0f2 introduced a slight behavioural change by leaving the surface handle dangling. We need to unset the surface handle even if we don't own it to make sure we don't access it again. Reviewed-by: Gunnar Sletta
| * | | | | Added way to destroy the share widget in the GL graphics system.Samuel Rødal2010-08-122-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us destroy the share widget temporarily if we want to free up OpenGL resources for a while. Reviewed-by: Gunnar Sletta
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-1297-8890/+4952
| |\ \ \ \ \ | | |/ / / /
| * | | | | qdoc: All references to -assistant and -base were removed.Martin Smith2010-08-124-30/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flags allowed are now -creator and -online. -creator is the default.
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-1210-46/+189
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed build failure Added documentation for Spectrum Analyzer demo Do not include Spectrum Analyzer demo in static builds Gcce building support for symbian-sbsv2
| * | | | | Fixed build failureGareth Stockwell2010-08-123-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12713
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-129-46/+189
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added documentation for Spectrum Analyzer demo Do not include Spectrum Analyzer demo in static builds Gcce building support for symbian-sbsv2
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-119-46/+189
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added documentation for Spectrum Analyzer demo Do not include Spectrum Analyzer demo in static builds Gcce building support for symbian-sbsv2
| | | * | | | | Added documentation for Spectrum Analyzer demoGareth Stockwell2010-08-113-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12720 Reviewed-by: David Boddie
| | | * | | | | Do not include Spectrum Analyzer demo in static buildsGareth Stockwell2010-08-112-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This demo includes a 3rd party library which is licensed under the LGPL. As such, the demo application may only link to the library dynamically. Task-number: QTBUG-12713 Reviewed-by: Justin McPherson
| | | * | | | | Gcce building support for symbian-sbsv2Miikka Heikkinen2010-08-114-41/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now possible to use "release-gcce" and "debug-gcce" targets in symbian-sbsv2 mkspec. Exports and cleans should also now work properly for all target platforms under symbian-sbsv2. Task-number: QTBUG-12762 Reviewed-by: Jason Barron
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1232-8750/+3254
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256 QXmlStreamReader: avoid unnecessary detaching QSslCertificate: support expiration dates > 2049 Doc: Fixing typo Doc: Fixing bug involving header misplacement in Creator style qdoc: Added list of all members (including inherited) page to QML elements. qdoc: Ensured that text is encoded correctly. qdoc: Fixed non-well-formed markup. Doc: Fixed typo in a shortcut string. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Doc: Added more license information.
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-1132-8750/+3254
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256 QXmlStreamReader: avoid unnecessary detaching QSslCertificate: support expiration dates > 2049 Doc: Fixing typo Doc: Fixing bug involving header misplacement in Creator style qdoc: Added list of all members (including inherited) page to QML elements. qdoc: Ensured that text is encoded correctly. qdoc: Fixed non-well-formed markup. Doc: Fixed typo in a shortcut string. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Doc: Added more license information.
| | * | | | | | Fix some #ifdefs to compile for a specific combination of featuress that was ↵Trever Fischer2010-08-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously unsupported Merge-request: 2444 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | | | update Russian translations for Qt and toolsRitt Konstantin2010-08-118-4911/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2445 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | | | Updated Slovenian translations for Qt 4.7Jure Repinc2010-08-112-3662/+2478
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 771 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-1112-150/+347
| | |\ \ \ \ \
| | | * | | | | 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256Andreas Kling2010-08-111-73/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected and enabled the 64-bit versions of these three functions. Speed improvements (tested on an i7): BYTE_MUL : 104.7% INTERPOLATE_PIXEL_256 : 13.2% PREMUL : 13.1% Reviewed-by: Samuel Rødal
| | | * | | | | QXmlStreamReader: avoid unnecessary detachingPeter Hartmann2010-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz Task-number: QTBUG-12259
| | | * | | | | QSslCertificate: support expiration dates > 2049Peter Hartmann2010-08-113-50/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | X509 has two time formats: UTC, where the year is in two-digit format, and generalized time with four-digit years. This patch allows dates specified generalized time. Reviewed-by: Thiago Macieira Task-number: QTBUG-12489
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-11245-9474/+18075
| | | |\ \ \ \ \
| | | | * | | | | Doc: Fixing typoMorten Engvoldsen2010-08-111-1/+1
| | | | | | | | |
| | | | * | | | | Doc: Fixing bug involving header misplacement in Creator styleMorten Engvoldsen2010-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11408
| | | * | | | | | qdoc: Ensured that text is encoded correctly.David Boddie2010-08-101-9/+9
| | | | | | | | |
| | | * | | | | | qdoc: Fixed non-well-formed markup.David Boddie2010-08-092-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me To-be-really-reviewed-by: Qt Doc Team
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-0585-348/+2415
| | | |\ \ \ \ \ \