summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* | 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>
* | Doc: Fixed online HTML templateJerome Pasion2012-12-031-1/+1
| | | | | | | | | | | | | | -missing a slash Change-Id: I866e7438fe67a7a78eefa57379a8d5cd99537a66 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | Stop using the name "Trolltech" in QSettingsSergio Ahumada2012-12-0313-27/+27
|/ | | | | | | | | 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>
* centralize doc target related codeOswald Buddenhagen2012-12-025-53/+48
| | | | | | | Change-Id: I710a7f2fc3422ec8ba5b8e90bfd92e7931092ad0 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* resolve private dependencies of tools as wellOswald Buddenhagen2012-12-021-1/+2
| | | | | | Change-Id: I25c73661489f0a6e6ecf3bb423cdae6435221e25 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* [QTBUG-27420] Make Q{Box,Grid,Form}Layout::takeAt() unparent a nested layoutMarc Mutz2012-12-026-5/+93
| | | | | | | | | | | 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 string lengthPeter Kümmel2012-12-011-2/+2
| | | | | Change-Id: Ic10aed6fc59d2518583caf78848711bdc97b4665 Reviewed-by: Thiago Macieira <thiago.macieira@intel.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>
* Improve auto-test of QFile.Friedemann Kleint2012-12-011-158/+166
| | | | | | | | | | | | | Execute the test in a temporary directory, purge remaining files except the special readonly-files in cleanup(). Avoid repeated invocation of QFINDTESTDATA() by assigning to member variables. Do more checks in rename(), check on contents of file. Generally, use more QVERIFY2, print error messages. Task-number: QTBUG-3570 Change-Id: Ibd0e11a361208a716ea3efbcca76adeda70e061a Reviewed-by: David Faure (KDE) <faure@kde.org>
* 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>
* Properly release pixel format and context in QCocoaGLContext.Zeno Albisser2012-12-012-0/+8
| | | | | Change-Id: Idd13924dccc8d7798f463484eeb3c3074f7b51f1 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Basic high-dpi "retina" support for Qt 5.Morten Johan Sørvig2012-12-0150-118/+933
| | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 5 on par with Qt 4, prepare for more comprehensive support later on. Introduce device independent pixels (dips), device pixels, and devicePixelRatio. Add high-dpi support to QPainter, QGLWidget, the cocoa platform plugin, mac and fusion styles. Dips are similar to CSS pixels, Apple points and Android density-independent pixels. Device pixels are pixels in the backing store/physical pixels on screen. devicePixelRatio is the ratio between them, which is 1.0 on standard displays and 2.0 on "retina" displays. New API: QImage::devicePixelRatio() and setDevicePixelRatio() QPixmap::devicePixelRatio() and setDevicePixelRatio() QWindow::devicePixelRatio() QScreen::devicePixelRatio() QGuiApplicaiton::devicePixelRatio() Change-Id: If98c3ca9bfdf0e1bdbcf7574cd5b912c9ff63856 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* QWidget windows have fullscreen button by default; manual test for itShawn Rutledge2012-12-016-8/+19
| | | | | | | | | | It's again possible for QWindows and widget windows to go into fullscreen mode on the Mac. Change-Id: I7b304a135838394ef0392f89be4f225f2949fad3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Cocoa: Disable accessibility.Morten Johan Sørvig2012-12-018-3/+28
| | | | | | | | | The accessibility implementation is unstable and causes application crashes. Disable until it has been stabilized. Change-Id: Ic34361a0ad599c6f92df722499d274fe0655646b Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Docs: Fixed enum and parameter links for networkOliver Wolff2012-12-013-4/+4
| | | | | Change-Id: Ie04e09d91e9b0781dc3bcbfe271c851fbe486849 Reviewed-by: David Schulz <david.schulz@digia.com>
* Renamed the keyboard-focus doc to make clear it's about WidgetsShawn Rutledge2012-12-016-6/+7
| | | | | | | Also link from the widgets index page. Change-Id: I49cd415b09d7458d89d75931ecfaafe29c226c6f Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Added \ingroup and \brief qdoc tags to IPC examples.Samuel Rødal2012-12-013-0/+7
| | | | | Change-Id: Ic8fb033597340bfb44ee7e0ca7a3763b36c097aa Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Mac: Fix small button metrics, menu indicator alignmentGabriel de Dietrich2012-12-011-2/+6
| | | | | | Task-number: QTBUG-28275 Change-Id: I08de3cc7fee3af725c66ed081072277b2ca32601 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* ANGLE: Fix debug-and-release buildsFriedemann Kleint2012-12-0116-23/+251
| | | | | | | | | | | | | | | Add a 'd' to debug builds to allow both release and debug builds to be used. - Add .def-files for Debug - Build all libraries debug/release - Add description to README.qt - Differentiate debug/release in qmake.conf. Task-number: QTBUG-28196 Change-Id: Ib3081004a6ed2ad71d353244154684d2e0ebbc86 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Angle: Use dynamic runtime library of MSVC.Friedemann Kleint2012-12-011-4/+11
| | | | | | | | It is also used in Qt, mixing both is not recommended. Add to default variables instead of overwriting them. Change-Id: I895d44d5ea17f98dde9979eea6ff10b98180cc08 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Cocoa: fix modal native dialogs with ongoing modal sessionsTeemu Katajisto2012-12-013-0/+13
| | | | | | | | | | | | | Commit 26db7de13d5885067844532b5a5814181a0ddf16 introduced the modal session cleanup for Cocoa print dialog before running the modal event loop for the dialog. Add the same cleanup for Cocoa file, font and color dialog helpers. Task-number: QTBUG-28146 Change-Id: Ifeb7c82566db35f0c6654be7762e9aaffbafb900 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>