summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QtWidgets docs: use WinVista screenshots instead of obsolescent WinXPJ-P Nurmi2012-12-0621-45/+45
| | | | | Change-Id: Ic7fd291d4ce4468ae12cf5dd102fbcc45387dd87 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Adjust qttestlib.qdocconf to create qttestlib/examples-manifest.xmlhjk2012-12-061-18/+18
| | | | | | Change-Id: I6c4c8d9b69f135229bd0bd28e8e57738742f6bd8 Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* doc: Avoid duplicate widget example entriesEskil Abrahamsen Blomfeldt2012-12-061-2/+1
| | | | | | | | | | | | | | The link to widget examples in QtCore was added in 4519d810d1d2be3af17bdd77edac2361620f9d2d, which made widget examples pop up twice in generated lists (once for qtcore and once for qtwidgets documentation). I'm not sure why it was originally added to that module, but the snippets in the fridgemagnets example (which was the example fixed in the commit) has been verified to still work. Change-Id: I1b349f08349b5499929315d426224ba8638adc8e Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* QtBase: Doc: Fix links to STL-style iteratorsDavid Schulz2012-12-0612-63/+63
| | | | | Change-Id: I2822c2a7e9bfc1949c20ff81e08961f641e961fb Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* export only 'host_bins' to pkg-config, rather than a random selection of toolsOswald Buddenhagen2012-12-062-29/+6
| | | | | | | | | | | | | | | | | | | | | | the "export location" of the linguist tools was just bogus, and lconvert was missing anyway. the two dbus tools and qdoc were missing, too. generally, it seems useless to report the paths of some random tools - instead, just report the install location of the host binaries and let users figure out the complete paths themselves - this should be ok, as we decided that distributors are not supposed to do tool renaming any more. for the binary path just use the final location, as the files won't be used before installation anyway. this allows us removing the scary generic prefix replace from the pc file installs. and as a side effect this also fixes debug_and_release builds of core and widgets by not loading various prf files prematurely and thereby messing up the dir replacement magic. Task-number: QTBUG-28286 Change-Id: I99de419301fc07fb923959db4bd5cab9072d1c31 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove the TRUE and FALSE macrosDavid Faure2012-12-061-11/+0
| | | | | | | | | | They are completely unused in Qt, and are a potential source of compilation errors in application code. Change-Id: I6dfe2891f3b2365a30048f99c31e8e3a2425e62b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* doc: Fix Graphics View example docsEskil Abrahamsen Blomfeldt2012-12-061-1/+12
| | | | | | | | | | | Make the same layout of the new graphics view example documentation as we had before (except by using annotatedlist instead of hardcoding the links). I've also moved four examples from qtdoc to qtbase so that they can be included in this documentation. Change-Id: Ic2202ade119cadd98d036f1bd77e91dae49b5677 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix: Do not require GL library if configured with -no-openglaavit2012-12-061-1/+1
| | | | | | | | qt_lib_gui.pri would add an unneeded -lGL, causing the build to fail on systems with no GL libraries. Change-Id: I3a49418e1393642e9d97999b79741cc2144a99af Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* qdoc: Make extraimages behave like styles and scriptsMartin Smith2012-12-051-3/+3
| | | | | | | | | | This configuration variable now assumes its values, if relative, are relative to the config file that contains the extraimages variable. Task-number: QTBUG-28307 Change-Id: I9b34d1f456b31e36ac77401b957b68cd10590376 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Cocoa: fix unresponsive dialogs causes application to hangRichard Moe Gustavsen2012-12-051-8/+10
| | | | | | | | | | | | | | | | | | | | | The reason for this bug seems to be related to how we wait for more events in the event dispatcher. We use the nextEventMatchingMask function, which already in Qt4 showed to have problems when telling it to not dequeue the event. The solution back then was to tell it to dequeue the event, and instead repost in front again. Why this was changed in Qt5 is uncertain (other than it being tempting) but moving the same code back in will solve the bug. Note that this bug might also stem from the fact that the run loop sources we add in the event dispatcher fires before the application is really ready to show modal dialogs. E.g refusing to execute a modal dialog before NSAppDelegate applicationWillFinishLaunching is called will also fix the problem. But this code change is to big atm, and can easily introduce other unforeseen regressions. Task-number: QTBUG-28283 Change-Id: I07cd109568c2b9c782cf5120a9eb2ac71128cada Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* qdoc: Don't include inherited members in the class refMartin Smith2012-12-054-78/+96
| | | | | | | | | | | | | | | | | | | | | | | | Once upon a time, the inherited functions, signals, slots, etc were not listed on the class reference page, but they were counted and a link to the base class was provided for them, eg: 2 public functions inherited from QAbstractListModel 39 public functions inherited from QAbstractItemModel 31 public functions inherited from QObject Somehow, this got broken, so that all these inherited things were listed on the class reference page as if they were members of the class. But they liunked to the documentation in the base class. This now works correctly again. It simnplifies the class reference pages a lot. Task-number: QTBUG-27496 Change-Id: If493da8cbf81634f1344b12094d9a06f8528e8e5 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.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: Fix some more linksChristian Stenger2012-12-051-1/+2
| | | | | 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>
* 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-044-49/+118
| | | | | | | | | | | 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>
* Move Network Examples from qtdoc to qtbaseEskil Abrahamsen Blomfeldt2012-12-042-0/+68
| | | | | | | | | 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 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-049-16/+2
| | | | | | | | | 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>
* 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-042-0/+15
| | | | | 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-043-1/+28
| | | | | Change-Id: I6905cc6945e2eb396108f9fb16da042e576e3afb Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Clear focus of GraphicsItem focus scopes and their children.Andrew den Exter2012-12-041-3/+9
| | | | | | | | | | 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-033-0/+6
|\ | | | | | | Change-Id: I5c0c9a131cca64fea3bc784339d14d84076edc1a
| * 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-032-0/+17
| | | | | | | | | | Change-Id: I0049b841dd5aee806e8aed36af069b0507e3c9f1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | xcb: notify when the logical DPI changes; add Q_MM_PER_INCH constantShawn Rutledge2012-12-032-2/+7
| | | | | | | | | | Change-Id: I15696bf45ae99cc5b0fd95dab4884fc85cbfc6da Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Removed temporary backwards-compat properties and accessors in QWindowShawn Rutledge2012-12-034-40/+4
| | | | | | | | | | | | Change-Id: I718b877e3b6c0b1191a932d934599d5c2f5aa958 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Stop using the name "Trolltech" in QSettingsSergio Ahumada2012-12-034-8/+8
|/ | | | | | | | | Also change Trolltech for QtProject in other places Task-number: QTBUG-23269 Change-Id: Ie4e344f23cab77c575562d18b481b3369ce30491 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* [QTBUG-27420] Make Q{Box,Grid,Form}Layout::takeAt() unparent a nested layoutMarc Mutz2012-12-023-5/+23
| | | | | | | | | | | QStackedLayout doesn't have support for QLayout, only QWidget, so the issue doesn't arise there. Reported-by: Johannes Schaub Task-number: QTBUG-27420 Change-Id: I71f8d10a036918c16d8f8c9197a2ec61cd76cf01 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix wrong error message count in QDBusErrorPeter Kümmel2012-12-011-1/+1
| | | | | | | | | | Don't pass the pointer errorMessages_string - 1 to strcmp(). -1 marks the end should not be used for the pointer arithmetic in get(const char *name) Change-Id: I5ec239c63f074d104d441511294554f21fd6eccd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Cocoa: create dialogs as NSPanelsTeemu Katajisto2012-12-011-6/+10
| | | | | | | | | NSPanels have builtin support to work with modal sessions. Task-number: QTBUG-28111 Change-Id: Ifeb6de03129e77aad744b3989931964c375cdbc7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* QSignalSpy: assorted improvementsMarc Mutz2012-12-012-10/+13
| | | | | | | | | | | | | | | | - Add const - Add explicit (only effect under C++11; C++98 knows no multi-arg implicit conversions) - Add Q_DECL_OVERRIDE to qt_metacall reimplementation - Add reserve() calls on containers - Change 'args' from QList to QVector for a 2x memory reduction on 64bit platforms Change-Id: If6c779dac0499d4ab64e5191d37596edf7341f76 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Move gestures overview from qtdoc to qtbase; mention Qt QuickShawn Rutledge2012-12-014-9/+225
| | | | | | | | | | | | On the one hand this doc reads like an overview, but didn't mention Qt Quick; on the other, the gestures framework is questionable, and in any case is solidly in the widgets module, not reusable for Qt Quick. So, just added some comments at the end to make it clear that Qt Quick takes a different approach. Also changed the relevant links because the title has changed. Change-Id: I66a0c0c106f496de26fb8947e90826ef39ccfddd Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>