profile/ivi/qtbase.git
11 years agoMove gestures overview from qtdoc to qtbase; mention Qt Quick
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>
11 years agoProperly release pixel format and context in QCocoaGLContext.
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>
11 years agoBasic high-dpi "retina" support for Qt 5.
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>
11 years agoQWidget windows have fullscreen button by default; manual test for it
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>
11 years agoCocoa: Disable accessibility.
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>
11 years agoDocs: Fixed enum and parameter links for network
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>
11 years agoRenamed the keyboard-focus doc to make clear it's about Widgets
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>
11 years agoAdded \ingroup and \brief qdoc tags to IPC examples.
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>
11 years agoMac: Fix small button metrics, menu indicator alignment
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>
11 years agoANGLE: Fix debug-and-release builds
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>
11 years agoAngle: Use dynamic runtime library of MSVC.
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>
11 years agoCocoa: fix modal native dialogs with ongoing modal sessions
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>
11 years agoOpenGL: Remove bogus error in textures example on ES 2 platforms
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>
11 years agoWINCE: Fix renameing of resource files
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>
11 years agoQGraphicsView - fix rubberband to stay right on scroll
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>
11 years agoQNX: Move buffer count check to appropriate location
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>
11 years agoThreaded fortune server example: update the screenshot
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>
11 years agoFix compile with -DQT_NO_WIZARD
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>
11 years agoFix compile when we use QT_NO_ACCESSIBILITY
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>
11 years agoFix compile with QT_NO_SHORTCUT
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>
11 years agoFix memory leak when error reported
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>
11 years agoQMimeType: don't document the constructor that takes a Private class
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>
11 years agoANGLE: Do not reset the share handle when resetting the swap chain.
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>
11 years agoANGLE Patch file: Do not reset the share handle when resetting the swap chain.
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>
11 years agoQtBase: Remove Meamo part and fix link in documentation
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>
11 years agoDocs: Moved layout example's image do correct location
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>
11 years agoDoc: Grouped the SQL example pages under sql_examples group
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>
11 years agoFix links for threading examples
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>
11 years agoQtBase: Docs: remove deprecated Q_EXPORT_PLUGIN2
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>
11 years agochanges: Add a note about the copyright transfer from Nokia to Digia
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>
11 years agoDoc: Changing HTML output to qttestlib-index.html
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>
11 years agoFix example documentation for OpenGL module and (widget) Tools.
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>
11 years agoDocs: Moved mainwindow example's image do correct location
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>
11 years agoDoc: Adding empty tags in the HTML
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>
11 years agochanges-5.0.0: SC incompatible change - internalized QStyle subclasses
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>
11 years agoReplace two \returns markers by "The function returns"
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>
11 years agoMention the QT_STYLE_OVERRIDE env variable.
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>
11 years agoNot necessary to assign bool to false for changing just 2 lines after
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>
11 years agoFix memory leak. PrinterDialog is not deleted when close it
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>
11 years agoAdd more qtbase implictly-shared classes to the list
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>
11 years agoAdd QText*Format classes to the list of the implicitly shared ones
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>
11 years agoAdd QDns* classes to the list of the implicitly shared ones
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>
11 years agoFixed compatibility problem with Exceptionhandling
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>
11 years agoMoving the remaining variables assignments from .qmake.cache to qmodule.pri
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>
11 years agodon't link qtmain.lib when using idcidl.prf
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>
11 years agoAdded custom flags for enabling dependencies of other parts to tools
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>
11 years agoWINCE: Don't build angle by default
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>
11 years agoexpose a little less of the build host's file system structure
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>
11 years agofix harfbuzz header install location
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>
11 years agoremove another pointless indirection
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>
11 years agoremove unnecessary indirection
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>
11 years agomake it possible to name include dir differently from library name
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>
11 years agodon't install headers into Qt/ any more
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>
11 years agoDocs: revise QApplication snippets
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>
11 years agoFix broken links in the QtWidgets examples.
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>
11 years agoFix linking in painting, richtext and desktop examples
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>
11 years agoQGV: set QStyleOption::styleObject for graphics items & widgets
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>
11 years agoDocs: clarify availability & platform theme usage in widget galleries
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>
11 years agoMade QWindowsStyle internal
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>
11 years agoAdd a way to not generate INCLUDE_DIRS variables.
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>
11 years agodoc: Add touch input examples to correct group
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>
11 years agoDocs: fix code snippet paths in xml-processing.qdoc
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>
11 years agoAdd few missing entries to the changelog related to QObject and moc
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>
11 years agoFix path in qtxml.qdoconf
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>
11 years agoDoc: Removing entry in CSS for adding icons to HTTP links
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>
11 years agomake minimalegl plugin compile without QtWidgets
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>
11 years agoRemove reference to Qt 3 documentation from example qdoc code.
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>
11 years agoFix docs for Drag and Drop examples
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>
11 years agoFix path to style/offline.css in qt-module-defaults.qdocconf
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>
11 years agoQPA: update backingstore also when moving QWindows
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>
11 years agoRestore the visibility of a moved QWindow in QWindow::screenDestroyed
Jocelyn Turcotte [Thu, 29 Nov 2012 15:25:59 +0000 (16:25 +0100)]
Restore the visibility of a moved QWindow in QWindow::screenDestroyed

