summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Updated CSS style for QML code snippetsJerome Pasion2012-12-052-2/+2
| | | | | | | -padding should be the same as C++ code snippet. Change-Id: Idba44d252f411f70b6957161b83626811c1c69f2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix compile with -DQT_NO_TRANSLATIONMontel Laurent2012-12-056-2/+12
| | | | | Change-Id: Ia6929f871485476e8b5bb14e7bf8117d0c562841 Reviewed-by: David Faure <david.faure@kdab.com>
* Make qtbase compile with QT_NO_IMAGEFORMATPLUGINv5.0.0-rc1Tasuku Suzuki2012-12-057-28/+38
| | | | | | Change-Id: I1fef96481fa902cfd9de63fa814f70412eee4d15 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Doc: Added a README file for building documentation.Jerome Pasion2012-12-051-0/+109
| | | | | | Change-Id: I5987af88f7e8efc1b3c4fb788e5fd985e53b08a1 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: Added documentation for the collidingmice exampleVenugopal Shivashankar2012-12-052-0/+271
| | | | | | | Task-number: QTBUG-27515 Change-Id: I1bc11d381c0ea8f6ef7ea32093d7e981ca9db91e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Fix some more linksChristian Stenger2012-12-052-2/+3
| | | | | Change-Id: I94c853532cd3ed9bf18e6d471f99560e04131fdf Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Enable network build with QT_NO_NETWORKPROXYTasuku Suzuki2012-12-051-0/+2
| | | | | | Change-Id: Id26f0b45959ab3ee2390ea2d3e0d4ec321029e5c Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix compile with -DQT_NO_WHEELEVENTMontel Laurent2012-12-0510-0/+20
| | | | | Change-Id: Icc345e2a361fc233d7debfa88bef2a3a8375fa8f Reviewed-by: David Faure <david.faure@kdab.com>
* Fix compile with -DQT_NO_DRAGANDDROPMontel Laurent2012-12-053-0/+8
| | | | | Change-Id: Ic7b42ae164f913f270c8350c2de6ce35f0be8c2a Reviewed-by: David Faure <david.faure@kdab.com>
* compile with QT_NO_TOOLTIPMontel Laurent2012-12-051-0/+3
| | | | | Change-Id: I9e769a343a9dd74dc80cffebfe9ad97981596036 Reviewed-by: David Faure <david.faure@kdab.com>
* QtBase: Doc: Replacing link with snippet in QTranslator.David Schulz2012-12-052-3/+60
| | | | | | | | Because the linguist examples are moved to qttools module, a link to the hellotr example broke. Change-Id: I2aeefc143578618396f5be38ed1d52afdd1f7436 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Fixed crash in tst_qguiapplication with QT_QPA_PLATFORM=minimalSamuel Rødal2012-12-051-1/+2
| | | | | | | | | | | The tst_qguiapplication creates and destroys multiple instances of QGuiApplication. Since the minimal platform plugin doesn't report any theme names, the platform_theme never gets set to 0 in init_platform, and we end up trying to use or at least delete an already deleted QPlatformTheme. Change-Id: I1a41d55b0705c5531c019e60a7a96dac144bacb7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Remove QUUID_STRING from qfeatures.{h,txt}Tasuku Suzuki2012-12-058-41/+1
| | | | | | | It is too specific and relatively small Change-Id: I55ec15ecaac0692741996a5c15a111db696490cf Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fix typos and style in QSplitter documentationDavid Gil2012-12-051-18/+17
| | | | | | Change-Id: Ieacbfd06067ae1ca687030204125814bd9e48bd8 Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Change copyrights from Nokia to DigiaSergio Ahumada2012-12-0520-20/+20
| | | | | Change-Id: I841f4e6a6ee90cb3df1ff8f60c55ac84f6dd4125 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QtBase: Added qtlinguist as a dependencie to the doc.David Schulz2012-12-041-1/+1
| | | | | Change-Id: I2df1cee84b250b75dc8436c8cff5df50cbeb0e01 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* QWindowsFontDatabase: provide better fallbackFamilies.Pierre Rossi2012-12-041-74/+87
| | | | | | | | | | | Borrowed some code from QWindowsFontDatabase::createEngine that will help ensure our fallback options are thorough enough to display say chinese glyphs when using the QRawFont + QTextLayout combination that QtWebKit relies on. Task-number: QTWEBKIT-383 Change-Id: Ie4c1d5ef7d58588afaa436c89a9575ffd646c314 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QPluginLoader: fix loading of plugins with a relative file nameDavid Faure2012-12-048-55/+148
| | | | | | | | | | | This makes QT_PLUGIN_PATH / QCoreApplication::libraryPaths() actually work, as a search path for plugins, when apps look for a specific plugin by name. To make it possible to write portable code (unlike the current QPluginLoader unittest), let QPluginLoader figure out the extension, too. Change-Id: I895d597d7cb05ded268734bc5f313f32d8d12cb9 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Ensure ctrl + click sends a right mouse button press in CocoaAndy Shaw2012-12-042-2/+15
| | | | | | | | | | | Since Mac's typically just have one button for their mice then pressing Control then clicking the button should end it as a right mouse button event. Task-number: QTBUG-28350 Change-Id: Iabcac5b315c36cb8cd062c27d7b1506bc066f5bb Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Fix some typos in QProcess and QSslSocket unit tests.Stephen Kelly2012-12-042-3/+2
| | | | | | | | The QSslSocket one is both wrong and redundant as there is a Q_DECLARE_METATYPE for it already. Change-Id: I63d065abfb3d0e3d82a8b1f29a6752b7676db847 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Move Network Examples from qtdoc to qtbaseEskil Abrahamsen Blomfeldt2012-12-0416-0/+82
| | | | | | | | | Move the main example overview and use the \group tag convention to make the list update automatically. Change-Id: Ib2cc8cf7def9a7f3dce6b7ed6d4958771cbdf5cd Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* remove pointless QT.<module>.sources referencesOswald Buddenhagen2012-12-044-5/+5
| | | | | | | | there is no point to use this for in-module references. cleaning it out in an attempt to purge the constants entirely. Change-Id: I1da4d70e3778257dd43eda0bdfc71eaec1124732 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless zlib includesOswald Buddenhagen2012-12-042-2/+0
| | | | | Change-Id: I352f6f9626c012c39ac97163ac83b3e24a9e9c7a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless directory referencesOswald Buddenhagen2012-12-041-7/+7
| | | | | Change-Id: Ice43a3d3eeab5ada35e1439e055eb7b709d66c83 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* properly syncqt-ize harfbuzz headersOswald Buddenhagen2012-12-0416-28/+8
| | | | | | | | | we were already installing them into QtCore/private, so turn them into proper private headers to start with. this cleans up our project files. Change-Id: I0795f79e03b60b5854de9e4dc339e9b5a5e6fd87 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* support flagging all headers from a particular source directory as privatesOswald Buddenhagen2012-12-041-2/+4
| | | | | Change-Id: Ia893abc95b358d8a8ffd690563f2f02bc20fd98d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix support for multiple source directories per moduleOswald Buddenhagen2012-12-041-3/+4
| | | | | | Change-Id: I040cb928e016c3a8257a1bcbf20627d67f07c84d Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove vestiges of QT_MODULE() checking codeOswald Buddenhagen2012-12-042-7/+0
| | | | | Change-Id: Icf863c3ca7218af54cb5698d848db786d49481cc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qregexp benchmark needs exceptionsOswald Buddenhagen2012-12-041-1/+1
| | | | | Change-Id: I3833345a09e49899c256b4410783b6a08111c4a0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix warning about cast from ASCII.Friedemann Kleint2012-12-041-1/+1
| | | | | Change-Id: Icc251a8d26db022077c84ff2d0911868b56c9fd6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* duplicate URL example image for the dbus index docShawn Rutledge2012-12-041-0/+0
| | | | | Change-Id: Icd25711e4ede9fd3292d087103402f25a755d102 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* doc: Fix snippets in threading docsEskil Abrahamsen Blomfeldt2012-12-041-9/+9
| | | | | | | | | | | | The examples have been put under examples/widgets which is probably not correct, since they don't even have gui. The correct fix would probably be to move them into threads/, but that would risk a lot of breakage, so the conservative work-around is just to use the correct relative paths instead. Change-Id: I36c3aa45056c8825d1991f345ad7d7799e2fa5fc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Moved the mainwindow examples from qtdocGunnar Sletta2012-12-049-0/+22
| | | | | Change-Id: I5a11933e86c6c71f68a55e45c7bcfdfc702bf4e6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* QNX: Fix plugin compilationRafael Roquetto2012-12-041-1/+1
| | | | | | | | | Fix the plugin compilation after cd34da54269e6cd7fa5c18242d982736f022a14a renamed the QWindow API. Change-Id: I3ec4ce9ae2df9a66f6bf24a18277bc59c05d2e8e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Fix linking of itemviews and graphicsview examplesChristian Stenger2012-12-0431-26/+70
| | | | | Change-Id: I6905cc6945e2eb396108f9fb16da042e576e3afb Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Clear focus of GraphicsItem focus scopes and their children.Andrew den Exter2012-12-042-3/+48
| | | | | | | | | | A focus scope has effective focus if one of its children is the focus item, clearFocus() should remove effective focus from an item and its children not just from the focus item. Task-number: QTBUG-28328 Change-Id: I62a292eff000151e50b2f5221e22f326a380fc3a Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Compile with QT_NO_GESTURES.Volker Krause2012-12-031-1/+1
| | | | | Change-Id: I9f8f7c586ccb5de227ec42af44159af90b39d1dd Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Mac: fix regression to make dialog resizableLiang Qi2012-12-031-2/+2
| | | | | | | Task-number: QTBUG-28254 Change-Id: I8623a68d589bec17042935ad308f85ddc953540d Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Qt D-Bus: Editing QCH titles.Jerome Pasion2012-12-031-2/+3
| | | | | | Task-number: QTBUG-28341 Change-Id: Icf0f87e8c108bc12575512b7e4ecac46779fc362 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Merge branch 'master' into stableOswald Buddenhagen2012-12-0311-34/+24
|\ | | | | | | Change-Id: I5c0c9a131cca64fea3bc784339d14d84076edc1a
| * don't forget to export rpath_link{,_private} to the cacheOswald Buddenhagen2012-12-031-0/+1
| | | | | | | | | | | | Change-Id: I1d204696ed0e4ef5e45dc1716b3d6a8224b3169b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * remove support for hand-written module pri filesOswald Buddenhagen2012-12-032-24/+1
| | | | | | | | | | | | | | | | all modules have been migrated to auto-generation Change-Id: Ie7b3ebfd735a22f8e0b0339909b6385508d7a6b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * don't auto-install example sources by default for all modulesOswald Buddenhagen2012-12-032-1/+1
| | | | | | | | | | | | | | | | | | turns out that some modules need a lot of work, so make it opt-in for the time being. Change-Id: I16365e3d96adab98a1bc748907dbd67488dfad5f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * auto-collect qml-related sourcesOswald Buddenhagen2012-12-031-0/+5
| | | | | | | | | | | | | | Change-Id: Ia5b56227c2c1f18254d35f6105ac3a146f085e3b Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * factor out testcase_targets.prfOswald Buddenhagen2012-12-033-9/+10
| | | | | | | | | | | | | | | | | | instead of letting *every* qmake-based project have recursive check target, let interested projects "subscribe" to it by adding CONFIG+=testcase_targets in a central place (.qmake.conf, which Qt itself does via qt_build_config.prf). Change-Id: Ib13fdd2d3a1adee0c5ad02b6b176a664c583bf9d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Compile with QT_NO_COLORDIALOG.Volker Krause2012-12-031-0/+2
| | | | | | | | | | Change-Id: I37e3fed497f3595942662efb22114de57ea4c9db Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * WINCE: Fix missing cosfAndreas Holzammer2012-12-032-0/+4
| | | | | | | | | | | | | | | | | | cosf seems to be defined in the cmath header for Windows CE, so include it to fix the issue of not finding the symbol cosf. Change-Id: I7317668838912325d45be0d4087ae3055940d3cd Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Doc: Edited Qt OpenGL configuration to output correct QCH titles.Jerome Pasion2012-12-031-2/+3
| | | | | | | | | | | | Task-number: QTBUG-28341 Change-Id: I7d990c66a9efe42719165564007fb3bdff2e1279 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Tag dialog examples and create dialog examples groupGunnar Sletta2012-12-0310-0/+25
| | | | | | | | | | Change-Id: I0049b841dd5aee806e8aed36af069b0507e3c9f1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | introduce QMAKE_RPATHLINKDIR (and QMAKE_LFLAGS_RPATHLINK)Oswald Buddenhagen2012-12-033-3/+12
| | | | | | | | | | | | | | | | | | complementary to QMAKE_RPATHDIR. this avoids that we need to sprinkle linux/gcc specific code all over the place. Task-number: QTBUG-27427 Change-Id: Iebafd1749d1a0d803704902473df8c743f074ddc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>