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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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)
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>
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>
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>
Gunnar Sletta [Wed, 28 Nov 2012 15:57:42 +0000 (16:57 +0100)]
Remove legacy classes from "Painting in 3D" list.
Change-Id: I099dd940145629a67266d02bde7217ea9fbc9372
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Andy Shaw [Wed, 28 Nov 2012 14:38:58 +0000 (15:38 +0100)]
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>
J-P Nurmi [Wed, 28 Nov 2012 14:01:34 +0000 (15:01 +0100)]
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>
Sergio Martins [Fri, 16 Nov 2012 16:31:49 +0000 (16:31 +0000)]
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>
Oswald Buddenhagen [Wed, 28 Nov 2012 13:51:40 +0000 (14:51 +0100)]
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>
Oswald Buddenhagen [Fri, 2 Nov 2012 18:46:19 +0000 (19:46 +0100)]
fix non-qmake build of the evaluator
Change-Id: Ibbd00b415318bda928b5e6f9831b214e2657e291
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qttools/
769fa282ac8a4b98698dada6969452363e0eb415)
Oswald Buddenhagen [Tue, 27 Nov 2012 20:41:50 +0000 (21:41 +0100)]
re-enable coloreditorfactory and stardelegate examples
Change-Id: I99b1a1967973ea28acd9e37c922f96e9dca8875d
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Oswald Buddenhagen [Tue, 27 Nov 2012 16:01:09 +0000 (17:01 +0100)]
reformat assignment to ease later modification
Change-Id: Ib8741baf678583fe56ea0f0a5d4cf2ee22b21b3a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Tue, 27 Nov 2012 20:52:13 +0000 (21:52 +0100)]
dbus-chat => chat
to make the source and install locations consistent
Change-Id: Ifde8748eeab843b06bf79f941fa4789b5b68cca9
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Oswald Buddenhagen [Tue, 27 Nov 2012 20:06:58 +0000 (21:06 +0100)]
remove rather useless text file
somebody who cares can find the information in the git log
Change-Id: I97dff4ab33a773247e1320ba6491e6377a2b94e7
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Oswald Buddenhagen [Tue, 27 Nov 2012 19:59:26 +0000 (20:59 +0100)]
remove apparently unused file
Change-Id: Ie8b60b9e63c5783674cbac3bbe277f58d3059ea3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Oswald Buddenhagen [Tue, 27 Nov 2012 19:40:37 +0000 (20:40 +0100)]
remove meaningless OTHER_FILES assignments
Change-Id: Id3d5690d5b174e5374332158709365ab431f660b
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Oswald Buddenhagen [Tue, 27 Nov 2012 19:27:37 +0000 (20:27 +0100)]
README.txt => README
use the same naming everywhere
Change-Id: Ic9106a17eb0979278f12f2ea2b7c1a04bc448745
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Oswald Buddenhagen [Tue, 27 Nov 2012 19:14:55 +0000 (20:14 +0100)]
delete .desktop files of examples
they were added without an explanation, and they can't be particularly
useful (because they contain hard-coded paths and refer to non-existing
icons).
Change-Id: I27e2c35375e28645b0c03449ddc7ac7017da5943
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Jan Arve Saether [Wed, 28 Nov 2012 13:08:23 +0000 (14:08 +0100)]
Make the animation framework docs more framework-agnostic
* (i.e. do not mention Kinetic)
* Add some relevant references to Qt Quick
* Refer to QMetaType::Type instead of the obsolete QVariant::Type
Change-Id: I82b69250c933c7e54dc0c268fa6ce4379726fb0d
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
aavit [Mon, 26 Nov 2012 14:23:20 +0000 (15:23 +0100)]
Provide the bundled zlib headers for external access
(Currently, the Qt5 windows packages lack the tiff and mng plugins
from qtimageformats because of this issue.)
If Qt is configured to use its bundled zlib, it is compiled into
QtCore, and the public symbols are exported so that it can be used
by other Qt libraries. However, after modularization, this did not
work for libraries outside qtbase, since they did not have access
to the headers of the bundled zlib.
This commit fixes that.
Ref. also
1f461ac45bfa8887261510a95fb33a346d68eaba
Change-Id: Ie986f47e00fd0c16f2ba04d27f4258a20d61b260
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Lucas Wang [Thu, 27 Sep 2012 16:02:04 +0000 (00:02 +0800)]
Fix -largefile option in configure
-largefile is regarded as a library named argefile and added to
Makefile as a link flag. It will cause a link error.
Change-Id: I8ac30896d4e473f7e98c937c8906b1b9c620cf1e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Martin Smith [Wed, 28 Nov 2012 13:34:24 +0000 (14:34 +0100)]
qdoc: Listing QML group members across modules
This is a second update, which fixes the
"All QML APIs by Module" page, I think.
I expect there will be more insifious places
where this problem will pop up. qdoc must be
dragged, kicking and screaming into the
modular age.
Task-number: QTBUG-28036
Change-Id: I8dd4733a2b0aac9bab3cb2066b6dbf139a8e98a6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
mfekari [Wed, 28 Nov 2012 09:55:54 +0000 (04:55 -0500)]
Qnx: Check if QCoreApplication::instance() exists before using QSocketNotifier
Change-Id: I9f00314ea1ef73b87bc56ca1f8fcf859c9cd1824
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Peter Hartmann <phartmann@rim.com>
Paul Olav Tvete [Wed, 28 Nov 2012 12:37:13 +0000 (13:37 +0100)]
Remove Qt 3 references from model/view documentation.
Also, don't pretend that Qt 4 is new.
Change-Id: Ib8f719310059093b31181e3c98cf5c028c3018dc
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
David Faure [Fri, 23 Nov 2012 14:29:03 +0000 (15:29 +0100)]
Move session management code from QApplication to QGuiApplication.
QSessionManager was already in QtGui, but not usable since the only API
to get to it was still in QtWidgets. Session management isn't related
to widgets, it also applies to QML apps on the desktop.
The virtual commitData and saveState methods have been removed,
given the two signals which exist since 4.2, and an additional
isSessionSaving() method was added instead.
Change-Id: I8099e70df133303e74456706827da21f013fcc6a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
J-P Nurmi [Wed, 28 Nov 2012 12:45:17 +0000 (13:45 +0100)]
Docs: cleaned up remaining cleanlooks references and screenshots
Change-Id: I671cec2a84eabe14bef788499dbfa7d7e9c27670
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
J-P Nurmi [Wed, 28 Nov 2012 11:58:46 +0000 (12:58 +0100)]
Docs: add Fusion Style Widget Gallery
Change-Id: I1eb6548a8842fc141b1506d6070f6b74bda5c893
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Mitch Curtis [Tue, 27 Nov 2012 16:51:31 +0000 (17:51 +0100)]
Document how to name threads.
Change-Id: If7a7bf4f54509ebb86ce394d8bb5a7748ef419d5
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Samuel Rødal [Wed, 28 Nov 2012 09:09:46 +0000 (10:09 +0100)]
Fixed QTestLib tutorial docs (link + outdated mention of Qt Labs).
Change-Id: I76d45780b052b40b079fb0c8e0d38db88aa17814
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Lars Knoll [Wed, 28 Nov 2012 10:04:22 +0000 (11:04 +0100)]
fixqt4headers: Remove QtQuick1 and add QtMultimedia
QtQuick1 is QtDeclarative again, so there's no header
file renaming needed. But Multimedia got renamed from
multimediakit and this needs to be included.
Change-Id: Ie787d6841f0525e1dc290f7ca8d9cae148308e32
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
J-P Nurmi [Fri, 23 Nov 2012 14:13:41 +0000 (15:13 +0100)]
tst_QLayout: use QStyleFactory instead of QWindowsStyle
QWindowsStyle is soon to become an internal class.
Change-Id: I25ac344d349d07db94e2fbc9ef943e09c399f913
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
J-P Nurmi [Wed, 28 Nov 2012 09:18:56 +0000 (10:18 +0100)]
Choose better screenshots for "The Widget Classes" docs
Remove references to the obsolete CDE and Plastique styles, choose
screenshots from more modern styles, and revise the table so that
screenshots in the same column are from the same style.
Change-Id: I20d5944ab62d8a6965fb49339dede90624c520b3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
J-P Nurmi [Fri, 23 Nov 2012 14:20:40 +0000 (15:20 +0100)]
tst_QWidget: use QStyleFactory instead of QWindowsStyle
QWindowsStyle is soon to become an internal class.
Change-Id: I75424d6fc2f36fb0faace86c960d78a4ba305658
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
J-P Nurmi [Tue, 27 Nov 2012 17:06:22 +0000 (18:06 +0100)]
Style docs & snippets: remove references to QWindowsStyle
QWindowsStyle is being made internal. Use either QProxyStyle for
customizing existing styles or QCommonStyle to implement full custom
styles.
Change-Id: Ic81696abc61a3c012a3775efc0b4fba2e1dab4bb
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Rafael Roquetto [Tue, 27 Nov 2012 18:24:30 +0000 (16:24 -0200)]
Remove invalid assert from QGraphicsScene
This assert has become invalid since commit
40fef403. After that commit, the
'origin' mentioned by the assert is not necessarily the first item of
cachedItemsUnderMouse, since it origin can be reassigned at line 5735.
Change-Id: Ibc0739b9fe31be3cc74110225940e9e173f585e0
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
J-P Nurmi [Wed, 28 Nov 2012 09:32:08 +0000 (10:32 +0100)]
Docs: removed Motif widget gallery
The Motif style no longer lives in QtBase.
Change-Id: I7a0d31603a3898c1e5ab558b6e14aac4ec1315bc
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
J-P Nurmi [Wed, 28 Nov 2012 09:22:23 +0000 (10:22 +0100)]
Docs: removed CDE widget gallery
The CDE style no longer lives in QtBase.
Change-Id: Idfb35e8333b30939a4929418ecf2ce6ccfc437cd
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
hjk [Wed, 28 Nov 2012 09:37:39 +0000 (10:37 +0100)]
Doc: rename qttest.qdocconf to qttestlib.qdocconf
The name of the .qhp files seems to be generated from the name
of the .qdocconf, not the value it has in qhp.QtTest.file
Change-Id: I12645cb254991006c920234ec966e2fa220cb595
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Stephen Kelly [Mon, 22 Oct 2012 08:59:32 +0000 (10:59 +0200)]
QtCore: Make more signals private.
Change-Id: Ida190e8b9c1ff47a6f54a5bf68673ab50a2f1bfe
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stephen Kelly [Mon, 26 Nov 2012 13:27:37 +0000 (14:27 +0100)]
Always use QAIM to get the default flags.
Change-Id: I801f5c8023e3e3672fde28139a7f34f640e650f5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Thiago Macieira [Thu, 25 Oct 2012 21:32:09 +0000 (14:32 -0700)]
Add a -libexecdir option to the configures
User applications are those that users run directly, whether it be for
development or not. The executable binaries that the user does not
usually run but is still required for proper functioning are called
"program executables" in Autoconf and they are placed in libexec.
This commit adds support for "program executables" in Qt by adding the
-libexecdir option to the configures, the qmake variable
QT_INSTALL_LIBEXECS (note the plural, to match all other properties),
and QLibraryInfo::LibraryExecutables.
At the time of this commit, the only expected "program executable" is
the QtWebProcess, the WebKit2 helper process from QtWebKit.
Change-Id: I66c3a3e0cf7f9d93b5f88f55f18e957faff608fc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Nils Jeisecke [Mon, 25 Jun 2012 17:13:19 +0000 (19:13 +0200)]
Enhanced QSharedDataPointer documentation with container performance section
Added a section motivating the use of Q_DECLARE_TYPEINFO to mark
shared data classes as movable types.
Change-Id: I26664500aef7d83d779d90f97f3f2b0043966480
Reviewed-by: Casper van Donderen <casper.vandonderen@gmail.com>
Jan Arve Saether [Tue, 27 Nov 2012 10:26:13 +0000 (11:26 +0100)]
Make "API Reference" section \section1
This is consistent with QtCore and QtSql landing pages.
Change-Id: Ibea45678a6952b39d24483bad1ee44f562699d1f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
J-P Nurmi [Tue, 27 Nov 2012 13:18:41 +0000 (14:18 +0100)]
Examples: move widgets specific "tools" examples to the correct place
examples/tools -> examples/widgets/tools
Change-Id: I8b9e23c45e07ce5cd9da8f24a9a9f7ae10b2b107
Reviewed-by: hjk <qthjk@ovi.com>
Andy Shaw [Tue, 27 Nov 2012 14:30:24 +0000 (15:30 +0100)]
Build fix when building libGLESv2 on Windows with MSVC 2010
Although SSE2 is not used, texture.cpp does not protect calls to these
functions, support for SSE2 is checked at runtime so the code needs to
be compiled in.
Change-Id: Ie14d0ff6b75448e480236d5d30254f107735b77f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
J-P Nurmi [Tue, 27 Nov 2012 17:22:05 +0000 (18:22 +0100)]
GV auto tests: kill QWindowsStyle dependencies
Change-Id: I6236b7ca23897c5075bef21f5e62fe01f4cfc611
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Rafael Roquetto [Tue, 20 Nov 2012 20:30:15 +0000 (18:30 -0200)]
QNX: fix QProcess fd inheritance
Under QNX, QProcess was not inheriting the parent's file descriptors. This
patch fills in the fd_map array, containing the file descriptors to be
inherited, which is passed to spawn(), accordingly.
Change-Id: Ia160abda88c1ffede877301aeae93a97c2b35320
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Samuel Rødal [Tue, 27 Nov 2012 09:25:34 +0000 (10:25 +0100)]
Commented confusing QWriteLocker use in QGLTextureCache::getTexture().
Task-number: QTBUG-22560
Change-Id: Idd3948455e8415473a407f66b628418c0d87898d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Oswald Buddenhagen [Mon, 26 Nov 2012 20:17:27 +0000 (21:17 +0100)]
revamp doc generation targets
- the old docs target becomes html_docs
- a new qch_docs target is added. the .qch files end up directly in
QT_INSTALL_DOCS, wihout any subdirectories in between
- the new docs target invokes html_docs and qch_docs
- respective un-/install targets are added as well. note that the
install targets don't depend on the build targets, as it's virtually
impossible to get the dependencies right throughout the hierarchy.
Change-Id: I07a2589db8252371e77cf925c47c4e59fbd1b2ca
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Oswald Buddenhagen [Mon, 26 Nov 2012 19:56:50 +0000 (20:56 +0100)]
assign MAKEFILE even in non-subdirs Makefiles
this is necessary for having a clean way to recurse even from leaf
makefiles.
the location where the variable is written in the makefile is somewhat
bizarre, but the code is so convoluted that finding a better place would
mean either a lot of duplication or a lot of prior refactoring.
Change-Id: I68e4cf7e3814f6c60b2e3421d69775c993dafb23
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Nico Vertriest [Tue, 27 Nov 2012 12:40:01 +0000 (13:40 +0100)]
Added link to Html5 Web Database API
Removed trailing whitespace
Change-Id: I98e57b23dbd037bea3b9f5f67fee70110207e3e0
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Friedemann Kleint [Mon, 26 Nov 2012 16:18:30 +0000 (17:18 +0100)]
Fix typo in SSL error message.
Change-Id: If72d80979e1d2ea909227785cd691be39d75c8ab
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Sergio Ahumada [Mon, 26 Nov 2012 11:51:48 +0000 (12:51 +0100)]
Change copyright information from Nokia to Digia
Task-number: QTBUG-28156
Change-Id: Id6b1cd83155c61b0d3ead2d185b8968511d4a23f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
J-P Nurmi [Tue, 27 Nov 2012 10:38:39 +0000 (11:38 +0100)]
QGuiApplication docs: clarify that QWidget needs QApplication
Task-number: QTBUG-28076
Change-Id: I2ebbedd1916f472b9517b509f3b5499d93c71d45
Reviewed-by: Jing Bai <jing.bai@digia.com>
J-P Nurmi [Mon, 26 Nov 2012 23:27:32 +0000 (00:27 +0100)]
Update the StylePlugin example
QWindowsStyle will soon become an internal class, inherit
SimpleStyle from QProxyStyle. The documentation has been
updated accordingly.
Change-Id: Ib55f59729e980b93276e9c2903f13b5e46612ac8
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Eike Ziller [Tue, 27 Nov 2012 14:57:56 +0000 (15:57 +0100)]
Fix filesToOpen in example manifests.
Task-number: QTBUG-27801
Change-Id: Ibfe1f3f2f3ba9d00698d3465fb0950e77a63bd4e
Reviewed-by: Martin Smith <martin.smith@digia.com>
Oliver Wolff [Tue, 27 Nov 2012 09:11:30 +0000 (10:11 +0100)]
Fix touch event handling for Windows
Filtering touch events depending on Qt::WA_AcceptTouchEvents
is not trivial. I thought about doing so in
QWidgetWindow::handleTouchEvent but the target widget (not
window), which has to be checked, has to be obtained using
the primary touch event's position etc.
Thus that is not part of this commit and will be done in a
followup.
Change-Id: I876ee72acd7fdfbe46da61c6eb3c5891ea319cd8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Joerg Bornemann [Mon, 26 Nov 2012 15:58:54 +0000 (16:58 +0100)]
adjust to modularization changes in ActiveQt
Task-number: QTBUG-27776
Change-Id: I1c30270867d20f028bad09fdc5408a414b122f5b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Konstantin Ritt [Fri, 16 Nov 2012 19:07:26 +0000 (21:07 +0200)]
Fix possible assertion when using stringToCMap() for a multi engine
If (*nglyphs < len), stringToCMap() sets *nglyphs to len and returns
false immediately; the caller then must resize the buffer and re-try.
However, QFontEngineMulti::stringToCMap() doesn't update the nglyphs value
and thus the second call would fail, too. This is quite unexpected.
Change-Id: Id2cce7b9faf7706c382fccf023e1b7affa9a10be
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Martin Smith [Tue, 27 Nov 2012 13:07:27 +0000 (14:07 +0100)]
qdoc: Listing group members across modules
This is a first attempt at fixing the problem, but
it probably is not the entire solution. The problem
requires adding attributes to the index files and
then reusing them when the index files are read.
The same problem will be affecting the module
lists themselves, but that is not fixed in this
update.
Task-number: QTBUG-28036
Change-Id: I8593d5b9446e51a5204b6c71f8c4f2b63f445972
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Samuel Rødal [Tue, 27 Nov 2012 13:49:39 +0000 (14:49 +0100)]
Properly deprecated QGLFramebufferObject and QGLFramebufferObjectFormat
Change-Id: I9affdcce0988e3538c8a7a696999a7cf8c3448aa
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
hjk [Tue, 27 Nov 2012 13:12:37 +0000 (14:12 +0100)]
Remove remaning TARGET.EPOCHEAPSIZE settings from examples.
Not needed anymore.
Change-Id: I28b6566e1498afb68295c16e8786fe8bc0256361
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Jan Arve Saether [Tue, 27 Nov 2012 14:09:17 +0000 (15:09 +0100)]
Improve OpenGL docs
* Mark all Open GL classes with \inmodule QtOpenGL. Otherwise, they
weren't listed in the list of classes.
* Remove a reference to Motif
Change-Id: I75680712b212cf46b869014d3678b56d022c6323
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Samuel Rødal [Tue, 27 Nov 2012 13:57:19 +0000 (14:57 +0100)]
Fixed abbreviations in QWindow::framePos() and QWindow::setFramePos().
As
672e7c875e8680818e23d0aef98129d95eb7e91c did changing pos() to
position() and setPos() to setPosition().
Luckily there's not much code that uses these.
Change-Id: I1e1982f00412a22bd376e667a5e8c30b6149f9b5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Tasuku Suzuki [Fri, 23 Nov 2012 04:45:33 +0000 (13:45 +0900)]
remove dependency of fusion style on windows
Fusion does not depend on Windows
qfeatures.h regenerated from qfeatures.txt
(QT_NO_LIBRARY and QT_NO_STYLE_FUSION were missing)
Change-Id: I5e650a826abb788c7ffb1f0f28d9bbb2d357b7a8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Lars Knoll [Tue, 27 Nov 2012 11:49:35 +0000 (12:49 +0100)]
Fix link to licensing page
Change-Id: I398a9e46fd9c4beacd9e8554dab544154e48b870
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
hjk [Mon, 26 Nov 2012 16:33:38 +0000 (17:33 +0100)]
Doc: write qttestlib.qch, not qttest.qch
This is an enabler for https://codereview.qt-project.org/#change,40381
Change-Id: I2c2fdefab041dc9332816aefbe85ff66c275ca63
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Liang Qi [Mon, 26 Nov 2012 13:29:46 +0000 (14:29 +0100)]
Mac: Fix wheel event handling on 10.6
Change "else" case to support compiling on 10.7+
and deploying on 10.6
Task-number: QTBUG-28060
Change-Id: Iaaeaaefe98083863ed750c7cb320db02e16543af
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Lars Knoll [Mon, 26 Nov 2012 18:59:57 +0000 (19:59 +0100)]
Fix overview documentation.
Change-Id: I8a3427be51673d071bcf467ea7d6d12472b6f841
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Andreas Aardal Hanssen [Fri, 23 Nov 2012 10:48:27 +0000 (11:48 +0100)]
Ensure subfocus is not reset to 0 when hiding a panel.
When hiding any widget that is not a panel, it is correct to clear
subfocus. In case clearFocus() has been called, the result is that
focusItem() / focusWidget() points to 0, which is correct. Upon
reactivation, nothing gains input focus. When changing focus, the
following setSubFocus() call will ensure subfocus points to the new
widget.
When hiding a panel, however, it's essential that subfocus within
that panel is not cleared, otherwise, when re-showing the panel,
nothing will have focus, whereas the expected behavior is that focus
is restored to the last item that had focus, i.e., the focusItem()
a.k.a. subfocus widget.
Task-number: QTBUG-22256
Change-Id: I84d849a505764e074e1369fef923cef1ad5c0b1e
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Friedemann Kleint [Mon, 26 Nov 2012 15:44:26 +0000 (16:44 +0100)]
tr()-Fix: Do not add up translateable strings.
Placeholders might go to a different position in translated
strings.
Change-Id: Id6a84ea931dc0487bd72eb8d01669369a3dce9c6
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>