QWindow::screenDestroyed triggers an move of the window to the primary
screen. This causes the screen to be destroyed and shown again on the
new QScreen.

The issue is that QWindow::destroy() hides the window but create()
doesn't set it visible, and this ultimately causes any QWindow to be
automatically hidden when their QScreen is destroyed.

As stated in the comment, it could be the intended behavior that
windows aren't shown automatically on a remaining screen like when
using two screens not logically part of the same desktop. Once the
platform plugins have access to an API allowing them to adjust the
screens of their QWindow, this patch shouldn't be needed anymore.

Change-Id: I7628377c969f79f9eebb3deabaf0470542d68a9c
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
11 years agoAdded explicit threading API to QtOpenGL.
Samuel Rødal [Mon, 26 Nov 2012 11:57:09 +0000 (12:57 +0100)]
Added explicit threading API to QtOpenGL.

Since QtOpenGL/QGLContext is implemented in terms of
QtGui/QOpenGLContext which has stricter requirements about how it's
supposed to be used, we need to apply these requirements to QGLContext
as well.

This change adds QGLContext::moveToThread(QThread *) and documents it as
a necessity for making a context current on another thread.

Also introduces QGLPixelbuffer::context() to access the QGLContext of a
pixelbuffer, and made QGLWidget::context() return a non-const
QGLContext, since there's no good reason why it shouldn't, and it leads
to less const_cast clutter.

We could have introduced a backdoor in QOpenGLContext instead, making it
loosen its requirements, but that would have made it harder / impossible
to fully support threaded OpenGL in all the platforms.

Task-number: QTBUG-22560
Change-Id: Ibb6f65f342e7c963e80cc42ab5664c5f1cab30b0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoFix crash when requesting QGuiApplication::platformNativeInterface()
Miikka Heikkinen [Thu, 29 Nov 2012 12:59:02 +0000 (14:59 +0200)]
Fix crash when requesting QGuiApplication::platformNativeInterface()

If QGuiApplication has not been instantiated, this function would
crash. Change it to return NULL pointer instead.

Change-Id: Ia3d27019daa436d5243c9cce757a132d96aae112
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoRemove duplicate libraries added via prl files in Windows
Miikka Heikkinen [Wed, 28 Nov 2012 11:21:15 +0000 (13:21 +0200)]
Remove duplicate libraries added via prl files in Windows

The LIBS statement generated into Makefiles contained duplicate
libraries when application was linking static libraries.

Fixed by adapting the logic from unixmake.cpp's version of
processPrlFiles() to remove duplicates.

Change-Id: I12e152900233d0376b7d7ac6cd18a92850a6d640
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFix connecting to a functor with 3 arguments
Olivier Goffart [Thu, 29 Nov 2012 20:32:47 +0000 (21:32 +0100)]
Fix connecting to a functor with 3 arguments

Task-number: QTBUG-28285

Change-Id: I07bd870c093482035728aa783d0ecbc8aa8670d2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoQtBase: Fix painting example arthur background color
David Schulz [Tue, 27 Nov 2012 09:14:15 +0000 (10:14 +0100)]
QtBase: Fix painting example arthur background color

The arthur style set the background color to a bright color
and leave the foregroud color, for example for text, untouched.

If you are using a color theme with bright foregroundcolors on your
system this will result in unreadable text on push- and
radio-buttons.

The function drawControl is now reimplemented and the labels
with text are drawn with an appropriate color.

