Commit Graph

11273 Commits

Author SHA1 Message Date
Miikka Heikkinen
c9d40ef2c1 Add PLUGIN_CLASS_NAME to qtbase plugins
Needed for automating static plugin loading.

Task-number: QTBUG-28131
Change-Id: Icd993c0fc8335f29aeec30e853a408d888069399
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-12-10 15:32:33 +01:00
Oliver Wolff
b22eb09b48 Fixed installation of gui examples' targets
Change-Id: Ie945ffac56ed83d2dc4605a073bcab4ef6f290ac
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-12-10 15:31:06 +01:00
Sergio Martins
1eabbc0908 Blackberry: Fix crash when opening file dialog without parent.
If parent is null, we now use qqnxintegration->primaryScreen()

This simplifies ctors of QQnxTheme and QQnxFileDialogHelper which now
receive a QQnxIntegration pointer instead of receiving a font database
and a bps event filter.

Change-Id: I3b1ed4d99f738b980a4f19a98618341a14e0c222
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
2012-12-10 13:23:51 +01:00
David Schulz
aa3a75ce14 QtBase: Doc: Fix Links to designer manual.
Change-Id: I87f68fb70aa773c44b90b58bd56fc5585a7e4107
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-12-10 10:38:28 +01:00
David Schulz
db5966f929 QtBase: Remove linguist example which was already moved
... to QtTools.

Change-Id: I707d8debcf35b01046b78718fd4b48c03b1fa6e2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-12-10 10:38:21 +01:00
Joerg Bornemann
f9ebe26aae support include paths for the Windows resource compiler
In RC_INCLUDEPATH one can add include paths for the Windows resource
compiler.

Task-number: QTBUG-13776

Change-Id: If1d9ed44097adb7789df03e4ccd4e3b7df9e8d08
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-12-10 10:17:25 +01:00
Joerg Bornemann
e23e224498 qmake: fix extra compilers in vcxprojs for single config mode
In single config mode extra compilers were not written to Visual
Studio project files, because they were not added to the fake project
object we're using to write a single config project.

Task-number: QTBUG-27505

Change-Id: Ie57b648861573496252f1383dc77e0729e244947
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-12-10 10:17:17 +01:00
Christian Stenger
ed043bf24a Doc: Updated outdated docs to use new macro
Change-Id: I9a3528112fba1db988592d9f4f470ec678e81e1a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-10 09:44:19 +01:00
Miikka Heikkinen
db4aa4d1d5 Only handle QTPLUGIN when linking against static Qt
Usage of QTPLUGIN implies static Qt, so only handle it when that is
true so user projects do not need to scope it if they support linking
against both static and shared Qt.

Change-Id: I011b4672bac122d7d64d8f2fc0e41ca7e5251dfc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-12-07 19:55:19 +01:00
Miikka Heikkinen
21105e7138 Fix module pri file name for static plugins
Since QTPLUGIN variable values are used to locate both the plugin
library and the module pri file, those must match. Therefore generate
module pri file name using the TARGET of the plugin rather than the
pro file name.

Change-Id: I9ec6f2a087ba3b3cecf7034c8a28b31df155cd97
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-12-07 19:55:13 +01:00
Oswald Buddenhagen
6fb7222707 move cmake template files under features/data/
there will be more template data, and it wouldn't be too nice
to spread it all over mkspecs/.

Change-Id: I909c48d26ac34f8c0f66051a65d326366d49c096
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-12-07 19:54:44 +01:00
Oswald Buddenhagen
14382d77c5 simplify code by using new $$absolute_path() function
Change-Id: Ie8102eea5c2b108154b76ed35bdbc6d8572bd4a5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-12-07 19:54:39 +01:00
Oswald Buddenhagen
5a0ac34396 finish the job of removing uic3 support
this should have been in 048b697c07.

