Gunnar Sletta [Mon, 3 Dec 2012 15:43:45 +0000 (16:43 +0100)]
Moved the mainwindow examples from qtdoc
Change-Id: I5a11933e86c6c71f68a55e45c7bcfdfc702bf4e6
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Rafael Roquetto [Mon, 3 Dec 2012 20:43:44 +0000 (18:43 -0200)]
QNX: Fix plugin compilation
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>
Christian Stenger [Fri, 30 Nov 2012 15:31:06 +0000 (16:31 +0100)]
Fix linking of itemviews and graphicsview examples
Change-Id: I6905cc6945e2eb396108f9fb16da042e576e3afb
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Andrew den Exter [Mon, 3 Dec 2012 07:03:02 +0000 (17:03 +1000)]
Clear focus of GraphicsItem focus scopes and their children.
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>
Volker Krause [Mon, 3 Dec 2012 12:17:55 +0000 (13:17 +0100)]
Compile with QT_NO_GESTURES.
Change-Id: I9f8f7c586ccb5de227ec42af44159af90b39d1dd
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Liang Qi [Fri, 30 Nov 2012 10:27:34 +0000 (11:27 +0100)]
Mac: fix regression to make dialog resizable
Task-number: QTBUG-28254
Change-Id: I8623a68d589bec17042935ad308f85ddc953540d
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Jerome Pasion [Mon, 3 Dec 2012 16:34:37 +0000 (17:34 +0100)]
Qt D-Bus: Editing QCH titles.
Task-number: QTBUG-28341
Change-Id: Icf0f87e8c108bc12575512b7e4ecac46779fc362
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Oswald Buddenhagen [Mon, 3 Dec 2012 20:57:28 +0000 (21:57 +0100)]
Merge branch 'master' into stable
Change-Id: I5c0c9a131cca64fea3bc784339d14d84076edc1a
Jerome Pasion [Mon, 3 Dec 2012 15:10:36 +0000 (16:10 +0100)]
Doc: Edited Qt OpenGL configuration to output correct QCH titles.
Task-number: QTBUG-28341
Change-Id: I7d990c66a9efe42719165564007fb3bdff2e1279
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Gunnar Sletta [Mon, 3 Dec 2012 14:11:51 +0000 (15:11 +0100)]
Tag dialog examples and create dialog examples group
Change-Id: I0049b841dd5aee806e8aed36af069b0507e3c9f1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Oswald Buddenhagen [Mon, 3 Dec 2012 11:34:37 +0000 (12:34 +0100)]
introduce QMAKE_RPATHLINKDIR (and QMAKE_LFLAGS_RPATHLINK)
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>
Oswald Buddenhagen [Sat, 1 Dec 2012 10:46:51 +0000 (11:46 +0100)]
don't forget to export rpath_link{,_private} to the cache
Change-Id: I1d204696ed0e4ef5e45dc1716b3d6a8224b3169b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 30 Nov 2012 20:16:25 +0000 (21:16 +0100)]
remove support for hand-written module pri files
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>
Oswald Buddenhagen [Fri, 30 Nov 2012 16:42:45 +0000 (17:42 +0100)]
don't auto-install example sources by default for all modules
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>
Oswald Buddenhagen [Fri, 30 Nov 2012 15:50:05 +0000 (16:50 +0100)]
auto-collect qml-related sources
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>
Oswald Buddenhagen [Tue, 27 Nov 2012 15:57:07 +0000 (16:57 +0100)]
factor out testcase_targets.prf
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>
Shawn Rutledge [Fri, 12 Oct 2012 15:33:51 +0000 (17:33 +0200)]
xcb: notify when the logical DPI changes; add Q_MM_PER_INCH constant
Change-Id: I15696bf45ae99cc5b0fd95dab4884fc85cbfc6da
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Shawn Rutledge [Fri, 30 Nov 2012 09:59:07 +0000 (10:59 +0100)]
Removed temporary backwards-compat properties and accessors in QWindow
Change-Id: I718b877e3b6c0b1191a932d934599d5c2f5aa958
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Volker Krause [Fri, 30 Nov 2012 14:09:56 +0000 (15:09 +0100)]
Compile with QT_NO_COLORDIALOG.
Change-Id: I37e3fed497f3595942662efb22114de57ea4c9db
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Jerome Pasion [Mon, 3 Dec 2012 10:09:42 +0000 (11:09 +0100)]
Doc: Fixed online HTML template
-missing a slash
Change-Id: I866e7438fe67a7a78eefa57379a8d5cd99537a66
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Andreas Holzammer [Fri, 30 Nov 2012 14:39:58 +0000 (15:39 +0100)]
WINCE: Fix missing cosf
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>
Sergio Ahumada [Sun, 2 Dec 2012 16:24:19 +0000 (17:24 +0100)]
Stop using the name "Trolltech" in QSettings
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>
Oswald Buddenhagen [Fri, 30 Nov 2012 20:07:47 +0000 (21:07 +0100)]
centralize doc target related code
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>
Oswald Buddenhagen [Fri, 30 Nov 2012 20:09:46 +0000 (21:09 +0100)]
resolve private dependencies of tools as well
Change-Id: I25c73661489f0a6e6ecf3bb423cdae6435221e25
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Marc Mutz [Sun, 21 Oct 2012 18:10:22 +0000 (20:10 +0200)]
[QTBUG-27420] Make Q{Box,Grid,Form}Layout::takeAt() unparent a nested layout
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>
Peter Kümmel [Sat, 1 Dec 2012 14:20:49 +0000 (15:20 +0100)]
Fix wrong string length
Change-Id: Ic10aed6fc59d2518583caf78848711bdc97b4665
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Peter Kümmel [Sat, 1 Dec 2012 10:32:50 +0000 (11:32 +0100)]
Fix wrong error message count in QDBusError
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>
Friedemann Kleint [Thu, 29 Nov 2012 11:59:35 +0000 (12:59 +0100)]
Improve auto-test of QFile.
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>
Teemu Katajisto [Fri, 30 Nov 2012 10:56:48 +0000 (12:56 +0200)]
Cocoa: create dialogs as NSPanels
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>
Marc Mutz [Sun, 21 Oct 2012 17:02:51 +0000 (19:02 +0200)]
QSignalSpy: assorted improvements
- 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>
Shawn Rutledge [Fri, 30 Nov 2012 18:30:12 +0000 (19:30 +0100)]
Move gestures overview from qtdoc to qtbase; mention Qt Quick
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>
Zeno Albisser [Tue, 27 Nov 2012 09:40:45 +0000 (10:40 +0100)]
Properly release pixel format and context in QCocoaGLContext.
Change-Id: Idd13924dccc8d7798f463484eeb3c3074f7b51f1
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Morten Johan Sørvig [Tue, 20 Nov 2012 10:34:52 +0000 (11:34 +0100)]
Basic high-dpi "retina" support for Qt 5.
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>
Shawn Rutledge [Wed, 28 Nov 2012 18:46:04 +0000 (19:46 +0100)]
QWidget windows have fullscreen button by default; manual test for it
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>
Morten Johan Sørvig [Wed, 28 Nov 2012 12:57:06 +0000 (13:57 +0100)]
Cocoa: Disable accessibility.
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>
Oliver Wolff [Fri, 30 Nov 2012 14:01:19 +0000 (15:01 +0100)]
Docs: Fixed enum and parameter links for network
Change-Id: Ie04e09d91e9b0781dc3bcbfe271c851fbe486849
Reviewed-by: David Schulz <david.schulz@digia.com>
Shawn Rutledge [Fri, 30 Nov 2012 16:44:47 +0000 (17:44 +0100)]
Renamed the keyboard-focus doc to make clear it's about Widgets
Also link from the widgets index page.
Change-Id: I49cd415b09d7458d89d75931ecfaafe29c226c6f
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Samuel Rødal [Fri, 30 Nov 2012 16:38:21 +0000 (17:38 +0100)]
Added \ingroup and \brief qdoc tags to IPC examples.
Change-Id: Ic8fb033597340bfb44ee7e0ca7a3763b36c097aa
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Gabriel de Dietrich [Fri, 30 Nov 2012 15:07:00 +0000 (16:07 +0100)]
Mac: Fix small button metrics, menu indicator alignment
Task-number: QTBUG-28275
Change-Id: I08de3cc7fee3af725c66ed081072277b2ca32601
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Friedemann Kleint [Fri, 30 Nov 2012 07:57:37 +0000 (08:57 +0100)]
ANGLE: Fix debug-and-release builds
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>
Friedemann Kleint [Wed, 28 Nov 2012 07:21:41 +0000 (08:21 +0100)]
Angle: Use dynamic runtime library of MSVC.
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>
Teemu Katajisto [Thu, 29 Nov 2012 10:46:23 +0000 (12:46 +0200)]
Cocoa: fix modal native dialogs with ongoing modal sessions
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>
Sean Harmer [Fri, 30 Nov 2012 10:48:54 +0000 (10:48 +0000)]
OpenGL: Remove bogus error in textures example on ES 2 platforms
The call to glGetBooleanv(GL_FRAMEBUFFER_SRGB_CAPABLE_EXT) in
QGLExtensions::currentContextExtensions() was resulting in an invalid
enum on ES 2 systems. This was not being cleared and subsequentally
being interpreted as a failed texture upload in the textures example.
This enum doesn't exist on ES 2 so don't query it.
Change-Id: I84f9c4b0aa8b11b6036eeed1f9378d110d9ea69d
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Andreas Holzammer [Fri, 30 Nov 2012 15:18:26 +0000 (16:18 +0100)]
WINCE: Fix renameing of resource files
The standard resource files where renamed,
so fix the include for qmenu in Windows CE.
Change-Id: Id29dd8e1028cf438f4d483126a74994fc1e310d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Thorbjørn Lund Martsum [Wed, 28 Nov 2012 13:47:34 +0000 (14:47 +0100)]
QGraphicsView - fix rubberband to stay right on scroll
We should consider the scene-position when we are expanding
moving a rubberband. If the user does some auto-scroll
(Qt should support that itself, but that is another matter)
then the rubberband should not keep the (old) local position
to calculate the rubberband extension, but instead use the
scene-position that was actually clicked.
Change-Id: I04a2df6a1edae8b3587e1ac2104c7fe4ccfb7762
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Rafael Roquetto [Thu, 29 Nov 2012 18:42:11 +0000 (16:42 -0200)]
QNX: Move buffer count check to appropriate location
The buffer count check should take place right after buffers are created. For
some reason, the buffer count value inside libscreen may become incosistent during
the course of the program.
Change-Id: Icbbaf4734eac5b0c5c95bdd93771899f9fcdb7db
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Giuseppe D'Angelo [Fri, 30 Nov 2012 12:43:25 +0000 (12:43 +0000)]
Threaded fortune server example: update the screenshot
It didn't match the reality any more (now it shows an IP address
as well as the chosen port).
Change-Id: I7b942313ad5246a72186e3b9c93e54af8ab7a5ae
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Montel Laurent [Fri, 30 Nov 2012 18:00:11 +0000 (19:00 +0100)]
Fix compile with -DQT_NO_WIZARD
Change-Id: I6f7be895b8c4a1a65de43ee35d1fab25a30a25c6
Reviewed-by: David Faure <david.faure@kdab.com>
Montel Laurent [Fri, 30 Nov 2012 17:53:15 +0000 (18:53 +0100)]
Fix compile when we use QT_NO_ACCESSIBILITY
Change-Id: I2d304fa6d91d86130eeb4a4aa07b43173d240312
Reviewed-by: David Faure <david.faure@kdab.com>
Montel Laurent [Fri, 30 Nov 2012 15:56:09 +0000 (16:56 +0100)]
Fix compile with QT_NO_SHORTCUT
Change-Id: Ib11f2e01fecb0c231211c92e4590cbaddc76246f
Reviewed-by: David Faure <david.faure@kdab.com>
Montel Laurent [Fri, 30 Nov 2012 10:53:23 +0000 (11:53 +0100)]
Fix memory leak when error reported
Change-Id: I0c4c0baed8f2a734b3986b0d446cd58df705f7e4
Reviewed-by: David Faure <david.faure@kdab.com>
David Faure [Thu, 22 Nov 2012 11:23:29 +0000 (12:23 +0100)]
QMimeType: don't document the constructor that takes a Private class
Change-Id: I238e1eca6938deb728085a5416220230d9e751c7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Zeno Albisser [Fri, 30 Nov 2012 12:20:44 +0000 (13:20 +0100)]
ANGLE: Do not reset the share handle when resetting the swap chain.
This change only affects the ANGLE_surface_d3d_texture_2d_share_handle
extension. The patch is necessary to have WebGL running in Qt/WebKit2.
If the share handle is reset, we are loosing the reference to the
EGLSurface and cannot actually reuse it in a different context anymore.
Change-Id: I0138432dd8ff60ea57e7e591cfa2f8db1d324f53
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Zeno Albisser [Fri, 30 Nov 2012 12:37:22 +0000 (13:37 +0100)]
ANGLE Patch file: Do not reset the share handle when resetting the swap chain.
Change-Id: I7ddc0f31b342ba40d4e14a99afdf237cb37d7ace
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
David Schulz [Fri, 30 Nov 2012 09:01:49 +0000 (10:01 +0100)]
QtBase: Remove Meamo part and fix link in documentation
... for Application Icon Example
Change-Id: I2efa0b49a13889db8b706523d06bf317d35cad4f
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Oliver Wolff [Fri, 30 Nov 2012 11:27:57 +0000 (12:27 +0100)]
Docs: Moved layout example's image do correct location
Change-Id: I85c6812d8d172c92fc4322d4300721e0f45f34e7
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Venugopal Shivashankar [Fri, 30 Nov 2012 17:06:19 +0000 (18:06 +0100)]
Doc: Grouped the SQL example pages under sql_examples group
Change-Id: I98b9cb2acafe82e89d9d170e0f66251180011caa
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Paul Olav Tvete [Fri, 30 Nov 2012 12:50:14 +0000 (13:50 +0100)]
Fix links for threading examples
Change-Id: I498936e91e3bbf5658ea9f3f0eb33cff271a1d62
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
David Schulz [Fri, 30 Nov 2012 08:28:11 +0000 (09:28 +0100)]
QtBase: Docs: remove deprecated Q_EXPORT_PLUGIN2
... and add description for Q_PLUGIN_METADATA
Change-Id: Ie389787df53d3cdfa27ba8fb0e77f32df1597c4f
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Sergio Ahumada [Thu, 29 Nov 2012 13:44:20 +0000 (14:44 +0100)]
changes: Add a note about the copyright transfer from Nokia to Digia
Change-Id: I5dd888f4767bf579a96f676811b82d55c1398bf9
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Jerome Pasion [Wed, 28 Nov 2012 13:56:37 +0000 (14:56 +0100)]
Doc: Changing HTML output to qttestlib-index.html
-matches the index file and output directory name
Change-Id: I9205a41355fcb3818a93035208c8e25c1c13dcff
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Gunnar Sletta [Fri, 30 Nov 2012 14:30:42 +0000 (15:30 +0100)]
Fix example documentation for OpenGL module and (widget) Tools.
Change-Id: Id9dc39752bcae915f618e1a5696115a5e6923251
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Oliver Wolff [Fri, 30 Nov 2012 11:25:24 +0000 (12:25 +0100)]
Docs: Moved mainwindow example's image do correct location
Change-Id: Idc22e18aa73fed293f629bdccc438567298f1274
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Jerome Pasion [Fri, 23 Nov 2012 12:42:02 +0000 (13:42 +0100)]
Doc: Adding empty tags in the HTML
Change-Id: I7251b77b645a2085d25443826aa2b9550a373d88
Reviewed-by: Martin Smith <martin.smith@digia.com>
J-P Nurmi [Fri, 30 Nov 2012 21:24:08 +0000 (22:24 +0100)]
changes-5.0.0: SC incompatible change - internalized QStyle subclasses
Change-Id: I06147f9774797c96efeaada7e0c134a769d28cdd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
hjk [Fri, 30 Nov 2012 15:09:46 +0000 (16:09 +0100)]
Replace two \returns markers by "The function returns"
Change-Id: I101310f6bd9bddf0ee9d06a81b9fef805313a015
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Shawn Rutledge [Fri, 30 Nov 2012 16:43:45 +0000 (17:43 +0100)]
Mention the QT_STYLE_OVERRIDE env variable.
IMO we need to have a list of all the environment variables somewhere,
but this one is especially useful and wasn't documented at all.
Change-Id: I2de09194c5904a9a27066604840ec4be66574fb7
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Montel Laurent [Fri, 30 Nov 2012 14:09:02 +0000 (15:09 +0100)]
Not necessary to assign bool to false for changing just 2 lines after
Change-Id: I4ed9a07e3dc2cac9d82b3070a2dd22cca2d80f3d
Reviewed-by: David Faure <david.faure@kdab.com>
Montel Laurent [Fri, 30 Nov 2012 11:50:53 +0000 (12:50 +0100)]
Fix memory leak. PrinterDialog is not deleted when close it
Change-Id: I9f0a300cdaf9803bc2ad723946ac4d0f825cc28b
Reviewed-by: David Faure <david.faure@kdab.com>
Giuseppe D'Angelo [Fri, 30 Nov 2012 15:40:14 +0000 (15:40 +0000)]
Add more qtbase implictly-shared classes to the list
QText*Format and QDns* ones are still missing.
Change-Id: I8e87fba596e87289ca935717e0a90bfc0b0a26c0
Reviewed-by: hjk <qthjk@ovi.com>
Giuseppe D'Angelo [Fri, 30 Nov 2012 15:50:44 +0000 (15:50 +0000)]
Add QText*Format classes to the list of the implicitly shared ones
Change-Id: Iee0ecb1cf02fdf9dbdf8328bbe60b1dc7ca21894
Reviewed-by: hjk <qthjk@ovi.com>
Giuseppe D'Angelo [Fri, 30 Nov 2012 15:52:13 +0000 (15:52 +0000)]
Add QDns* classes to the list of the implicitly shared ones
Change-Id: I29dd678a51dc693285c389f235d748120ca58fe1
Reviewed-by: Jeremy Lainé <jeremy.laine@m4x.org>
Reviewed-by: hjk <qthjk@ovi.com>
Holger Ihrig [Fri, 30 Nov 2012 13:10:26 +0000 (14:10 +0100)]
Fixed compatibility problem with Exceptionhandling
When QtBase is compiled with Exeptions it was incompatible
with the other modules compiled with QT_NO_EXCEPTIONS.
This resulted in a linker error with
ExceptionStore::throwPossibleExceptions, one time returning a const value
and the other time without it
Change-Id: I0e0dff61aceeec3cfde119b00ed15f3aa9f12659
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Alexey Pavlov [Mon, 26 Nov 2012 15:45:02 +0000 (19:45 +0400)]
Moving the remaining variables assignments from .qmake.cache to qmodule.pri
Moving variables to qmodule.pri allows to build all qt modules with user defined
command line arguments passed to configure script.
Task-number: QTBUG-27566
Change-Id: Ifa7991e9024df3fb4b1fd6536ee0d19b7c63d15e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Joerg Bornemann [Thu, 29 Nov 2012 12:14:31 +0000 (13:14 +0100)]
don't link qtmain.lib when using idcidl.prf
QAxServer projects must not link qtmain.lib.
This awful hack was adapted from the old qaxserver.prf
Change-Id: I78b4cbf6714bfbd88341449b9230f1989cff8a6f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Miikka Heikkinen [Fri, 30 Nov 2012 13:42:52 +0000 (15:42 +0200)]
Added custom flags for enabling dependencies of other parts to tools
Introduced CONFIG flags examples_need_tools and tests_need_tools.
Change-Id: I4789d05f6bc0a63c75340c3b3e2aecde18c42c20
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Andreas Holzammer [Fri, 30 Nov 2012 15:49:44 +0000 (16:49 +0100)]
WINCE: Don't build angle by default
When having a directx sdk, angle does get auto enabled
for all windows platforms. Windows CE directx builds on top
of opengl es 2, so if there is directx, there is also a
opengl es 2. So don't add more layers of indirection for
Windows CE. As well angle does not build for Windows CE.
Change-Id: I211a1de29431cd05d5cd60188f503d2cd299c9b3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 30 Nov 2012 14:32:36 +0000 (15:32 +0100)]
expose a little less of the build host's file system structure
Change-Id: I6fc675b9aeae0744c3308cd20ffd8c115c271c58
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Oswald Buddenhagen [Fri, 30 Nov 2012 14:23:58 +0000 (15:23 +0100)]
fix harfbuzz header install location
Change-Id: I2e02f6c80ed7b1df00ad74a3e301997ba3bbd566
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Oswald Buddenhagen [Wed, 28 Nov 2012 15:17:29 +0000 (16:17 +0100)]
remove another pointless indirection
we directly expand $$TARGET on the same line, so just do the same with
$$VERSION
Change-Id: I3601bfcc835b13f63dce43d00cfe8d34ded60b21
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Oswald Buddenhagen [Fri, 30 Nov 2012 14:06:37 +0000 (15:06 +0100)]
remove unnecessary indirection
we are assigning QT.*.VERSION from VERSION a moment earlier
Change-Id: Ie4d51f8835b8050755bc399a1a597967c8e3e499
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Oswald Buddenhagen [Thu, 29 Nov 2012 21:22:42 +0000 (22:22 +0100)]
make it possible to name include dir differently from library name
ActiveQt needs that
Change-Id: Ib9f69d19e8042c1ab0f211eebb9237bc2fb77aa3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Oswald Buddenhagen [Fri, 30 Nov 2012 14:03:26 +0000 (15:03 +0100)]
don't install headers into Qt/ any more
this should have been part of
656e0d342.
Change-Id: I56e5d743a756e9236759595429de85754593638e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
J-P Nurmi [Fri, 30 Nov 2012 13:46:54 +0000 (14:46 +0100)]
Docs: revise QApplication snippets
Change-Id: Ibbd31736154af6dd009d331578f9addc4de76e89
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Gunnar Sletta [Fri, 30 Nov 2012 09:38:54 +0000 (10:38 +0100)]
Fix broken links in the QtWidgets examples.
I remove the widgets examples from the gui docs as they will
introduce broken duplicates (under doc/qtgui/...).
Change-Id: I54255ceaf4187477da3e82f6809be41fb98378a2
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Gunnar Sletta [Fri, 30 Nov 2012 12:21:35 +0000 (13:21 +0100)]
Fix linking in painting, richtext and desktop examples
Change-Id: If08b2c3366610f74201ab6736f216f1a7d29b3c7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
J-P Nurmi [Thu, 29 Nov 2012 22:02:52 +0000 (23:02 +0100)]
QGV: set QStyleOption::styleObject for graphics items & widgets
Certain QStyle code paths expect the style object to be set. This will
avoid problems when QGraphicsItems/Widgets utilize QStyle for drawing.
Even if things will not necessarily animate properly, such legacy code
won't cause a crash at least.
Change-Id: Ic77cb4ee9820d6c4ec92c7278fd87cb866f5a780
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
J-P Nurmi [Thu, 29 Nov 2012 15:02:58 +0000 (16:02 +0100)]
Docs: clarify availability & platform theme usage in widget galleries
Change-Id: Id3c1e278d6a6ce6c67b7f73c3a9490cf83eb0466
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
J-P Nurmi [Fri, 23 Nov 2012 13:31:49 +0000 (14:31 +0100)]
Made QWindowsStyle internal
We will take this opportunity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy, pluginizing etc. without
worrying about BC.
=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QWindowsStyle directly.
Change-Id: Ic17c7e425535bc5bb3a08620e9059bb0aea5185e
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Stephen Kelly [Thu, 29 Nov 2012 21:49:52 +0000 (22:49 +0100)]
Add a way to not generate INCLUDE_DIRS variables.
ActiveQt needs this, and it sets the no_module_headers flag.
We still need to set the include_dirs variable in the
no_module_headers case, so that its dependencies are added to it.
Change-Id: I2cad5ee792eed51d36b7c8e2c616763516a5fc10
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Eskil Abrahamsen Blomfeldt [Fri, 30 Nov 2012 14:27:37 +0000 (15:27 +0100)]
doc: Add touch input examples to correct group
Make them appear in list of touch input examples.
Change-Id: Ia5f489e28771f0a272da9ec7b61de186ca305e36
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Kevin Krammer [Fri, 30 Nov 2012 16:24:03 +0000 (17:24 +0100)]
Docs: fix code snippet paths in xml-processing.qdoc
Configuration file's exampledirs variable already contains the
xml sub directory, snippet paths are relative to that
Change-Id: I627aebade224afdb7bd38f2b1a089a747e49fabf
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Olivier Goffart [Thu, 29 Nov 2012 20:39:44 +0000 (21:39 +0100)]
Add few missing entries to the changelog related to QObject and moc
Change-Id: I96fa72f1a0669f0899e8079b214cac54e5d6edef
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Kevin Krammer [Fri, 30 Nov 2012 16:22:41 +0000 (17:22 +0100)]
Fix path in qtxml.qdoconf
../../../examples/xml/src
doesn't exist, it is
../../../examples/xml/doc/src
Change-Id: I08f0d6d91b2cea7bf313cbcdd50632835e21ae24
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Jerome Pasion [Fri, 30 Nov 2012 13:45:42 +0000 (14:45 +0100)]
Doc: Removing entry in CSS for adding icons to HTTP links
This is a temporary solution to
QDoc bug https://bugreports.qt-project.org/browse/QTBUG-28307
The links will not have the icon.
Change-Id: Ib81bcc9c55cd5f403c85fdd38c0ee71219091e76
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Tasuku Suzuki [Fri, 30 Nov 2012 14:48:40 +0000 (23:48 +0900)]
make minimalegl plugin compile without QtWidgets
Change-Id: I060ea584dd78e5f389010ab007567aed11793c23
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
hjk [Fri, 30 Nov 2012 14:30:46 +0000 (15:30 +0100)]
Remove reference to Qt 3 documentation from example qdoc code.
Change-Id: I0999b24f12ee4c878fc2a95b171474eea7a55ba5
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Paul Olav Tvete [Fri, 30 Nov 2012 10:08:33 +0000 (11:08 +0100)]
Fix docs for Drag and Drop examples
Change-Id: Ic1622b64603f7634b697bd7d8412dcc9f1a8c3fa
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
hjk [Fri, 30 Nov 2012 14:09:17 +0000 (15:09 +0100)]
Fix path to style/offline.css in qt-module-defaults.qdocconf
Change-Id: I203cca8041c44116bef7021837ad21bd85e86b4c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Richard Moe Gustavsen [Fri, 30 Nov 2012 11:39:23 +0000 (12:39 +0100)]
QPA: update backingstore also when moving QWindows
When moving QMdiSubWindows that contains native widgets (e.g QGLWidget)
inside a QMdiArea, garbage is drawn to the screen. The reason is
that since we use native QWindow backed widgets, QPA will assume
that it does not need to update/scroll the backingstore. But since the
backingstore can be shared among several windows, we need to do this to
ensure that exposed areas behind the moved QWindow will be updated.
Change-Id: I35f4d4069a73ab6cd6d610e25c176c752789a927
Task-number: QTBUG-26162
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>