Commit Graph

11083 Commits

Author SHA1 Message Date
Friedemann Kleint
95a05904b9 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>
2012-12-01 08:30:38 +01:00
Friedemann Kleint
f229db5d57 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>
2012-12-01 08:30:16 +01:00
Teemu Katajisto
5dbcd9dfea Cocoa: fix modal native dialogs with ongoing modal sessions
Commit 26db7de13d 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>
2012-12-01 08:29:33 +01:00
Sean Harmer
a7c9d5ca9c 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>
2012-12-01 08:29:14 +01:00
Andreas Holzammer
5573a44f68 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>
2012-12-01 08:28:58 +01:00
Thorbjørn Lund Martsum
51914375b6 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>
2012-12-01 08:28:43 +01:00
Rafael Roquetto
1b95d3331c 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>
2012-12-01 08:28:25 +01:00
Giuseppe D'Angelo
3492a80959 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>
2012-12-01 08:28:16 +01:00
Montel Laurent
9bf17c7cb6 Fix compile with -DQT_NO_WIZARD
Change-Id: I6f7be895b8c4a1a65de43ee35d1fab25a30a25c6
Reviewed-by: David Faure <david.faure@kdab.com>
2012-12-01 01:49:46 +01:00
Montel Laurent
ce68ca86f2 Fix compile when we use QT_NO_ACCESSIBILITY
Change-Id: I2d304fa6d91d86130eeb4a4aa07b43173d240312
Reviewed-by: David Faure <david.faure@kdab.com>
2012-12-01 01:49:46 +01:00
Montel Laurent
5f03e89b74 Fix compile with QT_NO_SHORTCUT
Change-Id: Ib11f2e01fecb0c231211c92e4590cbaddc76246f
Reviewed-by: David Faure <david.faure@kdab.com>
2012-12-01 01:49:46 +01:00
Montel Laurent
a9fcfa648a Fix memory leak when error reported
Change-Id: I0c4c0baed8f2a734b3986b0d446cd58df705f7e4
Reviewed-by: David Faure <david.faure@kdab.com>
2012-12-01 01:49:46 +01:00
David Faure
14fcddc336 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>
2012-11-30 23:57:56 +01:00
Zeno Albisser
26bb73c2ab 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>
2012-11-30 23:57:37 +01:00
Zeno Albisser
656d8a6772 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>
2012-11-30 23:57:22 +01:00
David Schulz
7fce924674 QtBase: Remove Meamo part and fix link in documentation
... for Application Icon Example