Change-Id: Ifd7f3a2b1c0305130255009c7733e0966830171a
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoRevise QMacStyle scrollbar animation handling
J-P Nurmi [Thu, 29 Nov 2012 20:18:25 +0000 (21:18 +0100)]
Revise QMacStyle scrollbar animation handling

Skip animations whether styleObject is not set.

Task-number: QTBUG-27895
Change-Id: I1d2e4655b735627b672bc85f773605adcd375418
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoRemove Qt 3 reference from resource system documentation.
Paul Olav Tvete [Thu, 29 Nov 2012 09:07:59 +0000 (10:07 +0100)]
Remove Qt 3 reference from resource system documentation.

Change-Id: I2610cf1d3cda09c84d9b36afa0eab1e20be43410
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoMore changes from Nokia to Digia
Sergio Ahumada [Wed, 28 Nov 2012 21:13:34 +0000 (22:13 +0100)]
More changes from Nokia to Digia

Change-Id: I8f2edd238e64c01d3ccb7c012b389d61435d7135
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoQtBase: Documentation: Replaced deprecated \o
David Schulz [Thu, 29 Nov 2012 11:59:18 +0000 (12:59 +0100)]
QtBase: Documentation: Replaced deprecated \o

... with \li in documentation lLists.

Change-Id: I51f5f4f848ec1b5a379647b32772668c24ff5992
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
11 years agoFix missing code snippet in QTest doc.
Christian Strømme [Thu, 29 Nov 2012 13:07:19 +0000 (14:07 +0100)]
Fix missing code snippet in QTest doc.

Change-Id: I6fb1167634b0acddfa61b92d104d98ba8a1a15cb
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoAdd a nice description of Qt Widgets module
Jan Arve Saether [Wed, 28 Nov 2012 07:40:03 +0000 (08:40 +0100)]
Add a nice description of Qt Widgets module

Since Qt Widgets was moved from Addons to Essensials, take the
old description for the Qt Widgets addon and put it in the module.

Change-Id: If955747999d48fe09fff00a9c78e38ccbcf9a493
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoDoc: Modified CSS according to a graphic designer's recommendations.
Jerome Pasion [Thu, 29 Nov 2012 15:31:22 +0000 (16:31 +0100)]
Doc: Modified CSS according to a graphic designer's recommendations.

-Landing page in qtdoc uses the CSS classes.

Change-Id: I05efae40d4d6d1802585c129a0a12b2af7eee5e7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoFix Qt Xml docs and generate correct module and index pages
Lars Knoll [Thu, 29 Nov 2012 13:08:54 +0000 (14:08 +0100)]
Fix Qt Xml docs and generate correct module and index pages

Change-Id: I95988798997edeb2d656d265e3172fa0d78db55a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoFix Qt OpenGL overview.
Lars Knoll [Thu, 29 Nov 2012 12:54:31 +0000 (13:54 +0100)]
Fix Qt OpenGL overview.

Change-Id: Ib95638a8eb306e5ababa47cc61e1b5db4ae6cb31
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoFixes to Qt D-Bus docs
Lars Knoll [Thu, 29 Nov 2012 11:14:07 +0000 (12:14 +0100)]
Fixes to Qt D-Bus docs

Change-Id: Ib13dc69edce9b989915e4eb75421e775b173095b
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoFix print support docs
Lars Knoll [Thu, 29 Nov 2012 09:41:22 +0000 (10:41 +0100)]
Fix print support docs

Make sure qdoc generates a correct overview for the module.

Change-Id: I6ea95638459201a0bb09f2e645173ade3a36f0e0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoFixup concurrent docs
Lars Knoll [Thu, 29 Nov 2012 09:27:52 +0000 (10:27 +0100)]
Fixup concurrent docs

qdoc now finds an overview and the concurrent namespace.

Change-Id: I2cd15bc19091f53bd2bb98919e685d49d473dbec
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agocentralize and fixup example sources install targets
Oswald Buddenhagen [Tue, 27 Nov 2012 19:40:16 +0000 (20:40 +0100)]
centralize and fixup example sources install targets

it's confusing for the users if the examples' project files contain code
to install their own sources. also, this constitutes an enormous code
duplication, and lots of mistakes. consequently, automate it.

more or less as a side effect, this also removes the entirely meaningless
target installs in subdirs projects.

