Commit Graph

10898 Commits

Author SHA1 Message Date
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
Oswald Buddenhagen
297bc47ad4 dbus-chat => chat
to make the source and install locations consistent

Change-Id: Ifde8748eeab843b06bf79f941fa4789b5b68cca9
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-28 16:21:57 +01:00
Oswald Buddenhagen
b19145125e 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>
2012-11-28 16:21:57 +01:00
Oswald Buddenhagen
6fbd9ad059 remove apparently unused file
Change-Id: Ie8b60b9e63c5783674cbac3bbe277f58d3059ea3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-28 16:21:57 +01:00
Oswald Buddenhagen
91f640b189 remove meaningless OTHER_FILES assignments
Change-Id: Id3d5690d5b174e5374332158709365ab431f660b
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-28 16:21:57 +01:00
Oswald Buddenhagen
8e041af122 README.txt => README
use the same naming everywhere

Change-Id: Ic9106a17eb0979278f12f2ea2b7c1a04bc448745
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-28 16:21:57 +01:00
Oswald Buddenhagen
4dedd61d2e 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>
2012-11-28 16:21:57 +01:00
Jan Arve Saether
7cba8a052f 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>
2012-11-28 16:21:57 +01:00
aavit
ca35995c1b 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 1f461ac45b

Change-Id: Ie986f47e00fd0c16f2ba04d27f4258a20d61b260
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-11-28 16:21:57 +01:00
Lucas Wang
d7ab351cdd 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>
2012-11-28 16:21:57 +01:00
Martin Smith
793ed1bf88 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>
2012-11-28 16:21:57 +01:00
mfekari
5e59215ac6 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>
2012-11-28 16:21:57 +01:00
Paul Olav Tvete
bf9691d9b7 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>
2012-11-28 16:21:57 +01:00
David Faure
eca4936ea2 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>
2012-11-28 16:21:57 +01:00
J-P Nurmi
b9c8cf2527 Docs: cleaned up remaining cleanlooks references and screenshots
Change-Id: I671cec2a84eabe14bef788499dbfa7d7e9c27670
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-28 16:21:57 +01:00
J-P Nurmi
3e5b031607 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>
2012-11-28 16:21:57 +01:00
Mitch Curtis
e2364e3df6 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>
2012-11-28 16:21:57 +01:00
Samuel Rødal
76b492050f 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>
2012-11-28 16:21:57 +01:00
Lars Knoll
003860b5a7 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>
2012-11-28 16:21:57 +01:00
J-P Nurmi
50a22d8418 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>
2012-11-28 13:13:51 +01:00
J-P Nurmi
cefc0551df 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>
2012-11-28 13:13:46 +01:00
J-P Nurmi
f308c296c5 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>
2012-11-28 13:13:41 +01:00
J-P Nurmi
ea104efa34 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>
2012-11-28 13:13:35 +01:00
Rafael Roquetto
f4b80c1210 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>
2012-11-28 13:07:28 +01:00
J-P Nurmi
d378912d23 Docs: removed Motif widget gallery
The Motif style no longer lives in QtBase.

Change-Id: I7a0d31603a3898c1e5ab558b6e14aac4ec1315bc
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-28 12:49:14 +01:00
J-P Nurmi
19fb351cfc Docs: removed CDE widget gallery
The CDE style no longer lives in QtBase.

Change-Id: Idfb35e8333b30939a4929418ecf2ce6ccfc437cd
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-11-28 12:49:06 +01:00
hjk
d95d29d709 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>
2012-11-28 12:40:40 +01:00
Stephen Kelly
2e05a15784 QtCore: Make more signals private.
Change-Id: Ida190e8b9c1ff47a6f54a5bf68673ab50a2f1bfe
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-11-28 08:49:38 +01:00
Stephen Kelly
5a9de4c676 Always use QAIM to get the default flags.
Change-Id: I801f5c8023e3e3672fde28139a7f34f640e650f5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-28 08:43:31 +01:00
Thiago Macieira
5dcc36b15c 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>
2012-11-28 08:39:07 +01:00
Nils Jeisecke
24539dc3d8 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>
2012-11-28 08:22:59 +01:00
Jan Arve Saether
bad43f1e3d 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>
2012-11-28 00:56:34 +01:00
J-P Nurmi
cb961007c5 Examples: move widgets specific "tools" examples to the correct place
examples/tools -> examples/widgets/tools

Change-Id: I8b9e23c45e07ce5cd9da8f24a9a9f7ae10b2b107
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-28 00:56:34 +01:00
Andy Shaw
3d66b86cb7 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>
2012-11-28 00:56:34 +01:00
J-P Nurmi
a3fe4c6337 GV auto tests: kill QWindowsStyle dependencies
Change-Id: I6236b7ca23897c5075bef21f5e62fe01f4cfc611
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-27 23:10:09 +01:00
Rafael Roquetto
226f245c71 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>
2012-11-27 19:31:21 +01:00
Samuel Rødal
171938ce1a Commented confusing QWriteLocker use in QGLTextureCache::getTexture().
Task-number: QTBUG-22560
Change-Id: Idd3948455e8415473a407f66b628418c0d87898d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2012-11-27 19:31:21 +01:00