Change-Id: I2efa0b49a13889db8b706523d06bf317d35cad4f
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2012-11-30 23:57:17 +01:00
Oliver Wolff
fa181fc824 Docs: Moved layout example's image do correct location
Change-Id: I85c6812d8d172c92fc4322d4300721e0f45f34e7
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2012-11-30 23:57:09 +01:00
Venugopal Shivashankar
23b8b83c6f Doc: Grouped the SQL example pages under sql_examples group
Change-Id: I98b9cb2acafe82e89d9d170e0f66251180011caa
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2012-11-30 23:57:01 +01:00
Paul Olav Tvete
e62198967c Fix links for threading examples
Change-Id: I498936e91e3bbf5658ea9f3f0eb33cff271a1d62
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2012-11-30 23:56:53 +01:00
David Schulz
4cbe999921 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>
2012-11-30 23:56:49 +01:00
Sergio Ahumada
5ce64dd750 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>
2012-11-30 23:56:43 +01:00
Jerome Pasion
62c9be5b2f 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>
2012-11-30 23:56:37 +01:00
Gunnar Sletta
be7ebe2d57 Fix example documentation for OpenGL module and (widget) Tools.
Change-Id: Id9dc39752bcae915f618e1a5696115a5e6923251
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2012-11-30 23:56:33 +01:00
Oliver Wolff
af385b3bc6 Docs: Moved mainwindow example's image do correct location
Change-Id: Idc22e18aa73fed293f629bdccc438567298f1274
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2012-11-30 23:56:27 +01:00
Jerome Pasion
3d4729a377 Doc: Adding empty tags in the HTML
Change-Id: I7251b77b645a2085d25443826aa2b9550a373d88
Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-11-30 23:56:15 +01:00
J-P Nurmi
6dd9493028 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>
2012-11-30 23:56:07 +01:00
hjk
4902d381bd 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>
2012-11-30 23:56:06 +01:00
Shawn Rutledge
1164c6f6ca 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>
2012-11-30 23:56:02 +01:00
Montel Laurent
45ce4740ae Not necessary to assign bool to false for changing just 2 lines after
Change-Id: I4ed9a07e3dc2cac9d82b3070a2dd22cca2d80f3d
Reviewed-by: David Faure <david.faure@kdab.com>
2012-11-30 23:56:02 +01:00
Montel Laurent
c565ef6d72 Fix memory leak. PrinterDialog is not deleted when close it
Change-Id: I9f0a300cdaf9803bc2ad723946ac4d0f825cc28b
Reviewed-by: David Faure <david.faure@kdab.com>
2012-11-30 23:56:02 +01:00
Giuseppe D'Angelo
930207fc1f 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>
2012-11-30 21:57:49 +01:00
Giuseppe D'Angelo
139d342f9b Add QText*Format classes to the list of the implicitly shared ones
Change-Id: Iee0ecb1cf02fdf9dbdf8328bbe60b1dc7ca21894
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-30 21:57:49 +01:00
Giuseppe D'Angelo
63e1750db2 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>
2012-11-30 21:57:49 +01:00
Holger Ihrig
dcccf32095 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>
2012-11-30 21:57:49 +01:00
Alexey Pavlov
1c54dcf3bb 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>
2012-11-30 21:57:49 +01:00
Joerg Bornemann
9d650a4b36 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>
2012-11-30 21:57:49 +01:00
Miikka Heikkinen
09a1810319 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>
2012-11-30 21:57:49 +01:00
Andreas Holzammer
6798cb9800 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>
2012-11-30 21:57:49 +01:00
Oswald Buddenhagen
329e174802 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>
2012-11-30 21:57:49 +01:00
Oswald Buddenhagen
76af113867 fix harfbuzz header install location
Change-Id: I2e02f6c80ed7b1df00ad74a3e301997ba3bbd566
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2012-11-30 21:57:49 +01:00
Oswald Buddenhagen
3e37c209d2 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>
2012-11-30 21:57:49 +01:00
Oswald Buddenhagen
02cb58cbd4 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>
2012-11-30 21:57:49 +01:00
Oswald Buddenhagen
2c8ebbc25b 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>
2012-11-30 21:57:49 +01:00
Oswald Buddenhagen
5de4b24c99 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>
2012-11-30 21:57:49 +01:00
J-P Nurmi
a03d3fd4d3 Docs: revise QApplication snippets
Change-Id: Ibbd31736154af6dd009d331578f9addc4de76e89
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-11-30 21:57:49 +01:00
Gunnar Sletta
06678fd0b5 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>
2012-11-30 19:40:47 +01:00
Gunnar Sletta
9ea48de5f0 Fix linking in painting, richtext and desktop examples
Change-Id: If08b2c3366610f74201ab6736f216f1a7d29b3c7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2012-11-30 19:40:19 +01:00
J-P Nurmi
d8fcfbc3c3 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>
2012-11-30 19:32:35 +01:00
J-P Nurmi
39058bfe8e Docs: clarify availability & platform theme usage in widget galleries
Change-Id: Id3c1e278d6a6ce6c67b7f73c3a9490cf83eb0466
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-30 19:32:02 +01:00
J-P Nurmi
cd31c06590 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>
2012-11-30 19:31:29 +01:00