Change-Id: I8589453ef937db1a9a446b0e5d01bb830b0cf6b0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-12-07 19:54:32 +01:00
Oswald Buddenhagen
d6fd4e52f1 remove another dead assignment
Change-Id: I79ffdba571b48def4494b018b2a2abdee8aab0a8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-12-07 19:54:22 +01:00
Morten Johan Sorvig
b9321a1a5f Implement Cocoa KeyMapper.
Port Qt 4 implementation. Shortcuts such as shift-5
should now work.

Change-Id: I1d8c4c6c4a903142361996b558ee31c8549fcef6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-07 17:02:41 +01:00
Stephen Kelly
c4642b45cf Only generate -fPIE on unix.
This follows the same logic used to set bsymbolic_functions.

Change-Id: I9300eab8a1b6673c4409b5dd07b40123fdf00d69
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-12-07 14:49:08 +01:00
Stephen Kelly
25f903bf28 Topologically sort $${MODULE}.depends when generating cmake files.
The contents of this eventually go into a CMake target
property IMPORTED_LINK_INTERFACE_LIBRARIES, which seems to expect
sorted input. Usually the contents is generated by CMake itself,
so generating content it expects is reasonable.

This fixes the qtactiveqt cmake unit test with MingW on linux.

Change-Id: I2a540bea5c3ac214ad4e1dfedfb7cbd2f863472b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-12-07 14:49:08 +01:00
Nico Vertriest
035c3b5781 Doc: removed control code+minor rephrasing
QTBUG-28382

Change-Id: Ic166fcb283d3339853c68a71be9aebd6cfed0523
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-07 14:49:08 +01:00
Morten Johan Sorvig
13fcd1c342 Set CGImage format when converting from QImage.
Set the CGImage format based on QImage::format().
Handle8-bit per component (A)RGB.

Change-Id: I041b0ee53d3943a0aaf9e813eb0a235c4de619dd
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2012-12-07 12:06:05 +01:00
Morten Johan Sorvig
2e14214357 Use the "copy" blend mode for backingstore drawing
The default is a "source over", but we want to
completely replace the destination pixels. (Which
is slightly faster).

Change-Id: I4916765258a2236f70f58a8e20b06f80739183c1
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2012-12-07 12:05:08 +01:00
Morten Johan Sorvig
9650a5aa25 Avoid backing store color space conversions.
We want the Qt backing store to be in the device color
space by default. This will avoid colour space conversions
when blitting it to screen, at the cost of a potential 
loss in color accuracy.

As it turns out, CGColorSpaceCreateDeviceRGB no longer
crates a device color space but rather a generic color
space. (Since 10.4). Create the color space with a system
profile instead.

Accurate color representation needs to be supported
at some point, but this fast path should be the
default.

Change-Id: I7ebb77b36f81f66119d8c2ef464723401ec1d1e8
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2012-12-07 12:04:48 +01:00
Nico Vertriest
2f6e967eb7 Deleted wrong statement about nr Qt JSON classes
Change-Id: I58d8ab73d3018d9712ec9485e0b8e52a5a75da5e
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-07 12:03:15 +01:00
Morten Johan Sorvig
e84e86dc8c Update QNSView geometry on window resize.
Ideally this should not be required since NSWindow
should resize the content view automatically. However,
in the case of modal QDialogs this does not happen.

Add call to updateGeometry in windowDidResize as a
workaround, and remove code which called QNSView::setFrameSize
with the current size.

This will cause duplicate handleGeometryChange calls
in the non-qdialog case, add a test to see if the geometry
really has changed to prevent that.

Change-Id: I29bea23b2ab72f923aeadf8db8cb9131ae177a28
Reviewed-by: Liang Qi <liang.qi@digia.com>
2012-12-07 09:15:00 +01:00
Volker Krause
0c5e232828 Compile with QT_NO_CURSOR.
Mostly straightforward, the a11y changes might look a bit drastic, but the
base class QAccessibleTextWidget was already disabled in this case, so we
have to obviously take out its sub-classes as well.

