profile/ivi/qtbase.git
11 years agodoc: Fix Graphics View example docs
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>
11 years agoFix: Do not require GL library if configured with -no-opengl
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>
11 years agoFix reference to example paths
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>
11 years agoqdoc: Make extraimages behave like styles and scripts
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>
11 years agoCocoa: fix unresponsive dialogs causes application to hang
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>
11 years agoqdoc: Don't include inherited members in the class ref
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>
11 years agodon't check modules which were not requested
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>
11 years agodon't make the doc installs depend on the regular build
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>
11 years agofix doc target recursions
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>
11 years agomake the addition of docs/-install targets unconditional
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>
11 years agocentralize MAKEFILE writeout better
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>
11 years agomove QT_{SOURCE,BUILD}_TREE back to .qmake.cache
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>
11 years agoDoc: Updated CSS style for QML code snippets
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>
11 years agoFix compile with -DQT_NO_TRANSLATION
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>
11 years agoMake qtbase compile with QT_NO_IMAGEFORMATPLUGIN
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>
11 years agoDoc: Added a README file for building documentation.
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>
11 years agoDoc: Added documentation for the collidingmice example
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>
11 years agoDoc: Fix some more links
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>
11 years agoEnable network build with QT_NO_NETWORKPROXY
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>
11 years agoFix compile with -DQT_NO_WHEELEVENT
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>
11 years agoFix compile with -DQT_NO_DRAGANDDROP
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>
11 years agocompile with QT_NO_TOOLTIP
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>
11 years agoQtBase: Doc: Replacing link with snippet in QTranslator.
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>
11 years agoFixed crash in tst_qguiapplication with QT_QPA_PLATFORM=minimal
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>
11 years agoRemove QUUID_STRING from qfeatures.{h,txt}
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>
11 years agoFix typos and style in QSplitter documentation
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>
11 years agoChange copyrights from Nokia to Digia
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>
11 years agoQtBase: Added qtlinguist as a dependencie to the doc.
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>
11 years agoQWindowsFontDatabase: provide better fallbackFamilies.
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>
11 years agoQPluginLoader: fix loading of plugins with a relative file name
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>
11 years agoEnsure ctrl + click sends a right mouse button press in Cocoa
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>
11 years agoFix some typos in QProcess and QSslSocket unit tests.
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>
11 years agoMove Network Examples from qtdoc to qtbase
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>
11 years agoremove pointless QT.<module>.sources references
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>
11 years agoremove pointless zlib includes
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>
11 years agoremove pointless directory references
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>
11 years agoproperly syncqt-ize harfbuzz headers
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>
11 years agosupport flagging all headers from a particular source directory as privates
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>
11 years agofix support for multiple source directories per module
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>
11 years agoremove vestiges of QT_MODULE() checking code
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>
11 years agoqregexp benchmark needs exceptions
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>
11 years agoFix warning about cast from ASCII.
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>
11 years agoduplicate URL example image for the dbus index doc
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>
11 years agodoc: Fix snippets in threading docs
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>
11 years agoMoved the mainwindow examples from qtdoc
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>
11 years agoQNX: Fix plugin compilation
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>
11 years agoFix linking of itemviews and graphicsview examples
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>
11 years agoClear focus of GraphicsItem focus scopes and their children.
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>
11 years agoCompile with QT_NO_GESTURES.
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>
11 years agoMac: fix regression to make dialog resizable
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>
11 years agoQt D-Bus: Editing QCH titles.
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>
11 years agoMerge branch 'master' into stable
Oswald Buddenhagen [Mon, 3 Dec 2012 20:57:28 +0000 (21:57 +0100)]
Merge branch 'master' into stable

Change-Id: I5c0c9a131cca64fea3bc784339d14d84076edc1a

11 years agoDoc: Edited Qt OpenGL configuration to output correct QCH titles.
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>
11 years agoTag dialog examples and create dialog examples group
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>
11 years agointroduce QMAKE_RPATHLINKDIR (and QMAKE_LFLAGS_RPATHLINK)
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>
11 years agodon't forget to export rpath_link{,_private} to the cache
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>
11 years agoremove support for hand-written module pri files
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>
11 years agodon't auto-install example sources by default for all modules
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>
11 years agoauto-collect qml-related sources
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>
11 years agofactor out testcase_targets.prf
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>
11 years agoxcb: notify when the logical DPI changes; add Q_MM_PER_INCH constant
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>
11 years agoRemoved temporary backwards-compat properties and accessors in QWindow
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>
11 years agoCompile with QT_NO_COLORDIALOG.
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>
11 years agoDoc: Fixed online HTML template
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>
11 years agoWINCE: Fix missing cosf
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>
11 years agoStop using the name "Trolltech" in QSettings
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>
11 years agocentralize doc target related code
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>
11 years agoresolve private dependencies of tools as well
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>
11 years ago[QTBUG-27420] Make Q{Box,Grid,Form}Layout::takeAt() unparent a nested layout
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>
11 years agoFix wrong string length
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>
11 years agoFix wrong error message count in QDBusError
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>
11 years agoImprove auto-test of QFile.
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>
11 years agoCocoa: create dialogs as NSPanels
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>
11 years agoQSignalSpy: assorted improvements
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>
11 years agoMove gestures overview from qtdoc to qtbase; mention Qt Quick
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>
11 years agoProperly release pixel format and context in QCocoaGLContext.
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>
11 years agoBasic high-dpi "retina" support for Qt 5.
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>
11 years agoQWidget windows have fullscreen button by default; manual test for it
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>
11 years agoCocoa: Disable accessibility.
Morten Johan Sørvig [Wed, 28 Nov 2012 12:57:06 +0000 (13:57 +0100)]
Cocoa: Disable accessibility.

