Commit Graph

10934 Commits

Author SHA1 Message Date
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
Stephen Kelly
2bda681eb6 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>
2012-11-30 18:51:34 +01:00
Eskil Abrahamsen Blomfeldt
def3285615 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>
2012-11-30 18:43:49 +01:00
Kevin Krammer
c107b6d817 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>
2012-11-30 18:43:28 +01:00
Olivier Goffart
ef71d4ffcd Add few missing entries to the changelog related to QObject and moc
Change-Id: I96fa72f1a0669f0899e8079b214cac54e5d6edef
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-30 18:43:18 +01:00
Kevin Krammer
50f8cc54c9 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>
2012-11-30 18:42:56 +01:00
Jerome Pasion
ceb2799163 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>
2012-11-30 18:38:49 +01:00
Tasuku Suzuki
eed1e548bb make minimalegl plugin compile without QtWidgets
Change-Id: I060ea584dd78e5f389010ab007567aed11793c23
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2012-11-30 18:38:32 +01:00
hjk
9799743ca1 Remove reference to Qt 3 documentation from example qdoc code.
Change-Id: I0999b24f12ee4c878fc2a95b171474eea7a55ba5
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-30 18:37:43 +01:00
Paul Olav Tvete
d25bd0c37e 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>
2012-11-30 18:37:35 +01:00
hjk
0e7ba5e763 Fix path to style/offline.css in qt-module-defaults.qdocconf
Change-Id: I203cca8041c44116bef7021837ad21bd85e86b4c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-30 18:37:15 +01:00
Richard Moe Gustavsen
1cce35472a 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>
2012-11-30 18:28:14 +01:00
Jocelyn Turcotte
27a945dccd 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>
2012-11-30 18:28:10 +01:00
Samuel Rødal
6385a182f0 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>
2012-11-30 18:28:04 +01:00
Miikka Heikkinen
3ee48926e6 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>
2012-11-30 08:23:11 +01:00
Miikka Heikkinen
d31dbe1efe 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>
2012-11-30 08:22:35 +01:00
Olivier Goffart
d8e6be1603 Fix connecting to a functor with 3 arguments
Task-number: QTBUG-28285

Change-Id: I07bd870c093482035728aa783d0ecbc8aa8670d2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-11-30 01:23:48 +01:00
David Schulz
c3b4f27603 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>
2012-11-30 00:53:07 +01:00
J-P Nurmi
f52177829a 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>
2012-11-30 00:52:21 +01:00
Paul Olav Tvete
2ffb9b489a Remove Qt 3 reference from resource system documentation.
Change-Id: I2610cf1d3cda09c84d9b36afa0eab1e20be43410
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2012-11-30 00:51:06 +01:00
Sergio Ahumada
33a8455042 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>
2012-11-30 00:50:47 +01:00
David Schulz
e2be953386 QtBase: Documentation: Replaced deprecated \o
... with \li in documentation lLists.

Change-Id: I51f5f4f848ec1b5a379647b32772668c24ff5992
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-11-30 00:50:18 +01:00
Christian Strømme
1970552e72 Fix missing code snippet in QTest doc.
Change-Id: I6fb1167634b0acddfa61b92d104d98ba8a1a15cb
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2012-11-30 00:50:12 +01:00
Jan Arve Saether
d835ebf39c 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>
2012-11-30 00:50:07 +01:00
Jerome Pasion
85e77b3e17 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>
2012-11-30 00:49:49 +01:00
Lars Knoll
17a33db399 Fix Qt Xml docs and generate correct module and index pages
Change-Id: I95988798997edeb2d656d265e3172fa0d78db55a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-30 00:49:34 +01:00
Lars Knoll
c85ca8d1cf Fix Qt OpenGL overview.
Change-Id: Ib95638a8eb306e5ababa47cc61e1b5db4ae6cb31
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2012-11-30 00:49:21 +01:00
Lars Knoll
f810c9fc33 Fixes to Qt D-Bus docs
Change-Id: Ib13dc69edce9b989915e4eb75421e775b173095b
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2012-11-30 00:48:59 +01:00
Lars Knoll
afaec998c4 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>
2012-11-30 00:48:50 +01:00
Lars Knoll
753a478925 Fixup concurrent docs
qdoc now finds an overview and the concurrent namespace.

