Commit Graph

11133 Commits

Author SHA1 Message Date
Christian Stenger
5b57d93dcd Doc: Remove obsolete statement
Change-Id: Ic7f14dae391684a4870e030ab4549b3a59f1ea5f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-06 16:45:52 +01:00
Christian Stenger
8bb6ba0e2f Doc: Fix some enums
Change-Id: I58f2906e9605e8ab09cad29880006ed60cc23e80
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-06 16:45:52 +01:00
J-P Nurmi
61fac3c5f9 Docs: fix QStyle related warnings
Change-Id: I4e67e34ecc0fc8050938a681b2c393b8442fce2e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-06 14:46:13 +01:00
J-P Nurmi
1fc05fc192 QtWidgets docs: use WinVista screenshots instead of obsolescent WinXP
Change-Id: Ic7fd291d4ce4468ae12cf5dd102fbcc45387dd87
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-06 14:46:13 +01:00
hjk
1edf28839f 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>
2012-12-06 14:46:13 +01:00
Eskil Abrahamsen Blomfeldt
937e179727 doc: Avoid duplicate widget example entries
The link to widget examples in QtCore was added
in 4519d810d1, 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>
2012-12-06 14:46:13 +01:00
Eskil Abrahamsen Blomfeldt
fb9551b7d0 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>
2012-12-06 14:46:13 +01:00
hjk
c7b6a3ccdf 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>
2012-12-06 14:46:13 +01:00
David Schulz
ad0f3c4edb QtBase: Doc: Fix links to STL-style iterators
Change-Id: I2822c2a7e9bfc1949c20ff81e08961f641e961fb
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-06 14:46:13 +01:00
Joerg Bornemann
b4b02fe876 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>
2012-12-06 14:46:13 +01:00
Oswald Buddenhagen
bff38599d9 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>
2012-12-06 12:49:02 +01:00
Oswald Buddenhagen
eced14ec1c 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>
2012-12-06 12:49:02 +01:00
Oswald Buddenhagen
0815563924 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>
2012-12-06 12:49:02 +01:00
Oswald Buddenhagen
bf9d099c47 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>
2012-12-06 12:49:02 +01:00
Oswald Buddenhagen
787373d376 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>
2012-12-06 12:49:02 +01:00
Oswald Buddenhagen
ccea7b7114 remove unused assignment
Change-Id: Id60af477b9608bd3dfd0659d9d3a6e202fbe7dc9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-12-06 12:49:02 +01:00
David Faure
158f39ec78 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>
2012-12-06 12:49:02 +01:00
Eskil Abrahamsen Blomfeldt
ae8533e4ae 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>
2012-12-06 12:49:02 +01:00
aavit
0fc1b9d06e 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>
2012-12-06 12:49:02 +01:00
hjk
22e3111127 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>
2012-12-06 10:48:27 +01:00
Martin Smith
e77eec1cf7 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>
2012-12-05 19:31:10 +01:00
Richard Moe Gustavsen
fd4106e2d1 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>
2012-12-05 17:29:46 +01:00
Martin Smith
fd1f65a9b8 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>
2012-12-05 17:29:46 +01:00
Oswald Buddenhagen
4b819803f6 don't check modules which were not requested
Change-Id: I4928b37239af21dfc6edc84f1e989a2717614629
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-12-05 17:29:46 +01:00
Oswald Buddenhagen
943c04d879 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>
2012-12-05 17:29:46 +01:00
Oswald Buddenhagen
4404cd5165 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>
2012-12-05 17:29:46 +01:00
Oswald Buddenhagen
dab346fa25 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>
2012-12-05 17:29:46 +01:00
Oswald Buddenhagen
9a07707996 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>
2012-12-05 17:29:46 +01:00
Oswald Buddenhagen
621b0e2062 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>
2012-12-05 17:29:46 +01:00
Jerome Pasion
3aee20d4ab 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>
2012-12-05 17:29:46 +01:00
Montel Laurent
328df640f3 Fix compile with -DQT_NO_TRANSLATION
Change-Id: Ia6929f871485476e8b5bb14e7bf8117d0c562841
Reviewed-by: David Faure <david.faure@kdab.com>
2012-12-05 17:29:46 +01:00
Tasuku Suzuki
6a98976791 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>
2012-12-05 15:30:07 +01:00
Jerome Pasion
21e8ef1fef 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>
2012-12-05 15:30:07 +01:00
Venugopal Shivashankar
52aad26cee Doc: Added documentation for the collidingmice example
Task-number: QTBUG-27515

Change-Id: I1bc11d381c0ea8f6ef7ea32093d7e981ca9db91e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-05 15:30:07 +01:00
Christian Stenger
4519d810d1 Doc: Fix some more links
Change-Id: I94c853532cd3ed9bf18e6d471f99560e04131fdf
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-05 15:30:07 +01:00
Tasuku Suzuki
18033c075c 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>
2012-12-05 13:27:27 +01:00
Montel Laurent
f775f6dd88 Fix compile with -DQT_NO_WHEELEVENT
Change-Id: Icc345e2a361fc233d7debfa88bef2a3a8375fa8f
Reviewed-by: David Faure <david.faure@kdab.com>
2012-12-05 13:27:27 +01:00
Montel Laurent
422b8dd24e Fix compile with -DQT_NO_DRAGANDDROP
Change-Id: Ic7b42ae164f913f270c8350c2de6ce35f0be8c2a
Reviewed-by: David Faure <david.faure@kdab.com>
2012-12-05 13:27:27 +01:00
Montel Laurent
4d178743e4 compile with QT_NO_TOOLTIP
Change-Id: I9e769a343a9dd74dc80cffebfe9ad97981596036
Reviewed-by: David Faure <david.faure@kdab.com>
2012-12-05 11:35:16 +01:00
David Schulz
2568f8ab24 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>
2012-12-05 11:35:16 +01:00
Samuel Rødal
d7afbdc2d2 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>
2012-12-05 11:35:16 +01:00
Tasuku Suzuki
85e36faa2c 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>
2012-12-05 11:35:16 +01:00
David Gil
7396915541 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>
2012-12-05 09:24:38 +01:00
Sergio Ahumada
688e8beeb5 Change copyrights from Nokia to Digia
Change-Id: I841f4e6a6ee90cb3df1ff8f60c55ac84f6dd4125
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-05 06:33:43 +01:00
David Schulz
cc1bbb149c QtBase: Added qtlinguist as a dependencie to the doc.
Change-Id: I2df1cee84b250b75dc8436c8cff5df50cbeb0e01
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-12-04 20:49:46 +01:00
Pierre Rossi
3b5537765e 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>
2012-12-04 20:49:46 +01:00
David Faure
418890e074 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>
2012-12-04 18:38:41 +01:00
Andy Shaw
f6cc1f3aea 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>
2012-12-04 15:31:55 +01:00
Stephen Kelly
348c5bd19a 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>
2012-12-04 14:41:43 +01:00
Eskil Abrahamsen Blomfeldt
0f8b7deef1 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>
2012-12-04 14:40:38 +01:00