Change-Id: I682ace20d6938688ddb1da23c3463f3c025fab8e
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2012-12-07 08:46:15 +01:00
Laszlo Papp
425367f892 Make the documentation more explicit an talkative
Change-Id: Ifa4b7c3c5f8ec384addbb80a9436d55b32d8bc51
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-12-07 08:45:29 +01:00
David Gil
cd03f2a772 Fix typos and style in QToolBar documentation
Change-Id: Ic4b4e18746382bae1b6dae009e1e5663c7a21a84
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2012-12-07 08:45:12 +01:00
Sergio Ahumada
fc7d2f60ff doc: Remove documentation for removed TRUE and FALSE macros
These macros were removed by 158f39ec78

Change-Id: I2aabef1dd2c9cb3949040c167a4e5cf1a9390ba6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-12-06 23:53:16 +01:00
Samuel Rødal
7da7bbcd87 Removed requestOrientation() API from QWindow.
There are no proper implementations of this API, and as it stands it
only acts to confuse anyone who stumbles across it. It will be better to
revisit the full cross platform orientation API story for 5.1.

Change-Id: Iff7054a32c6e5e4ad0cc0493a5e4ecc35a6ec4f3
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2012-12-06 20:37:13 +01:00
Rafael Roquetto
675676aba1 configure.exe: fix -inotify option
Change-Id: Iaa844961b5fdd2056fcc9b008c11a3f3925ca3a4
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-12-06 18:40:29 +01:00
Montel Laurent
51e7aeb29b Fix compile with -DQT_NO_SYSTEMTRAYICON
Change-Id: Icca0bef7efca77a841b30f40692144663e7ae913
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-12-06 18:40:29 +01:00
David Faure
ce556dfcbc Warn when XDG_RUNTIME_DIR isn't set, as per XDG Base Dir Spec
http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
says: "If $XDG_RUNTIME_DIR is not set applications should fall back to a
replacement directory with similar capabilities and print a warning message."

Better warn that not all the guarantees of XDG_RUNTIME_DIR are available,
and push unixes who haven't done so yet, to set things up correctly.

Change-Id: Ie3998e8c1d14e4fdf8d58dfb2932f0ad708fba50
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-12-06 18:40:29 +01:00
Joerg Bornemann
a79b898299 qmake: add ProductVersion to automatically generated resource
ProductVersion is set to the same value as FileVersion.

Task-number: QTBUG-27428

Change-Id: Ia01e14112d3a0e74b9fbe5fc8d9c4f9ae690db34
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-12-06 16:46:03 +01:00
Kai Koehne
320b16110f QProcess: Fix compilation with MinGW
newer mingw-w64 headers do not support swprintf(wchar_t*,wchar_t*, ..)
any more.

Change-Id: I2fc1fb51ba8d5237149697f77a91abd6469ebb09
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-12-06 16:45:52 +01:00
Peter Kümmel
24013d8a87 Don't pass invalid strings to strcmp()
The address behind a string doesn't point to a string.

Change-Id: Ic54f652ae781fea278f60cc49d219c1c610ba29f
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2012-12-06 16:45:52 +01:00
Gabriel de Dietrich
c7dddf2ae5 Mac: Missing update when hovering from one scrollbar to another
Change-Id: I9837bb72935cb4e3680e4bd23b5535f654b5fde6
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2012-12-06 16:45:52 +01:00
Gabriel de Dietrich
fb4ad0d1a9 Mac: Transient scrollbars should overlap in the corner on 10.8
Change-Id: Ied239d5e3cb05bed6b892607f0344e6daa028918
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2012-12-06 16:45:52 +01:00
Eskil Abrahamsen Blomfeldt
f3bbf55cbe 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>
2012-12-06 16:45:52 +01:00
Gabriel de Dietrich
6f7791f871 Mac: Animated expanding scrollbars on 10.8
Change-Id: Ib57d0347a7828ac7582b0fa95adf8d437694cd41
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2012-12-06 16:45:52 +01:00
Gabriel de Dietrich
c35e12e876 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>
2012-12-06 16:45:52 +01:00
Christian Stenger
ae6389a086 Docs: Fix some warnings
Change-Id: I3898c89e54aa671ff8cb1b25c49cfe3835ab9384
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-06 16:45:52 +01:00
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