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>
Aurélien Gâteau [Thu, 11 Oct 2012 09:15:03 +0000 (11:15 +0200)]
Allow qmljsdebugger argument and value to be separated by a space
This change makes it possible to use the QML JS debugger with KDE
applications.
Change-Id: Id5838fa34dcb8b54127abc6da6fe7c2e9a5a1c2e
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
J-P Nurmi [Fri, 23 Nov 2012 23:04:17 +0000 (00:04 +0100)]
QMacStyle: cleanup unused includes
Change-Id: I8fbc33f86fac5abed4553d35fac2973f47a445e9
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Samuel Rødal [Mon, 26 Nov 2012 15:39:40 +0000 (16:39 +0100)]
Fixed crash in tst_qglthreads.
QGLTextureCache has a read write locker to protect texture lookups.
However, even calling QCache::object() might modify the cache, causing
race conditions, since it modifies the priority order of the objects in
the cache. Therefore, we need to protect it with a QWriteLocker instead
of a QReadLocker.
Task-number: QTBUG-22560
Change-Id: I46fffc624ace27e25fb100f865e1df0a19b9093d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Eike Ziller [Mon, 26 Nov 2012 14:28:46 +0000 (15:28 +0100)]
Fix example paths in example manifests that are used by Qt Creator.
Task-number: QTBUG-27801
Change-Id: I345c009fc0e4e1c1eabb43ad142e3b474e7a6fee
Reviewed-by: hjk <qthjk@ovi.com>
Friedemann Kleint [Mon, 26 Nov 2012 15:24:59 +0000 (16:24 +0100)]
tr()-Fix: Shorten QFtp error message.
Change-Id: Id2a901c31eafb35bdbbc187f1e5edb74212c361a
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Gabriel de Dietrich [Fri, 9 Nov 2012 15:27:46 +0000 (16:27 +0100)]
Mac: Reworking flat QGroupBox look
The line has been removed, giving a globally cleaner appearance. Also,
the label font size has been increased to normal size.
Change-Id: I3ef9d59ca54755c6fa158e943e4a6ce94eb05065
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Sean Harmer [Mon, 26 Nov 2012 14:26:46 +0000 (14:26 +0000)]
Remove last usages of qSin and friends from QQuaternion
Change-Id: I93fe1d22313da4cfa671603ccdbe9ac8f02cd73b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
J-P Nurmi [Mon, 26 Nov 2012 12:24:12 +0000 (13:24 +0100)]
Examples: inherit NorwegianWoodStyle from QProxyStyle
The QStyle specializations are being made internal. The recommended way
to customize styles is now to use QProxyStyle (& QStyleFactory), or to
implement a full custom style one can alternatively subclass
QCommonStyle. The proxy style approach was chosen for this case, since
the example assumes some drawing functionality provided by the windows
style and it is not a "complete" custom style implementation but more
like a customization anyway.
Change-Id: Ib2477339cfef258cfc944a76a2eea728066e1f45
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Sergio Ahumada [Mon, 26 Nov 2012 11:47:10 +0000 (12:47 +0100)]
qmake: Change copyright information from Nokia to Digia
Task-number: QTBUG-28156
Change-Id: If54615a465504b4124891fb393185eb324372874
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Thomas Hartmann [Mon, 26 Nov 2012 13:13:25 +0000 (14:13 +0100)]
Moving code for PE_IndicatorArrow* from windows to common style
If QCommonStyle is taking the place of a common base style,
it should support PE_IndicatorArrow*.
Change-Id: Iec08a37bf3a501bcca61751b11e907999f538e34
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
J-P Nurmi [Mon, 26 Nov 2012 14:38:43 +0000 (15:38 +0100)]
Widgets/Painting examples: inherit ArthurStyle from QCommonStyle
The QStyle specializations are being made internal. The ArthurStyle
does not seem to require anything from QWindowsStyle, but QCommonStyle
as a base class gives just as nice looks.
Change-Id: I5ad8dd881e03f166ae5d3aedccb2688952dc0a28
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Friedemann Kleint [Mon, 26 Nov 2012 11:27:53 +0000 (12:27 +0100)]
Ensure QMAKE_PRL_LIBS is a unique list.
Windows static builds currently fail due to overlong command
link lines containing multiple occurrences of base libraries.
Task-number: QTBUG-28131
Change-Id: Ibf7f551fc98c879111b32b27a16f4e96260743c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Michael Brüning [Fri, 23 Nov 2012 20:26:36 +0000 (21:26 +0100)]
Only allow caching for HTTP GET and HEAD requests.
Added a method to QNetworkReplyHttpImplPrivate to check whether the
HTTP operation used in the current request allows for caching. This
should only be the case if the operation is GET or HEAD. The response
to all other request are not really cacheable and should be disallowed
from caching.
Change-Id: I7c31bae42814d157a800d43565e5cb9adfb879f7
Task-number: QTBUG-28035
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Peter Hartmann <phartmann@rim.com>
Tasuku Suzuki [Sat, 24 Nov 2012 14:45:22 +0000 (23:45 +0900)]
Fix build error with QT_NO_FILESYSTEMITERATOR
Change-Id: If39f1077ab1cb126632ea77d998fc279aabbcd5c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Tasuku Suzuki [Sat, 24 Nov 2012 20:23:51 +0000 (05:23 +0900)]
configure: clean up unused CFG_IM
Change-Id: I91a09e29a3bf79610a34c30ffe9c145c7e76d1b6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Sergio Ahumada [Mon, 26 Nov 2012 11:27:10 +0000 (12:27 +0100)]
Change contact-us from Nokia to Digia
Change-Id: I0d94b66d802c3899009dde1e570f195aadd861dc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Sergio Ahumada [Mon, 26 Nov 2012 11:35:02 +0000 (12:35 +0100)]
Change license header from Nokia to Digia
Change-Id: I2be215284d7670f60f8b5838fce1e6832dde2270
Reviewed-by: Martin Smith <martin.smith@digia.com>
Friedemann Kleint [Mon, 26 Nov 2012 09:57:14 +0000 (10:57 +0100)]
Move isBuiltinType() to namespace QtPrivate and export it.
There is currently a symbol clash with a duplicated
isBuiltinType() in ActiveQt's dumpcpp-tool, which breaks static
building. Reuse the function.
Task-number: QTBUG-28131
Change-Id: I4985e8405924754aa613311ca3f06d6ba29758b8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Peter Hartmann [Fri, 23 Nov 2012 16:32:50 +0000 (17:32 +0100)]
BlackBerry mkspecs: optimize linker flags
* relro makes some sections read-only before giving control to the
program;
* now resolves all symbols when the program is started and allows for
the GOT being marked read-only to prevent it from being overwritten.
These settings have been used internally for device builds already.
Change-Id: I9f62fffe618c75748e2357d1686289c23c5dbee5
Reviewed-by: Greg Bentz <gbentz@rim.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Eike Ziller [Mon, 26 Nov 2012 12:54:43 +0000 (13:54 +0100)]
Allow qdocconf to specify where the examples are located in install.
We have qdoc configurations for the different qtbase libraries and
modules now, which specify e.g. "../../../examples/opengl" for the
exampledirs. That means that qdoc finds examples like
"2dpainting/2dpainting.pro" which is then installed into
"[QT_INSTALL_EXAMPLES]/opengl/2dpainting/2dpainting.pro". (At the moment
even into "[QT_INSTALL_EXAMPLES]/qtbase/opengl/...", which will be
changed to match the structure in source.)
In order for Qt Creator to find the examples, qdoc must write the path
behind [QT_INSTALL_EXAMPLES] into the example manifest file. This patch
introduces "examplesinstallpath" that allows qdoc configs to specify the
missing part, e.g. the opengl qdocconf can add
examplesinstallpath = opengl
to tell qdoc that the examples will be installed into
"[QT_INSTALL_EXAMPLES]/opengl/"
Task-number: QTBUG-27801
Change-Id: Idf518e16d3ca0f9522b084e92f34725b93e9d11f
Reviewed-by: Martin Smith <martin.smith@digia.com>
J-P Nurmi [Mon, 26 Nov 2012 11:06:32 +0000 (12:06 +0100)]
Cleanup QCoreApplication::Type letfover docs
The enum was removed in 553e21.
Change-Id: I29bf049010b0424af3ca00095d8a36d53a7538e4
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
J-P Nurmi [Mon, 26 Nov 2012 12:48:48 +0000 (13:48 +0100)]
docs: mark QMacStyle internal
QMacStyle was made internal in 27aa41, but was accidentally
left public in the docs.
Change-Id: Id7841718af3a21bbbda3102858d1a11bccb8179b
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
hjk [Mon, 26 Nov 2012 13:04:31 +0000 (14:04 +0100)]
Examples: Install to $$[QT_INSTALL_EXAMPLES]/$submodule/$example
This makes the structure of the examples after an 'make install'
similar to the one in a 'developer build'.
Change-Id: I9120bd741fab332e64e30adc01cefe87e5633454
Reviewed-by: Martin Smith <martin.smith@digia.com>
Konstantin Ritt [Mon, 26 Nov 2012 05:39:34 +0000 (07:39 +0200)]
qmake: Test recursive function calls
Change-Id: If7d659728d30b2e5c52082ab999bc00de3733972
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Lars Knoll [Mon, 26 Nov 2012 12:12:36 +0000 (13:12 +0100)]
Delete codecs page
Unused and empty. QTextCodec and the Unicode overview
contains all relevant information.
Change-Id: I779ba4dea69a88802e34541e4ba44215b5d69c2a
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
J-P Nurmi [Mon, 26 Nov 2012 11:22:45 +0000 (12:22 +0100)]
tst_QSharedPointer: update application types
QCoreApplication::Type enum was removed in 553e21. This change updates
the (un)tested application types to match the application types
available in Qt 5.
Change-Id: I8631987a9ff31dc81baa013619cfc18616b851d1
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
J-P Nurmi [Fri, 23 Nov 2012 15:00:46 +0000 (16:00 +0100)]
tst_QGridLayout: use QProxyStyle instead of QWindowsStyle
QWindowsStyle is soon to become an internal class.
Change-Id: If163aae6910c0b082a9bcca1ebbab66660cc005f
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
J-P Nurmi [Fri, 23 Nov 2012 14:58:15 +0000 (15:58 +0100)]
tst_QFormLayout: use QProxyStyle instead of QWindowsStyle
QWindowsStyle is soon to become an internal class.
Change-Id: Ie28d4ea074938b17827aa803a2298f881946f7e5
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
J-P Nurmi [Fri, 23 Nov 2012 14:56:13 +0000 (15:56 +0100)]
tst_QBoxLayout: use QProxyStyle instead of QWindowsStyle
QWindowsStyle is soon to become an internal class.
Change-Id: I287c771a841ba96e445f0a0df96ea035be25ac74
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
J-P Nurmi [Fri, 23 Nov 2012 14:54:19 +0000 (15:54 +0100)]
tst_QMenuBar: use QProxyStyle instead of QWindowsStyle
QWindowsStyle is soon to become an internal class.
Change-Id: I422e7d67fadbb169d19285aab0a8ba0f3d668697
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
J-P Nurmi [Fri, 23 Nov 2012 14:50:48 +0000 (15:50 +0100)]
tst_QComboBox: use QProxyStyle instead of QWindowsStyle
QWindowsStyle is soon to become an internal class.
Change-Id: Ic76ecc20ff600a7d401b44c8dc4d93198c06becc
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Friedemann Kleint [Fri, 23 Nov 2012 16:26:25 +0000 (17:26 +0100)]
Fix keyboard grab in QWidgetWindow.
Task-number: QTBUG-28070
Change-Id: I6f55a2dd906ee896071137a5d47fb97c9a571b5f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Peter Kümmel [Thu, 22 Nov 2012 22:13:00 +0000 (23:13 +0100)]
fix wrong comment about #ifdef's end
Change-Id: I8a627c01ced1163e3ea72e9e2b1b55da04ca91b2
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Tasuku Suzuki [Thu, 22 Nov 2012 20:34:42 +0000 (05:34 +0900)]
Enable module build with QT_NO_CODECS
Change-Id: I27239384a7676a81495a9d3f7484975d2f277e8c
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Andy Shaw [Sat, 24 Nov 2012 09:40:29 +0000 (10:40 +0100)]
Change QTextLayout::textOption() to return a const reference instead
By changing textOption() to return a const reference we will get a
performance increase when accessing this function internally.
Task-number: QTBUG-28193
Change-Id: I65b594d844ebaee6d72f4a95d11bd2c5e801fab4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Konstantin Ritt [Sun, 25 Nov 2012 03:54:45 +0000 (05:54 +0200)]
moc: Fix assertion in QVector::first()
introduced in
aea68c93ae437a761584719f0f1ca93eaf6f7484
Change-Id: I05c1dfa16c42019ee0a0b44ffc50ad2c2c0d209b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Jens Bache-Wiig [Sun, 25 Nov 2012 16:10:25 +0000 (08:10 -0800)]
Fix color issue with sliders on Fusion style
We should not directly use the palette as it looks
weird on mac.
Change-Id: I2062bd43a8b28875330d9f8cc0eaa4069f3a43f6
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Jerome Pasion [Fri, 23 Nov 2012 15:45:23 +0000 (16:45 +0100)]
Doc: Removed annotated list in Qt Core's group pages.
The annotatedlist commands are not needed as QDoc automatically
generates the group members.
Change-Id: I462bb65bd5f29c1761799d3d60acab0bd4886075
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Thorbjørn Lund Martsum [Thu, 22 Nov 2012 18:49:05 +0000 (19:49 +0100)]
QHeaderView: - avoid cursor move on setDefaultSectionSize
If we are reacting on the sectionResized signal and we call
setDefaultSectionSize we should ensure that we are not moving
the mouse-cursor.
This is an improvement of
f8f6acb05ce9aa5fccc329bf5587adf14ed9a710
Change-Id: I1adee7821bc8fcc9633f692bfd515f2c458b12c8
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>