The accessibility implementation is unstable and
causes application crashes. Disable until it has
been stabilized.

Change-Id: Ic34361a0ad599c6f92df722499d274fe0655646b
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoDocs: Fixed enum and parameter links for network
Oliver Wolff [Fri, 30 Nov 2012 14:01:19 +0000 (15:01 +0100)]
Docs: Fixed enum and parameter links for network

Change-Id: Ie04e09d91e9b0781dc3bcbfe271c851fbe486849
Reviewed-by: David Schulz <david.schulz@digia.com>
11 years agoRenamed the keyboard-focus doc to make clear it's about Widgets
Shawn Rutledge [Fri, 30 Nov 2012 16:44:47 +0000 (17:44 +0100)]
Renamed the keyboard-focus doc to make clear it's about Widgets

Also link from the widgets index page.

Change-Id: I49cd415b09d7458d89d75931ecfaafe29c226c6f
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoAdded \ingroup and \brief qdoc tags to IPC examples.
Samuel Rødal [Fri, 30 Nov 2012 16:38:21 +0000 (17:38 +0100)]
Added \ingroup and \brief qdoc tags to IPC examples.

Change-Id: Ic8fb033597340bfb44ee7e0ca7a3763b36c097aa
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoMac: Fix small button metrics, menu indicator alignment
Gabriel de Dietrich [Fri, 30 Nov 2012 15:07:00 +0000 (16:07 +0100)]
Mac: Fix small button metrics, menu indicator alignment

Task-number: QTBUG-28275
Change-Id: I08de3cc7fee3af725c66ed081072277b2ca32601
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoANGLE: Fix debug-and-release builds
Friedemann Kleint [Fri, 30 Nov 2012 07:57:37 +0000 (08:57 +0100)]
ANGLE: Fix debug-and-release builds

Add a 'd' to debug builds to allow both release and debug builds
to be used.

- Add .def-files for Debug
- Build all libraries debug/release
- Add description to README.qt
- Differentiate debug/release in qmake.conf.

Task-number: QTBUG-28196

Change-Id: Ib3081004a6ed2ad71d353244154684d2e0ebbc86
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
11 years agoAngle: Use dynamic runtime library of MSVC.
Friedemann Kleint [Wed, 28 Nov 2012 07:21:41 +0000 (08:21 +0100)]
Angle: Use dynamic runtime library of MSVC.

It is also used in Qt, mixing both is not recommended.
Add to default variables instead of overwriting them.

Change-Id: I895d44d5ea17f98dde9979eea6ff10b98180cc08
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
11 years agoCocoa: fix modal native dialogs with ongoing modal sessions
Teemu Katajisto [Thu, 29 Nov 2012 10:46:23 +0000 (12:46 +0200)]
Cocoa: fix modal native dialogs with ongoing modal sessions

Commit 26db7de13d5885067844532b5a5814181a0ddf16 introduced the
modal session cleanup for Cocoa print dialog before running the
modal event loop for the dialog. Add the same cleanup for Cocoa
file, font and color dialog helpers.

Task-number: QTBUG-28146

Change-Id: Ifeb7c82566db35f0c6654be7762e9aaffbafb900
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoOpenGL: Remove bogus error in textures example on ES 2 platforms
Sean Harmer [Fri, 30 Nov 2012 10:48:54 +0000 (10:48 +0000)]
OpenGL: Remove bogus error in textures example on ES 2 platforms

The call to glGetBooleanv(GL_FRAMEBUFFER_SRGB_CAPABLE_EXT) in
QGLExtensions::currentContextExtensions() was resulting in an invalid
enum on ES 2 systems. This was not being cleared and subsequentally
being interpreted as a failed texture upload in the textures example.

This enum doesn't exist on ES 2 so don't query it.

Change-Id: I84f9c4b0aa8b11b6036eeed1f9378d110d9ea69d
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoWINCE: Fix renameing of resource files
Andreas Holzammer [Fri, 30 Nov 2012 15:18:26 +0000 (16:18 +0100)]
WINCE: Fix renameing of resource files

