summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge 'release' into stableOswald Buddenhagen2012-12-192-0/+46
|\ | | | | | | Change-Id: I57aaa6747c1bfacc7dee036cd69d91a8c0d9ae7a
| * Fix font sizes when X11 has a forced dpi settingv5.0.0Lars Knoll2012-12-182-0/+46
| | | | | | | | | | | | | | | | | | On X11, the X resource system can override the physical DPI of the screen for resolving font sizes etc. Correctly load the setting and adjust the logicalDpi() accordingly. Change-Id: Id60d03d1d214fb99e9de17a65976abd170bb7cca Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * Fix direct compilation of qtypeinfo.h and othersThiago Macieira2012-12-183-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtypeinfo.h is included by qglobal.h, so it needs to include that before the #ifdef. Otherwise, we get a circular dependency problem with qflags.h: ./QtCore/../../src/corelib/global/qflags.h:60:27: error: "Q_PRIMITIVE_TYPE" has not been declared Also, take the opportunity to fix the other headers that are included from qglobal.h to avoid similar problems in the future. Change-Id: I99a56f42775c24bdcc796995b06509c1ca0cb849 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> (cherry picked from commit 797f3c0a01e9adf0af3bc7c0bd3f7f63849d99b9) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Initalize the printinfo on Mac if it requests and it needs initalizingAndy Shaw2012-12-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | When the print panel was closed then it would clean up the printinfo and if it was requested for the same QPrinter then it would not be recreated in time. Therefore we check if it is initalized and if not we re-initalize it. Task-number: QTBUG-28657 Change-Id: I7dc9011b80e03cfa3eae8fee2fcf6cc8021a8566 Reviewed-by: Lars Knoll <lars.knoll@digia.com> (cherry picked from commit dde9569d389b4382e8869ac48f942adb3c51ade7) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Doc: Correcting qhp link to Qt SQL's C++ Classes.Jerome Pasion2012-12-181-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-28579 Change-Id: I0faae04ab125236554cb39659169780e2ab64629 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> (cherry picked from commit 7d685afe5d9f2055dc24d5a978355893c8183758) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Doc: Correcting qhp link to Qt GUI C++ API.Jerome Pasion2012-12-181-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-28579 Change-Id: I224d55adc1be77138237da4efcac01641964c06b Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> (cherry picked from commit 771e29178d792274bd122e68c71a97eced2aafe4) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Doc: Moved content from qtdocVenugopal Shivashankar2012-12-184-2/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | - The qdoc pages were related to qtcore and they were referring to snippets inside the qtcore module boundary. - Fixed the exampledirs for QtCore to include the examples that are referred by the \snippet instances in the moved qdoc pages work. Change-Id: Ibb6dbb131920ea8692a203f6145863e5012e4602 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> (cherry picked from commit 69e602941112da325b1154e0dc52714bc27a2cc8) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Fix styleName support in QPA font databaseJiang Jiang2012-12-149-41/+37
| | | | | | | | | | | | | | | | | | | | Font styleName support was disconnected since Qt switched to QPA fontdatabase. Now add the code from Qt 4.8 back to enable this in QPA. Change-Id: Iab2cbfd5468f87542183348c2123ca4b2c270692 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> (cherry picked from commit fa7661d8b25fa338649a301010e1b5a2b63da731)
| * Mac: fix bugs for font selection in QFontDialogLiang Qi2012-12-142-11/+7
| | | | | | | | | | | | | | | | | | | | Use localized family name and style name when selecting font with non-English locale Task-number: QTBUG-27415 Change-Id: Ie81507ed011fc096e0f5edad146e97c392e86494 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> (cherry picked from commit 3c09f6bc9aee0c97427fe8da6efdc73b4ac473aa)
| * Fix QGtkPainter::reset() to reset the clip rectJ-P Nurmi2012-12-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to preparation for GTK3 support, QGtkStyle::drawXxx() no longer creates a local instance of QGtkPainter upon every call, but QGtkStylePrivate::gtkPainter() will (in the future) dynamically choose between QGtk[2|3]Painter. The same painter instance is now re-used between the calls, but wasn't properly reseted between. Task-number: QTBUG-28557 Change-Id: I29be318dbb54d97ed23dfb88d406a3a833db4369 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> (cherry picked from commit 0b0b74a563d1513e7857000526d5c0fa462ff6af) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | QDoc: Fix warning - unused variableFrederik Gladhorn2012-12-191-1/+1
| | | | | | | | | | Change-Id: Id4068e1a1fcfad8fb3cc9174f995cb2b73b6e194 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Fix linking ANGLE on MinGW-w64 32-bitJonathan Liu2012-12-197-2/+449
| | | | | | | | | | | | | | | | | | MinGW-w64 32-bit requires the functions exported in the .def file to be decorated. Change-Id: I174a92829706a9fb6b0007b2c057300bd69e6d9e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Change ftp.qt.nokia.com -> ftp.qt-project.orgSergio Ahumada2012-12-183-4/+4
| | | | | | | | | | | | Task-number: QTBUG-28156 Change-Id: I0060144f0336791933205355b125251ccba73b3e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Qt Gui Examples: Fixed QDoc filesChristiaan Janssen2012-12-181-2/+3
| | | | | | | | | | Change-Id: I160d8d186a1078f20f2b779bfbdae90459c27641 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Accessibility indexes are no longer 1-based.Frederik Gladhorn2012-12-181-5/+5
| | | | | | | | | | | | | | | | | | | | The updates for focus/selection in QTreeView were still adding +1 as it was required in Qt 4. Task-number: QTBUG-28174 Change-Id: Ib9fea7e20d431a0ef0db18494e7bdda06a0646b0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | ANGLE: Fix typedefs for Win64Jonathan Liu2012-12-182-0/+45
| | | | | | | | | | | | | | | | | | The long int type is incorrect for Windows 64-bit as LLP64 is used there. Change-Id: If4ccf49d6bb0cd7ba4ff2997cebfdbe5e7e9711c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Accessibility Linux: Prevent access to invalid interfacesFrederik Gladhorn2012-12-181-5/+20
| | | | | | | | | | | | | | | | | | | | | | Especially with the newer QML accessibility we can end up with events for objects that cannot instantiate a QAccessibleInterface. Let's not crash in that case. Change-Id: Ie5d38315f32d30540eb4adcb74a7b3bfa667f03f Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Do not build dlldata.c in static buildsMiikka Heikkinen2012-12-181-2/+6
| | | | | | | | | | | | | | | | | | | | Symbols in dlldata.c conflict with symbols defined in ActiveQt when linking Windows platform plugin statically into same binary. Fixed by not building dlldata.c when building static library. Task-number: QTBUG-28645 Change-Id: Ibc5928124ad6e1fde2a1fa761ada4f345eb65a20 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Fix direct compilation of qtypeinfo.h and othersThiago Macieira2012-12-183-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qtypeinfo.h is included by qglobal.h, so it needs to include that before the #ifdef. Otherwise, we get a circular dependency problem with qflags.h: ./QtCore/../../src/corelib/global/qflags.h:60:27: error: "Q_PRIMITIVE_TYPE" has not been declared Also, take the opportunity to fix the other headers that are included from qglobal.h to avoid similar problems in the future. Change-Id: I99a56f42775c24bdcc796995b06509c1ca0cb849 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Blackberry: Reset virtual keyboard when shown.Sergio Martins2012-12-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The keyboard mode is shared between applications. You can reproduce this bug by clicking on a spin box, it will open a number only keyboard, then close the application and run an application that shows a text edit: a number only keyboard will appear. PPS keyboard already does this. Change-Id: Ia22e96ce13ad0cec1fd3b43fcdf4d03abfc25134 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Initalize the printinfo on Mac if it requests and it needs initalizingAndy Shaw2012-12-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | When the print panel was closed then it would clean up the printinfo and if it was requested for the same QPrinter then it would not be recreated in time. Therefore we check if it is initalized and if not we re-initalize it. Task-number: QTBUG-28657 Change-Id: I7dc9011b80e03cfa3eae8fee2fcf6cc8021a8566 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Delete the QSlotObject when disconnect()ingGiuseppe D'Angelo2012-12-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When disconnect()ing through a QMetaObject::Connection, if the QObjectPrivate::Connection contains a slot object, deref it, so that it will be destroyed before the next run of cleanConnectionList. Previously, a copy of the functor passed to connect() was kept until QObjectPrivate::cleanConnectionLists was called (by adding a new signal, or the sender was destroyed), even after a successful call to disconnect(). That is, we were keeping that copy allocated without any good reason. Change-Id: Ie6074ea797df1611cb995dec07c5b5a742360833 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Reset the QMetaObject::Connection dptr when disconnect()ingGiuseppe D'Angelo2012-12-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | The QObjectPrivate::Connection refcount was not decreased when disconnect()ing, therefore it was kept alive by the owning QMetaObject::Connection object. This removes a leak in case the QMetaObject::Connection survives the sender object, after a successful disconnect(). Change-Id: Ie2ea59b269a0e589ae23c1457df7533be77c0797 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Doc: Correcting qhp link to Qt SQL's C++ Classes.Jerome Pasion2012-12-171-1/+1
| | | | | | | | | | | | Task-number: QTBUG-28579 Change-Id: I0faae04ab125236554cb39659169780e2ab64629 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | Doc: Correcting qhp link to Qt GUI C++ API.Jerome Pasion2012-12-171-1/+1
| | | | | | | | | | | | Task-number: QTBUG-28579 Change-Id: I224d55adc1be77138237da4efcac01641964c06b Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | remove more symbian vestigesOswald Buddenhagen2012-12-171-10/+0
| | | | | | | | | | | | Change-Id: Ib875202b77193c474bbbd411a7bd0065b26996e9 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | remove obsolete DEPENDPATH assignmentsOswald Buddenhagen2012-12-173-14/+0
| | | | | | | | | | | | | | | | qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: Ie57cf05c369e21b5b9e099b6ce9be4f75da1508f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-171-1/+1
| | | | | | | | | | | | | | | | qt is already added by spec_pre.prf, warn_on and depend_includepath by default_pre.prf. Change-Id: Ic00e0ba496d698ed9659c476f2ca99fc0f86a093 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Add a Q_ENUMS for MeasurementSystemmfekari2012-12-171-0/+1
| | | | | | | | | | | | Change-Id: Ib60de407f7ec8df907884ad2cf2fbf8e7b2c02f4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Rename conflicting symbol QVariantToVARIANTMiikka Heikkinen2012-12-173-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears this method has been copied from ActiveQt. When building Qt statically, linking Windows platform plugin into any application that also uses ActiveQt will cause error about duplicate symbol. Renamed QVariantToVARIANT to QVariant2VARIANT to avoid conflicts. Renaming is done here rather than ActiveQt, as that symbol is in exported header in ActiveQt. Task-number: QTBUG-28645 Change-Id: Id0d7fc51d4455b463515e7c6178798ad61217c35 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Windows: Remove warning when creating QWindowJonathan Liu2012-12-171-1/+0
| | | | | | | | | | | | Change-Id: I63c76710ab84c88ba8b4b6f24e6161ae2db77a5f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Fix focusproxy-relayed crash in QGraphicsItem destructor.Andreas Aardal Hanssen2012-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes tst_qgraphicsitem::tst_focusProxyDeletion not crash. valgrind reported the error when running tst_qgraphicsitem. The crash was very real; when deleting an item that has another item as a focus proxy, the proxy still had a reference to the deleted item's focusProxy pointer. I'm not a huge fan of whitebox testing but thought this crash justifies a modification of the test to make it fail, instead of just passing silently with a warning only given by valgrind and friends. FTR the reason the test doesn't crash hard is that the memory is freed but not reused within the scope of the test. So the access to the pointer d_ptr->focusProxy succeeds, it just accesses memory that might as well have been reclaimed. But this is quite undefined... Task-number: QTBUG-28321 Change-Id: I2624631f5e5c2a8aa8bd4efe1fc128eba6c61f56 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | ANGLE: Always use DEF_FILE on WindowsJonathan Liu2012-12-172-2/+2
| | | | | | | | | | | | | | | | | | | | Building ANGLE with MinGW results in too many symbols being exported in the DLLs. Always use DEF_FILE on Windows to limit the symbols exported and eliminate symbol conflicts when libEGL/libGLESv2 is linked by other libraries that include their own version of ANGLE (e.g. QtWebKit). Change-Id: I7bb1f90d9996eabf30095323e9399efa1c23e3a1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Cocoa: make accessibility hit test not crashMorten Johan Sørvig2012-12-161-0/+4
| | | | | | | | | | | | | | | | | | Check if the accessibility element is valid before calling childAt. Change-Id: Id63c11f18b262c3c3a839db8ee2d11c0d7adc822 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Accessibility: Activate in QGuiApp instead of QApp.Frederik Gladhorn2012-12-162-4/+4
| | | | | | | | | | | | | | | | This makes it possible to use accessibility with QQuickWindow. Change-Id: I5fccd5f25021c4953b03e146705f48a198dbaaa7 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Do not inform that a widget is not visible when it's disabled.José Millán Soto2012-12-161-2/+0
| | | | | | | | | | | | Change-Id: I561c8ef4c25dde8eb24260a46d284ca10cbf074d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Handle disabled state changeJosé Millán Soto2012-12-161-0/+7
| | | | | | | | | | | | | | | | Modified AtSpiAdaptor::notify to handle enabling and disabling widgets. Change-Id: I9a23f74d891aaf123d7fc094bdf63e384e1d65fe Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Call QAccessible::updateAccessibility when caret moves in QTextEditJosé Millán Soto2012-12-163-1/+16
| | | | | | | | | | Change-Id: I3b9e5d8e67b4928558b642a4d23aa60ae9dfde60 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Implemented AtSpiAdaptor::notifyStateChangeJosé Millán Soto2012-12-152-15/+15
| | | | | | | | | | | | | | | | | | Adding a new private method to simplify notifying that the state has changed as it is something that is frequently done in AtSpiAdaptor::notify Change-Id: Idf21715b5d20212adb301ae9bca05f1edfc19946 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Remove the timestamp info in genarated filesLiang Qi2012-12-153-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | For moc, rcc and uic, then it's friendly for tools like ccache. ccache is using md5 to check file modification, but the different timestamp info will cause different md5 for same meaningful contents, it will disabled ccache. Updated the autotest for uic and rcc. Task-number: QTBUG-26589 Change-Id: I9f1dcf6cd826ad9603af6e183757bcd748c32bd1 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Clean up Q_WS_WINDebao Zhang2012-12-141-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | The first branch is required to MSVC. The bitfield isn't large enough to represent all possible enum values of Virtualness for MSVC. In addition, using bitfield is a premature optimisation in this case. So remove them. Change-Id: I4c5f85271d2bca1411426e6a321a795a7e783aff Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | QSettings docs: replace Q_WS_MAC with Q_OS_MACDebao Zhang2012-12-141-1/+1
| | | | | | | | | | Change-Id: I158ac697dea1792c1d608ebaff77388cfa343999 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Docu: fix non-ascii character where "i" was expectedDavid Faure2012-12-141-1/+1
| | | | | | | | | | Change-Id: I540c530441ad184efe4e1ecc83bf99aa97c6a028 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Ensure the native filedialog starts up with the right directoryAndy Shaw2012-12-141-3/+3
| | | | | | | | | | | | | | | | | | | | On Mac it was not starting the dialog with the specified directory when one was present. If a filename was given as well then it would start up fine. Task-number: QTBUG-28161 Change-Id: I7cce0d065dd57e6433ce62380d4263d6e20b6e7c Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Mark the QDesktopServices::StorageLocation enum as obsolete in the docsAndy Shaw2012-12-141-0/+2
| | | | | | | | | | | | | | | | The enum was already deprecated but the documentation still listed it so now it is correctly obsoleted. Change-Id: I9d64fe58a5e70de7161928da2d09b4532d450274 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Fixed invalid memory read in SSSE3 image blending code.Samuel Rødal2012-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | We need to do bounds comparison on the actual offset we're going to use with _mm_load_si128 to read 16 bytes from memory (even though we won't use the trailing bytes in the end). Task-number: QTBUG-28324 Change-Id: Id0d6094da796ca67338d8ad225fa6b2f309bbe6e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Doc: entered hardcoded url for StatechartsNico Vertriest2012-12-141-1/+1
| | | | | | | | | | | | | | | | Corrected in statemachine.qdoc Task-number: QTBUG-27512 Change-Id: I5fa8b7fd39a4c3569e2652b9a60ba4426090a398 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Implicit conversion of shortcuts to string is gone.Frederik Gladhorn2012-12-141-1/+1
| | | | | | | | | | | | | | | | This only effects compilation with DEBUG_QSHORTCUTMAP. Change-Id: I184e644f2165049336cee8a6ac63a3301cf4c849 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Doc: Moved content from qtdocVenugopal Shivashankar2012-12-144-2/+293
| | | | | | | | | | | | | | | | | | | | | | - The qdoc pages were related to qtcore and they were referring to snippets inside the qtcore module boundary. - Fixed the exampledirs for QtCore to include the examples that are referred by the \snippet instances in the moved qdoc pages work. Change-Id: Ibb6dbb131920ea8692a203f6145863e5012e4602 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Remove unused private member.Frederik Gladhorn2012-12-141-2/+0
| | | | | | | | | | | | Change-Id: I54f3f748763dd5959552df864af38558c136dc87 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 20:38:53 +0000