Change-Id: I2cd15bc19091f53bd2bb98919e685d49d473dbec
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-30 00:48:37 +01:00
Oswald Buddenhagen
aeb036ed87 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>
2012-11-29 20:21:11 +01:00
Jing Bai
12dcab77a7 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>
2012-11-29 20:20:14 +01:00
Martin Smith
d2d210044f 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>
2012-11-29 20:20:01 +01:00
J-P Nurmi
14cb07864e uic: remove internal QStyle subclasses from qclass_lib_map.h
Change-Id: I10f0b2198d60f882cd59a03f33b2cc1afb0ffcf5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-11-29 20:19:50 +01:00
Robert Loehning
26a9fc4e52 Remove trailing white spaces
Change-Id: I4ff016476e73870405377f76b13fb2e74749a047
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-11-29 17:42:07 +01:00
Eskil Abrahamsen Blomfeldt
0b37ed0262 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>
2012-11-29 17:42:07 +01:00
Eike Ziller
4727bb5991 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>
2012-11-29 13:51:54 +01:00
Morten Johan Sørvig
a4c7340b73 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>
2012-11-29 13:51:52 +01:00
Oswald Buddenhagen
5e525d283d fix bootstrapped build
Change-Id: I8c987e8eed555c9c976732e216553d8002ee2b87
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qttools/d9dc9d34ec092ddc536a907b4f5009fb8bf01da4)
2012-11-29 08:30:54 +01:00
Richard Moe Gustavsen
bb38d1b1d5 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>
2012-11-28 21:09:42 +01:00
J-P Nurmi
a0d379bc9a Style auto tests: kill QWindowsStyle dependencies
Change-Id: I135fe2b0aae81c73c1cca6272f71db07ecb3fa6b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-28 20:54:39 +01:00
Gunnar Sletta
d8eeae5b83 Mention that the Qt book only covers widgets
Change-Id: Ieb20f410570496286d670cab48e80f7bf7772338
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-28 20:49:20 +01:00
Gunnar Sletta
a4dec60207 Remove legacy classes from "Painting in 3D" list.
Change-Id: I099dd940145629a67266d02bde7217ea9fbc9372
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2012-11-28 20:44:41 +01:00
Andy Shaw
5e12f9e7b3 Fix build when SSE2 is not available.
Although SSE2 support is detected at runtime it still may not be
available at build time, so we have to ensure it only uses SSE2
when it is available at build time too.

Change-Id: I86c45a6466ab4cec79aa0f62b0d5230a78ad825a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-11-28 20:41:44 +01:00
J-P Nurmi
27748e588a QtWidgets docs: use Fusion screenshots
The Plastique style no longer exists in QtBase. All the references have
been updated to Fusion, and the obsolete screenshots have been removed.

Change-Id: I771a9ecf23b82965c7b3c41a40945cf051cb5f3a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-28 20:26:27 +01:00
Sergio Martins
779ef8bb7e QNX: Fix window focus problems when using QNX 6.5.0.
In blackberry, activation events come through the navigator,
but we might not have a navigator.

Change-Id: I0d9e1a08336aa403035fdf00be46d839a83f4b58
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2012-11-28 16:21:57 +01:00
Oswald Buddenhagen
bc6228c3f4 factor out qt_docs_targets.prf
instead of letting *every* qmake-based project have recursive docs targets,
let qt modules "subscribe" to it explicitly by having load(qt_build_config)
in their .qmake.conf (which they already do).

Change-Id: I97b74591fd0c4bd5f8b08c5f550df9c7eef2f556
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-28 16:21:57 +01:00
Oswald Buddenhagen
c0764ab9a1 fix non-qmake build of the evaluator
Change-Id: Ibbd00b415318bda928b5e6f9831b214e2657e291
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qttools/769fa282ac8a4b98698dada6969452363e0eb415)
2012-11-28 16:21:57 +01:00
Oswald Buddenhagen
a2d2b44446 re-enable coloreditorfactory and stardelegate examples
Change-Id: I99b1a1967973ea28acd9e37c922f96e9dca8875d
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-28 16:21:57 +01:00
Oswald Buddenhagen
e543807ca0 reformat assignment to ease later modification
Change-Id: Ib8741baf678583fe56ea0f0a5d4cf2ee22b21b3a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-11-28 16:21:57 +01:00