The standard resource files where renamed,
so fix the include for qmenu in Windows CE.

Change-Id: Id29dd8e1028cf438f4d483126a74994fc1e310d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoQGraphicsView - fix rubberband to stay right on scroll
Thorbjørn Lund Martsum [Wed, 28 Nov 2012 13:47:34 +0000 (14:47 +0100)]
QGraphicsView - fix rubberband to stay right on scroll

We should consider the scene-position when we are expanding
moving a rubberband. If the user does some auto-scroll
(Qt should support that itself, but that is another matter)
then the rubberband should not keep the (old) local position
to calculate the rubberband extension, but instead use the
scene-position that was actually clicked.

Change-Id: I04a2df6a1edae8b3587e1ac2104c7fe4ccfb7762
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoQNX: Move buffer count check to appropriate location
Rafael Roquetto [Thu, 29 Nov 2012 18:42:11 +0000 (16:42 -0200)]
QNX: Move buffer count check to appropriate location

The buffer count check should take place right after buffers are created. For
some reason, the buffer count value inside libscreen may become incosistent during
the course of the program.

Change-Id: Icbbaf4734eac5b0c5c95bdd93771899f9fcdb7db
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
11 years agoThreaded fortune server example: update the screenshot
Giuseppe D'Angelo [Fri, 30 Nov 2012 12:43:25 +0000 (12:43 +0000)]
Threaded fortune server example: update the screenshot

It didn't match the reality any more (now it shows an IP address
as well as the chosen port).

Change-Id: I7b942313ad5246a72186e3b9c93e54af8ab7a5ae
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoFix compile with -DQT_NO_WIZARD
Montel Laurent [Fri, 30 Nov 2012 18:00:11 +0000 (19:00 +0100)]
Fix compile with -DQT_NO_WIZARD

Change-Id: I6f7be895b8c4a1a65de43ee35d1fab25a30a25c6
Reviewed-by: David Faure <david.faure@kdab.com>
11 years agoFix compile when we use QT_NO_ACCESSIBILITY
Montel Laurent [Fri, 30 Nov 2012 17:53:15 +0000 (18:53 +0100)]
Fix compile when we use QT_NO_ACCESSIBILITY

Change-Id: I2d304fa6d91d86130eeb4a4aa07b43173d240312
Reviewed-by: David Faure <david.faure@kdab.com>
11 years agoFix compile with QT_NO_SHORTCUT
Montel Laurent [Fri, 30 Nov 2012 15:56:09 +0000 (16:56 +0100)]
Fix compile with QT_NO_SHORTCUT

Change-Id: Ib11f2e01fecb0c231211c92e4590cbaddc76246f
Reviewed-by: David Faure <david.faure@kdab.com>
11 years agoFix memory leak when error reported
Montel Laurent [Fri, 30 Nov 2012 10:53:23 +0000 (11:53 +0100)]
Fix memory leak when error reported

Change-Id: I0c4c0baed8f2a734b3986b0d446cd58df705f7e4
Reviewed-by: David Faure <david.faure@kdab.com>
11 years agoQMimeType: don't document the constructor that takes a Private class
David Faure [Thu, 22 Nov 2012 11:23:29 +0000 (12:23 +0100)]
QMimeType: don't document the constructor that takes a Private class

Change-Id: I238e1eca6938deb728085a5416220230d9e751c7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoANGLE: Do not reset the share handle when resetting the swap chain.
Zeno Albisser [Fri, 30 Nov 2012 12:20:44 +0000 (13:20 +0100)]
ANGLE: Do not reset the share handle when resetting the swap chain.

This change only affects the ANGLE_surface_d3d_texture_2d_share_handle
extension. The patch is necessary to have WebGL running in Qt/WebKit2.

If the share handle is reset, we are loosing the reference to the
EGLSurface and cannot actually reuse it in a different context anymore.

Change-Id: I0138432dd8ff60ea57e7e591cfa2f8db1d324f53
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoANGLE Patch file: Do not reset the share handle when resetting the swap chain.
Zeno Albisser [Fri, 30 Nov 2012 12:37:22 +0000 (13:37 +0100)]
ANGLE Patch file: Do not reset the share handle when resetting the swap chain.

Change-Id: I7ddc0f31b342ba40d4e14a99afdf237cb37d7ace
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoQtBase: Remove Meamo part and fix link in documentation
David Schulz [Fri, 30 Nov 2012 09:01:49 +0000 (10:01 +0100)]
QtBase: Remove Meamo part and fix link in documentation

... for Application Icon Example

Change-Id: I2efa0b49a13889db8b706523d06bf317d35cad4f
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoDocs: Moved layout example's image do correct location
Oliver Wolff [Fri, 30 Nov 2012 11:27:57 +0000 (12:27 +0100)]
Docs: Moved layout example's image do correct location

Change-Id: I85c6812d8d172c92fc4322d4300721e0f45f34e7
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>