Task-number: QTBUG-28184
Change-Id: I9fc1367a06db9e2c46aeb67d68729a4f67163ef9
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoremove the dependency to QT_BUILD_TREE
Jing Bai [Wed, 28 Nov 2012 16:01:13 +0000 (17:01 +0100)]
remove the dependency to QT_BUILD_TREE

To fix a build problem when plugandpaint is not built with qt src.
QT_BUILD_TREE is not set in this case. We use a relative path instead.

Task-number: QTBUG-28261
Change-Id: I2456614070f0849ba9400fbe4b76172189e3925f
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoqdoc: Don't include internal items in annotated lists
Martin Smith [Thu, 29 Nov 2012 14:12:56 +0000 (15:12 +0100)]
qdoc: Don't include internal items in annotated lists

Now things that are marked internal oe whose parent
is marked internal won't appear in annotated lists.

Task-number: QTBUG-28274
Change-Id: I14ea96e223640cad45e7e4249a3e1fc0642bd9c3
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agouic: remove internal QStyle subclasses from qclass_lib_map.h
J-P Nurmi [Thu, 29 Nov 2012 15:51:23 +0000 (16:51 +0100)]
uic: remove internal QStyle subclasses from qclass_lib_map.h

Change-Id: I10f0b2198d60f882cd59a03f33b2cc1afb0ffcf5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoRemove trailing white spaces
Robert Loehning [Thu, 29 Nov 2012 14:51:27 +0000 (15:51 +0100)]
Remove trailing white spaces

Change-Id: I4ff016476e73870405377f76b13fb2e74749a047
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agodoc: Remove references to Qt 4 in QMainWindow introduction
Eskil Abrahamsen Blomfeldt [Thu, 29 Nov 2012 10:18:16 +0000 (11:18 +0100)]
doc: Remove references to Qt 4 in QMainWindow introduction

Also make it read less as a porting guide from Qt 3.

Change-Id: I78f93c643d236e13ba4ef76eeea1a98be4573def
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoAdd \brief to the examples.
Eike Ziller [Wed, 28 Nov 2012 16:04:12 +0000 (17:04 +0100)]
Add \brief to the examples.

That is used by qdoc to generate brief descriptions for the example
manifests.

Change-Id: I142a6d3259f90d0c9990033b3c36e139062ac343
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoMake Mac style not crash on null styleObject.
Morten Johan Sørvig [Thu, 29 Nov 2012 07:08:43 +0000 (08:08 +0100)]
Make Mac style not crash on null styleObject.

We generally expect styleObject to be set during style
draw calls but this isn't always done, especially
legacy code outside Qt (for example in Qt creator).

Create a temporary stand-in QObject. This will disable
scroll bar animations.

Change-Id: I781967fe28f68f5952b368cd56be980b9e270ecd
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agofix bootstrapped build
Oswald Buddenhagen [Wed, 31 Oct 2012 10:12:58 +0000 (11:12 +0100)]
fix bootstrapped build

Change-Id: I8c987e8eed555c9c976732e216553d8002ee2b87
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qttools/d9dc9d34ec092ddc536a907b4f5009fb8bf01da4)

11 years agoCocoa: update OpenGL viewport when nsview moves
Richard Moe Gustavsen [Mon, 26 Nov 2012 14:47:02 +0000 (15:47 +0100)]
Cocoa: update OpenGL viewport when nsview moves

NSOpenGLContext expexts an -update call whenever the
physical position of the view it draws to changes
on screen. Since we don't get geometry callbacks for such
views when the parent view moves, we need to
register a special notification for that case, and
tell Qt that we need to repaint the QWindow that the
view is backing.

This case does not hit very often, but is evident in
MDI applications where the subwindows are OpenGL
backed QGraphicsView widgets. Dragging the subwindows
around produces garbage inside the windows.

Change-Id: I1b162470b03cca6ed722c6c54080459f2c5e91d9
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoStyle auto tests: kill QWindowsStyle dependencies
J-P Nurmi [Tue, 27 Nov 2012 17:31:06 +0000 (18:31 +0100)]
Style auto tests: kill QWindowsStyle dependencies

Change-Id: I135fe2b0aae81c73c1cca6272f71db07ecb3fa6b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoMention that the Qt book only covers widgets
Gunnar Sletta [Wed, 28 Nov 2012 14:51:53 +0000 (15:51 +0100)]
Mention that the Qt book only covers widgets

Change-Id: Ieb20f410570496286d670cab48e80f7bf7772338
Reviewed-by: Lars Knoll <lars.knoll@digia.com>