Gabriel de Dietrich [Wed, 5 Dec 2012 15:20:12 +0000 (16:20 +0100)]
Mac: Transient scrollbars should overlap in the corner on 10.8
Change-Id: Ied239d5e3cb05bed6b892607f0344e6daa028918
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Eskil Abrahamsen Blomfeldt [Thu, 6 Dec 2012 14:18:15 +0000 (15:18 +0100)]
doc: Add changes to dnd docs from qtdoc repository
Change
da54c5e7c9bf7647664a3529a6db487dee94d331 in the qdoc
repository was made to the wrong version of this documentation.
This change just adds them in qtbase and fixes some of the snippets
which were still broken.
Change-Id: Ie9ba57b5a2d20a629aa5f0a492daa207d35b2053
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Gabriel de Dietrich [Mon, 3 Dec 2012 18:00:03 +0000 (19:00 +0100)]
Mac: Animated expanding scrollbars on 10.8
Change-Id: Ib57d0347a7828ac7582b0fa95adf8d437694cd41
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Gabriel de Dietrich [Mon, 3 Dec 2012 14:55:15 +0000 (15:55 +0100)]
Mac: Cleaner transient scrollbar rendering
Change-Id: I617588012aa5166775c3c6301ee70043b22553a3
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Christian Stenger [Thu, 6 Dec 2012 14:36:17 +0000 (15:36 +0100)]
Docs: Fix some warnings
Change-Id: I3898c89e54aa671ff8cb1b25c49cfe3835ab9384
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Christian Stenger [Thu, 6 Dec 2012 12:37:02 +0000 (13:37 +0100)]
Doc: Remove obsolete statement
Change-Id: Ic7f14dae391684a4870e030ab4549b3a59f1ea5f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Christian Stenger [Thu, 6 Dec 2012 12:32:25 +0000 (13:32 +0100)]
Doc: Fix some enums
Change-Id: I58f2906e9605e8ab09cad29880006ed60cc23e80
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
J-P Nurmi [Thu, 29 Nov 2012 14:12:35 +0000 (15:12 +0100)]
Docs: fix QStyle related warnings
Change-Id: I4e67e34ecc0fc8050938a681b2c393b8442fce2e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
J-P Nurmi [Thu, 29 Nov 2012 15:44:01 +0000 (16:44 +0100)]
QtWidgets docs: use WinVista screenshots instead of obsolescent WinXP
Change-Id: Ic7fd291d4ce4468ae12cf5dd102fbcc45387dd87
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
hjk [Thu, 6 Dec 2012 13:04:38 +0000 (14:04 +0100)]
Adjust qttestlib.qdocconf to create qttestlib/examples-manifest.xml
Change-Id: I6c4c8d9b69f135229bd0bd28e8e57738742f6bd8
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Eskil Abrahamsen Blomfeldt [Thu, 6 Dec 2012 13:16:04 +0000 (14:16 +0100)]
doc: Avoid duplicate widget example entries
The link to widget examples in QtCore was added
in
4519d810d1d2be3af17bdd77edac2361620f9d2d, which made
widget examples pop up twice in generated lists
(once for qtcore and once for qtwidgets documentation).
I'm not sure why it was originally added to that module, but
the snippets in the fridgemagnets example (which was the
example fixed in the commit) has been verified to still work.
Change-Id: I1b349f08349b5499929315d426224ba8638adc8e
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Eskil Abrahamsen Blomfeldt [Thu, 6 Dec 2012 13:07:41 +0000 (14:07 +0100)]
doc: Add missing images in richtext example docs
Copied from Qt 4.8
Change-Id: Ic98a5e87305dbf9bb0df7ae071c42bb42a803b10
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
hjk [Thu, 6 Dec 2012 13:11:27 +0000 (14:11 +0100)]
Remove references to pre-build examples from dist/README
We do not want to ship them anymore.
Change-Id: I62ac985cdf3f6d13327d1fd88262cc60efc4a230
Reviewed-by: Hanne Linaae <hanne.linaae@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
David Schulz [Thu, 6 Dec 2012 08:49:07 +0000 (09:49 +0100)]
QtBase: Doc: Fix links to STL-style iterators
Change-Id: I2822c2a7e9bfc1949c20ff81e08961f641e961fb
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Joerg Bornemann [Tue, 4 Dec 2012 11:36:56 +0000 (12:36 +0100)]
MSVC: don't use the variable name LINK in generated makefiles
Rename LINK to LINKER. The MSVC linker uses the environment
variable LINK to pass additional command line arguments.
We must not hide this variable.
Task-number: QTBUG-28332
Change-Id: Id78476d1cf4a73175b9f47292c67f38a43ae5ba4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 5 Dec 2012 21:01:58 +0000 (22:01 +0100)]
remove dead line
the compile-all-mocs-as-one-file feature is gone for years
Change-Id: I6c35bce59c36b6920af2498661172b5938eeba52
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Wed, 5 Dec 2012 20:59:49 +0000 (21:59 +0100)]
use the same output dirs under windows as under unix
the times when directory names starting with a dot were a problem under
windows are sort of gone. for well over a decade.
Change-Id: Ia1a0782c878a055cc5c094c6b3e4df0741368433
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Wed, 5 Dec 2012 20:52:49 +0000 (21:52 +0100)]
replace all modules' build dirs while installing .pc, .la & .prl files
now we may get files with several mentions of the same lib/include dirs
on the same line, but that's essentially a non-issue.
Task-number: QTBUG-28336
Change-Id: I8204086420b82015f62090ae0a56908ce0cccee8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Wed, 5 Dec 2012 20:33:02 +0000 (21:33 +0100)]
export the Qt top-level include dir as pkg-config ${includedir}
this seems more generic, and allows for more substitutions inside the
generated files.
Change-Id: I7a2e37036f9f9f7dbf7f28f0976ef427dd28ee82
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Wed, 5 Dec 2012 19:54:09 +0000 (20:54 +0100)]
export only 'host_bins' to pkg-config, rather than a random selection of tools
the "export location" of the linguist tools was just bogus, and lconvert
was missing anyway. the two dbus tools and qdoc were missing, too.
generally, it seems useless to report the paths of some random tools -
instead, just report the install location of the host binaries and let
users figure out the complete paths themselves - this should be ok, as
we decided that distributors are not supposed to do tool renaming any
more.
for the binary path just use the final location, as the files won't be
used before installation anyway. this allows us removing the scary
generic prefix replace from the pc file installs.
and as a side effect this also fixes debug_and_release builds of core
and widgets by not loading various prf files prematurely and thereby
messing up the dir replacement magic.
Task-number: QTBUG-28286
Change-Id: I99de419301fc07fb923959db4bd5cab9072d1c31
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Wed, 5 Dec 2012 19:38:01 +0000 (20:38 +0100)]
remove unused assignment
Change-Id: Id60af477b9608bd3dfd0659d9d3a6e202fbe7dc9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
David Faure [Thu, 6 Dec 2012 09:47:59 +0000 (10:47 +0100)]
Remove the TRUE and FALSE macros
They are completely unused in Qt, and are a potential source of
compilation errors in application code.
Change-Id: I6dfe2891f3b2365a30048f99c31e8e3a2425e62b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Eskil Abrahamsen Blomfeldt [Thu, 6 Dec 2012 10:50:33 +0000 (11:50 +0100)]
doc: Fix Graphics View example docs
Make the same layout of the new graphics view example documentation
as we had before (except by using annotatedlist instead of hardcoding
the links). I've also moved four examples from qtdoc to qtbase so
that they can be included in this documentation.
Change-Id: Ic2202ade119cadd98d036f1bd77e91dae49b5677
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
aavit [Wed, 5 Dec 2012 14:32:00 +0000 (15:32 +0100)]
Fix: Do not require GL library if configured with -no-opengl
qt_lib_gui.pri would add an unneeded -lGL, causing the build to fail
on systems with no GL libraries.
Change-Id: I3a49418e1393642e9d97999b79741cc2144a99af
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
hjk [Thu, 6 Dec 2012 09:33:23 +0000 (10:33 +0100)]
Fix reference to example paths
This eliminates seven EXAMPLE PATH DOES NOT EXIST warnings.
Change-Id: Iaa6267138a1799fb775f0034805d5691bfa40d7c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Martin Smith [Wed, 5 Dec 2012 11:09:51 +0000 (12:09 +0100)]
qdoc: Make extraimages behave like styles and scripts
This configuration variable now assumes its values,
if relative, are relative to the config file that
contains the extraimages variable.
Task-number: QTBUG-28307
Change-Id: I9b34d1f456b31e36ac77401b957b68cd10590376
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Richard Moe Gustavsen [Wed, 5 Dec 2012 10:36:25 +0000 (11:36 +0100)]
Cocoa: fix unresponsive dialogs causes application to hang
The reason for this bug seems to be related to how we wait for
more events in the event dispatcher. We use the nextEventMatchingMask
function, which already in Qt4 showed to have problems when telling
it to not dequeue the event. The solution back then was to
tell it to dequeue the event, and instead repost in front again.
Why this was changed in Qt5 is uncertain (other than it being tempting)
but moving the same code back in will solve the bug.
Note that this bug might also stem from the fact that the run loop
sources we add in the event dispatcher fires before the application
is really ready to show modal dialogs. E.g refusing to execute a
modal dialog before NSAppDelegate applicationWillFinishLaunching
is called will also fix the problem. But this code change is to big
atm, and can easily introduce other unforeseen regressions.
Task-number: QTBUG-28283
Change-Id: I07cd109568c2b9c782cf5120a9eb2ac71128cada
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Martin Smith [Tue, 4 Dec 2012 13:12:30 +0000 (14:12 +0100)]
qdoc: Don't include inherited members in the class ref
Once upon a time, the inherited functions, signals,
slots, etc were not listed on the class reference
page, but they were counted and a link to the base
class was provided for them, eg:
2 public functions inherited from QAbstractListModel
39 public functions inherited from QAbstractItemModel
31 public functions inherited from QObject
Somehow, this got broken, so that all these inherited
things were listed on the class reference page as if
they were members of the class. But they liunked to
the documentation in the base class.
This now works correctly again. It simnplifies the
class reference pages a lot.
Task-number: QTBUG-27496
Change-Id: If493da8cbf81634f1344b12094d9a06f8528e8e5
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Oswald Buddenhagen [Tue, 4 Dec 2012 20:58:41 +0000 (21:58 +0100)]
don't check modules which were not requested
Change-Id: I4928b37239af21dfc6edc84f1e989a2717614629
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Tue, 4 Dec 2012 20:55:06 +0000 (21:55 +0100)]
don't make the doc installs depend on the regular build
it's pretty pointless
Change-Id: Icea0073683a2d949798147fba3fad5b3331b1125
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Tue, 4 Dec 2012 20:25:05 +0000 (21:25 +0100)]
fix doc target recursions
in particular for the meta Makefiles of debug_and_release.
the logic is as follows:
- the meta targets ('html_docs' in prepare_docs mode, and 'docs' always)
need to branch out asap, so they are implemented non-recursively in
every makefile.
- all other targets need to be fully recursive. the meta Makefile will
recurse only into one of debug or release, depending on the configure
option (it doesn't matter anyway).
Change-Id: I4e3f714cdda9c3a1021743148b5ee73379e3484d
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Tue, 4 Dec 2012 20:24:27 +0000 (21:24 +0100)]
make the addition of docs/-install targets unconditional
there is no reason why something should break out of the system.
Change-Id: I081bffc0927b43ac4940d0200e32e1e60f6f2e97
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Tue, 4 Dec 2012 20:17:24 +0000 (21:17 +0100)]
centralize MAKEFILE writeout better
nmake depends on a variable being assigned before it is referenced, so
just write it out to every Makefile as the very first thing.
this is nicer than the previous hack anyway.
Change-Id: I50f409919352f560f7ef6c848a2f7c51d1878148
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Tue, 4 Dec 2012 13:49:03 +0000 (14:49 +0100)]
move QT_{SOURCE,BUILD}_TREE back to .qmake.cache
they cannot be legally used outside qtbase - it's the antithesis of
modularization.
Change-Id: I847844ea0ddce599f130f396d68cb61fa8f34135
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Jerome Pasion [Tue, 4 Dec 2012 16:38:23 +0000 (17:38 +0100)]
Doc: Updated CSS style for QML code snippets
-padding should be the same as C++ code snippet.
Change-Id: Idba44d252f411f70b6957161b83626811c1c69f2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Montel Laurent [Wed, 5 Dec 2012 13:40:38 +0000 (14:40 +0100)]
Fix compile with -DQT_NO_TRANSLATION
Change-Id: Ia6929f871485476e8b5bb14e7bf8117d0c562841
Reviewed-by: David Faure <david.faure@kdab.com>
Tasuku Suzuki [Wed, 5 Dec 2012 01:11:54 +0000 (10:11 +0900)]
Make qtbase compile with QT_NO_IMAGEFORMATPLUGIN
Change-Id: I1fef96481fa902cfd9de63fa814f70412eee4d15
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: aavit <eirik.aavitsland@digia.com>
Jerome Pasion [Tue, 4 Dec 2012 17:47:37 +0000 (18:47 +0100)]
Doc: Added a README file for building documentation.
Change-Id: I5987af88f7e8efc1b3c4fb788e5fd985e53b08a1
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Venugopal Shivashankar [Tue, 4 Dec 2012 16:57:27 +0000 (17:57 +0100)]
Doc: Added documentation for the collidingmice example
Task-number: QTBUG-27515
Change-Id: I1bc11d381c0ea8f6ef7ea32093d7e981ca9db91e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Christian Stenger [Wed, 5 Dec 2012 12:46:03 +0000 (13:46 +0100)]
Doc: Fix some more links
Change-Id: I94c853532cd3ed9bf18e6d471f99560e04131fdf
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Tasuku Suzuki [Thu, 22 Nov 2012 18:17:47 +0000 (03:17 +0900)]
Enable network build with QT_NO_NETWORKPROXY
Change-Id: Id26f0b45959ab3ee2390ea2d3e0d4ec321029e5c
Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Montel Laurent [Sun, 2 Dec 2012 21:53:25 +0000 (22:53 +0100)]
Fix compile with -DQT_NO_WHEELEVENT
Change-Id: Icc345e2a361fc233d7debfa88bef2a3a8375fa8f
Reviewed-by: David Faure <david.faure@kdab.com>
Montel Laurent [Wed, 5 Dec 2012 10:43:14 +0000 (11:43 +0100)]
Fix compile with -DQT_NO_DRAGANDDROP
Change-Id: Ic7b42ae164f913f270c8350c2de6ce35f0be8c2a
Reviewed-by: David Faure <david.faure@kdab.com>
Montel Laurent [Mon, 3 Dec 2012 11:11:27 +0000 (12:11 +0100)]
compile with QT_NO_TOOLTIP
Change-Id: I9e769a343a9dd74dc80cffebfe9ad97981596036
Reviewed-by: David Faure <david.faure@kdab.com>
David Schulz [Wed, 5 Dec 2012 09:14:13 +0000 (10:14 +0100)]
QtBase: Doc: Replacing link with snippet in QTranslator.
Because the linguist examples are moved to qttools module, a link
to the hellotr example broke.
Change-Id: I2aeefc143578618396f5be38ed1d52afdd1f7436
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Samuel Rødal [Wed, 5 Dec 2012 08:42:16 +0000 (09:42 +0100)]
Fixed crash in tst_qguiapplication with QT_QPA_PLATFORM=minimal
The tst_qguiapplication creates and destroys multiple instances of
QGuiApplication. Since the minimal platform plugin doesn't report any
theme names, the platform_theme never gets set to 0 in init_platform,
and we end up trying to use or at least delete an already deleted
QPlatformTheme.
Change-Id: I1a41d55b0705c5531c019e60a7a96dac144bacb7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Tasuku Suzuki [Fri, 23 Nov 2012 09:21:02 +0000 (18:21 +0900)]
Remove QUUID_STRING from qfeatures.{h,txt}
It is too specific and relatively small
Change-Id: I55ec15ecaac0692741996a5c15a111db696490cf
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
David Gil [Tue, 4 Dec 2012 23:41:43 +0000 (00:41 +0100)]
Fix typos and style in QSplitter documentation
Change-Id: Ieacbfd06067ae1ca687030204125814bd9e48bd8
Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Sergio Ahumada [Tue, 4 Dec 2012 20:14:45 +0000 (21:14 +0100)]
Change copyrights from Nokia to Digia
Change-Id: I841f4e6a6ee90cb3df1ff8f60c55ac84f6dd4125
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
David Schulz [Tue, 4 Dec 2012 14:40:30 +0000 (15:40 +0100)]
QtBase: Added qtlinguist as a dependencie to the doc.
Change-Id: I2df1cee84b250b75dc8436c8cff5df50cbeb0e01
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Pierre Rossi [Tue, 4 Dec 2012 17:05:09 +0000 (18:05 +0100)]
QWindowsFontDatabase: provide better fallbackFamilies.
Borrowed some code from QWindowsFontDatabase::createEngine that will
help ensure our fallback options are thorough enough to display say
chinese glyphs when using the QRawFont + QTextLayout combination that
QtWebKit relies on.
Task-number: QTWEBKIT-383
Change-Id: Ie4c1d5ef7d58588afaa436c89a9575ffd646c314
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
David Faure [Mon, 3 Dec 2012 11:29:10 +0000 (12:29 +0100)]
QPluginLoader: fix loading of plugins with a relative file name
This makes QT_PLUGIN_PATH / QCoreApplication::libraryPaths() actually work,
as a search path for plugins, when apps look for a specific plugin by name.
To make it possible to write portable code (unlike the current QPluginLoader
unittest), let QPluginLoader figure out the extension, too.
Change-Id: I895d597d7cb05ded268734bc5f313f32d8d12cb9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Andy Shaw [Mon, 3 Dec 2012 21:03:53 +0000 (22:03 +0100)]
Ensure ctrl + click sends a right mouse button press in Cocoa
Since Mac's typically just have one button for their mice then pressing
Control then clicking the button should end it as a right mouse button
event.
Task-number: QTBUG-28350
Change-Id: Iabcac5b315c36cb8cd062c27d7b1506bc066f5bb
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Stephen Kelly [Tue, 4 Dec 2012 10:46:40 +0000 (11:46 +0100)]
Fix some typos in QProcess and QSslSocket unit tests.
The QSslSocket one is both wrong and redundant as there is a
Q_DECLARE_METATYPE for it already.
Change-Id: I63d065abfb3d0e3d82a8b1f29a6752b7676db847
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Eskil Abrahamsen Blomfeldt [Tue, 4 Dec 2012 13:06:35 +0000 (14:06 +0100)]
Move Network Examples from qtdoc to qtbase
Move the main example overview and use the \group tag convention
to make the list update automatically.
Change-Id: Ib2cc8cf7def9a7f3dce6b7ed6d4958771cbdf5cd
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Oswald Buddenhagen [Mon, 3 Dec 2012 20:18:24 +0000 (21:18 +0100)]
remove pointless QT.<module>.sources references
there is no point to use this for in-module references.
cleaning it out in an attempt to purge the constants entirely.
Change-Id: I1da4d70e3778257dd43eda0bdfc71eaec1124732
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Mon, 3 Dec 2012 20:16:13 +0000 (21:16 +0100)]
remove pointless zlib includes
Change-Id: I352f6f9626c012c39ac97163ac83b3e24a9e9c7a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Mon, 3 Dec 2012 20:15:28 +0000 (21:15 +0100)]
remove pointless directory references
Change-Id: Ice43a3d3eeab5ada35e1439e055eb7b709d66c83
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Mon, 3 Dec 2012 20:15:02 +0000 (21:15 +0100)]
properly syncqt-ize harfbuzz headers
we were already installing them into QtCore/private, so turn them into
proper private headers to start with. this cleans up our project files.
Change-Id: I0795f79e03b60b5854de9e4dc339e9b5a5e6fd87
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Mon, 3 Dec 2012 19:35:02 +0000 (20:35 +0100)]
support flagging all headers from a particular source directory as privates
Change-Id: Ia893abc95b358d8a8ffd690563f2f02bc20fd98d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Mon, 3 Dec 2012 19:33:48 +0000 (20:33 +0100)]
fix support for multiple source directories per module
Change-Id: I040cb928e016c3a8257a1bcbf20627d67f07c84d
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Mon, 3 Dec 2012 19:31:04 +0000 (20:31 +0100)]
remove vestiges of QT_MODULE() checking code
Change-Id: Icf863c3ca7218af54cb5698d848db786d49481cc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Mon, 3 Dec 2012 17:53:22 +0000 (18:53 +0100)]
qregexp benchmark needs exceptions
Change-Id: I3833345a09e49899c256b4410783b6a08111c4a0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Friedemann Kleint [Mon, 3 Dec 2012 15:08:36 +0000 (16:08 +0100)]
Fix warning about cast from ASCII.
Change-Id: Icc251a8d26db022077c84ff2d0911868b56c9fd6
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Shawn Rutledge [Mon, 3 Dec 2012 12:49:28 +0000 (13:49 +0100)]
duplicate URL example image for the dbus index doc
Change-Id: Icd25711e4ede9fd3292d087103402f25a755d102
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Eskil Abrahamsen Blomfeldt [Tue, 4 Dec 2012 09:40:23 +0000 (10:40 +0100)]
doc: Fix snippets in threading docs
The examples have been put under examples/widgets which is probably
not correct, since they don't even have gui. The correct fix would
probably be to move them into threads/, but that would risk a lot of
breakage, so the conservative work-around is just to use the correct
relative paths instead.
Change-Id: I36c3aa45056c8825d1991f345ad7d7799e2fa5fc
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Gunnar Sletta [Mon, 3 Dec 2012 15:43:45 +0000 (16:43 +0100)]
Moved the mainwindow examples from qtdoc
Change-Id: I5a11933e86c6c71f68a55e45c7bcfdfc702bf4e6
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Rafael Roquetto [Mon, 3 Dec 2012 20:43:44 +0000 (18:43 -0200)]
QNX: Fix plugin compilation
Fix the plugin compilation after
cd34da54269e6cd7fa5c18242d982736f022a14a
renamed the QWindow API.
Change-Id: I3ec4ce9ae2df9a66f6bf24a18277bc59c05d2e8e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Christian Stenger [Fri, 30 Nov 2012 15:31:06 +0000 (16:31 +0100)]
Fix linking of itemviews and graphicsview examples
Change-Id: I6905cc6945e2eb396108f9fb16da042e576e3afb
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Andrew den Exter [Mon, 3 Dec 2012 07:03:02 +0000 (17:03 +1000)]
Clear focus of GraphicsItem focus scopes and their children.
A focus scope has effective focus if one of its children is the focus item,
clearFocus() should remove effective focus from an item and its children
not just from the focus item.
Task-number: QTBUG-28328
Change-Id: I62a292eff000151e50b2f5221e22f326a380fc3a
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Volker Krause [Mon, 3 Dec 2012 12:17:55 +0000 (13:17 +0100)]
Compile with QT_NO_GESTURES.
Change-Id: I9f8f7c586ccb5de227ec42af44159af90b39d1dd
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Liang Qi [Fri, 30 Nov 2012 10:27:34 +0000 (11:27 +0100)]
Mac: fix regression to make dialog resizable
Task-number: QTBUG-28254
Change-Id: I8623a68d589bec17042935ad308f85ddc953540d
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Jerome Pasion [Mon, 3 Dec 2012 16:34:37 +0000 (17:34 +0100)]
Qt D-Bus: Editing QCH titles.
Task-number: QTBUG-28341
Change-Id: Icf0f87e8c108bc12575512b7e4ecac46779fc362
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Oswald Buddenhagen [Mon, 3 Dec 2012 20:57:28 +0000 (21:57 +0100)]
Merge branch 'master' into stable
Change-Id: I5c0c9a131cca64fea3bc784339d14d84076edc1a
Jerome Pasion [Mon, 3 Dec 2012 15:10:36 +0000 (16:10 +0100)]
Doc: Edited Qt OpenGL configuration to output correct QCH titles.
Task-number: QTBUG-28341
Change-Id: I7d990c66a9efe42719165564007fb3bdff2e1279
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Gunnar Sletta [Mon, 3 Dec 2012 14:11:51 +0000 (15:11 +0100)]
Tag dialog examples and create dialog examples group
Change-Id: I0049b841dd5aee806e8aed36af069b0507e3c9f1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Oswald Buddenhagen [Mon, 3 Dec 2012 11:34:37 +0000 (12:34 +0100)]
introduce QMAKE_RPATHLINKDIR (and QMAKE_LFLAGS_RPATHLINK)
complementary to QMAKE_RPATHDIR. this avoids that we need to sprinkle
linux/gcc specific code all over the place.
Task-number: QTBUG-27427
Change-Id: Iebafd1749d1a0d803704902473df8c743f074ddc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Sat, 1 Dec 2012 10:46:51 +0000 (11:46 +0100)]
don't forget to export rpath_link{,_private} to the cache
Change-Id: I1d204696ed0e4ef5e45dc1716b3d6a8224b3169b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 30 Nov 2012 20:16:25 +0000 (21:16 +0100)]
remove support for hand-written module pri files
all modules have been migrated to auto-generation
Change-Id: Ie7b3ebfd735a22f8e0b0339909b6385508d7a6b3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Oswald Buddenhagen [Fri, 30 Nov 2012 16:42:45 +0000 (17:42 +0100)]
don't auto-install example sources by default for all modules
turns out that some modules need a lot of work, so make it opt-in for
the time being.
Change-Id: I16365e3d96adab98a1bc748907dbd67488dfad5f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Oswald Buddenhagen [Fri, 30 Nov 2012 15:50:05 +0000 (16:50 +0100)]
auto-collect qml-related sources
Change-Id: Ia5b56227c2c1f18254d35f6105ac3a146f085e3b
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Oswald Buddenhagen [Tue, 27 Nov 2012 15:57:07 +0000 (16:57 +0100)]
factor out testcase_targets.prf
instead of letting *every* qmake-based project have recursive check target,
let interested projects "subscribe" to it by adding CONFIG+=testcase_targets
in a central place (.qmake.conf, which Qt itself does via qt_build_config.prf).
Change-Id: Ib13fdd2d3a1adee0c5ad02b6b176a664c583bf9d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Shawn Rutledge [Fri, 12 Oct 2012 15:33:51 +0000 (17:33 +0200)]
xcb: notify when the logical DPI changes; add Q_MM_PER_INCH constant
Change-Id: I15696bf45ae99cc5b0fd95dab4884fc85cbfc6da
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Shawn Rutledge [Fri, 30 Nov 2012 09:59:07 +0000 (10:59 +0100)]
Removed temporary backwards-compat properties and accessors in QWindow
Change-Id: I718b877e3b6c0b1191a932d934599d5c2f5aa958
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Volker Krause [Fri, 30 Nov 2012 14:09:56 +0000 (15:09 +0100)]
Compile with QT_NO_COLORDIALOG.
Change-Id: I37e3fed497f3595942662efb22114de57ea4c9db
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Jerome Pasion [Mon, 3 Dec 2012 10:09:42 +0000 (11:09 +0100)]
Doc: Fixed online HTML template
-missing a slash
Change-Id: I866e7438fe67a7a78eefa57379a8d5cd99537a66
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Andreas Holzammer [Fri, 30 Nov 2012 14:39:58 +0000 (15:39 +0100)]
WINCE: Fix missing cosf
cosf seems to be defined in the cmath header
for Windows CE, so include it to fix the
issue of not finding the symbol cosf.
Change-Id: I7317668838912325d45be0d4087ae3055940d3cd
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Sergio Ahumada [Sun, 2 Dec 2012 16:24:19 +0000 (17:24 +0100)]
Stop using the name "Trolltech" in QSettings
Also change Trolltech for QtProject in other places
Task-number: QTBUG-23269
Change-Id: Ie4e344f23cab77c575562d18b481b3369ce30491
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Oswald Buddenhagen [Fri, 30 Nov 2012 20:07:47 +0000 (21:07 +0100)]
centralize doc target related code
Change-Id: I710a7f2fc3422ec8ba5b8e90bfd92e7931092ad0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 30 Nov 2012 20:09:46 +0000 (21:09 +0100)]
resolve private dependencies of tools as well
Change-Id: I25c73661489f0a6e6ecf3bb423cdae6435221e25
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Marc Mutz [Sun, 21 Oct 2012 18:10:22 +0000 (20:10 +0200)]
[QTBUG-27420] Make Q{Box,Grid,Form}Layout::takeAt() unparent a nested layout
QStackedLayout doesn't have support for QLayout, only QWidget, so
the issue doesn't arise there.
Reported-by: Johannes Schaub
Task-number: QTBUG-27420
Change-Id: I71f8d10a036918c16d8f8c9197a2ec61cd76cf01
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Peter Kümmel [Sat, 1 Dec 2012 14:20:49 +0000 (15:20 +0100)]
Fix wrong string length
Change-Id: Ic10aed6fc59d2518583caf78848711bdc97b4665
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Peter Kümmel [Sat, 1 Dec 2012 10:32:50 +0000 (11:32 +0100)]
Fix wrong error message count in QDBusError
Don't pass the pointer errorMessages_string - 1 to strcmp().
-1 marks the end should not be used for the pointer arithmetic
in get(const char *name)
Change-Id: I5ec239c63f074d104d441511294554f21fd6eccd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Friedemann Kleint [Thu, 29 Nov 2012 11:59:35 +0000 (12:59 +0100)]
Improve auto-test of QFile.
Execute the test in a temporary directory, purge remaining files
except the special readonly-files in cleanup().
Avoid repeated invocation of QFINDTESTDATA() by assigning to
member variables.
Do more checks in rename(), check on contents of file.
Generally, use more QVERIFY2, print error messages.
Task-number: QTBUG-3570
Change-Id: Ibd0e11a361208a716ea3efbcca76adeda70e061a
Reviewed-by: David Faure (KDE) <faure@kde.org>
Teemu Katajisto [Fri, 30 Nov 2012 10:56:48 +0000 (12:56 +0200)]
Cocoa: create dialogs as NSPanels
NSPanels have builtin support to work with modal sessions.
Task-number: QTBUG-28111
Change-Id: Ifeb6de03129e77aad744b3989931964c375cdbc7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Marc Mutz [Sun, 21 Oct 2012 17:02:51 +0000 (19:02 +0200)]
QSignalSpy: assorted improvements
- Add const
- Add explicit (only effect under C++11;
C++98 knows no multi-arg implicit conversions)
- Add Q_DECL_OVERRIDE to qt_metacall reimplementation
- Add reserve() calls on containers
- Change 'args' from QList to QVector for a 2x
memory reduction on 64bit platforms
Change-Id: If6c779dac0499d4ab64e5191d37596edf7341f76
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Shawn Rutledge [Fri, 30 Nov 2012 18:30:12 +0000 (19:30 +0100)]
Move gestures overview from qtdoc to qtbase; mention Qt Quick
On the one hand this doc reads like an overview, but didn't mention
Qt Quick; on the other, the gestures framework is questionable,
and in any case is solidly in the widgets module, not reusable for
Qt Quick. So, just added some comments at the end to make it clear
that Qt Quick takes a different approach. Also changed the relevant
links because the title has changed.
Change-Id: I66a0c0c106f496de26fb8947e90826ef39ccfddd
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Zeno Albisser [Tue, 27 Nov 2012 09:40:45 +0000 (10:40 +0100)]
Properly release pixel format and context in QCocoaGLContext.
Change-Id: Idd13924dccc8d7798f463484eeb3c3074f7b51f1
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Morten Johan Sørvig [Tue, 20 Nov 2012 10:34:52 +0000 (11:34 +0100)]
Basic high-dpi "retina" support for Qt 5.
Bring Qt 5 on par with Qt 4, prepare for more comprehensive
support later on.
Introduce device independent pixels (dips), device pixels,
and devicePixelRatio. Add high-dpi support to QPainter,
QGLWidget, the cocoa platform plugin, mac and fusion styles.
Dips are similar to CSS pixels, Apple points and
Android density-independent pixels. Device pixels
are pixels in the backing store/physical pixels on screen.
devicePixelRatio is the ratio between them, which is
1.0 on standard displays and 2.0 on "retina" displays.
New API:
QImage::devicePixelRatio() and setDevicePixelRatio()
QPixmap::devicePixelRatio() and setDevicePixelRatio()
QWindow::devicePixelRatio()
QScreen::devicePixelRatio()
QGuiApplicaiton::devicePixelRatio()
Change-Id: If98c3ca9bfdf0e1bdbcf7574cd5b912c9ff63856
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Shawn Rutledge [Wed, 28 Nov 2012 18:46:04 +0000 (19:46 +0100)]
QWidget windows have fullscreen button by default; manual test for it
It's again possible for QWindows and widget windows to go into
fullscreen mode on the Mac.
Change-Id: I7b304a135838394ef0392f89be4f225f2949fad3
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>