Commit Graph

13973 Commits

Author SHA1 Message Date
Oswald Buddenhagen
9f681e7a50 remove pointless variables
Change-Id: Ia4cd2292bdea49c198ee1429ab4d3f87697c3ed1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-26 05:52:17 +02:00
Friedemann Kleint
6e2d7a612b QtPrintSupport: Initialize UI of widget-based dialog.
Remove virtual from QPageSetupDialogPrivate::init() (which was
called from the constructor) and keep it as a non-virtual
function for QUnixPageSetupDialogPrivate.

Fix breakage introduced by
54b899f448 .

Task-number: QTBUG-31790
Change-Id: I6d552bc250e4d72c1bb50eceadd2852b1b957aea
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-06-26 05:46:30 +02:00
Friedemann Kleint
d849f3332f tst_qfilefialog: Fix leaking temporary directories.
The test currently leaks 2 directories QFileDialogTestDir,
QFileDialogTestDir4SelectFiles in /tmp.

Change-Id: I396f0b069572a680d81206dd0f1ddf606cbbe9e4
Reviewed-by: David Faure (KDE) <faure@kde.org>
2013-06-26 05:46:19 +02:00
Friedemann Kleint
7ead3a39c7 Windows: Display a message box if platform plugin cannot be found.
Task-number: QTBUG-31765
Task-number: QTBUG-31760

Change-Id: Iadfabccf7be755564e313a8f0c128f533b9bd024
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-06-26 05:46:09 +02:00
Frederik Gladhorn
1867ad741a Merge remote-tracking branch 'origin/release' into stable
Change-Id: I4c0ae2ac1c10d4d50c03625c802d981b7850ed6f
2013-06-25 23:25:35 +02:00
Frederik Gladhorn
851fae6dbe Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable 2013-06-25 14:31:00 +02:00
Bernd Weimer
6f0d258424 Fixed qrawfont auto test
Number literals are always interpreted as double. This lead to errors
on platforms that define qreal as float.

Change-Id: I838f690c33bb97e39a2cca2cfd3bdfb9482bc2b2
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
2013-06-25 14:31:00 +02:00
Oswald Buddenhagen
3ffc86e0e6 install qconfig.h into framework bundles
Task-number: QTBUG-31969
Change-Id: I5ade18352a9989bdfd513c51c021d475f39aa7c6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-06-25 14:00:26 +02:00
Joerg Bornemann
28a7af7b2a basic manifest tool support in vc(x)proj generator
The removal of embed_manifest_dll or embed_manifest_exe from CONFIG
now disables the embedding of manifests in VS project files.

Task-number: QTBUG-5301

Change-Id: I031318883edca6f9b63a7981ef6c44e3f123f6fd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-25 12:08:38 +02:00
Sergio Ahumada
1b972b210a config.tests: Fix architecture detection on Solaris
Escaping the '=' signs, otherwise awk fails on Solaris with

  awk: syntax error near line 1
  awk: bailing out near line 1

  Could not determine the target architecture!

  Build type: solaris-g++ (unknown, CPU features:)

Change-Id: I201482395c0cec28c10853191032eaa0401f5beb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-25 12:08:38 +02:00
Gunnar Sletta
6811920dea Fix QWidget::isActiveWindow for window containers.
Change-Id: If0e8b83d7dc84b66f4ce5a5cd98affa4bd9b7424
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2013-06-25 09:29:24 +02:00
Gunnar Sletta
63601509f8 Test for activation and palette on QWindowContainer's parent
Task-number: QTBUG-31775

Change-Id: Ib8ec5508f7bf53f9e3ce502367a3dca1a760289f
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2013-06-25 09:29:21 +02:00
Oswald Buddenhagen
01270cf672 fix bundled header creation for debug builds
the only case where we want to skip copying the bundled data (which is an
optimization only) is the debug sub-build when we are actually building
both debug and release.

Change-Id: I1f3f67ccd9a64033b133ffaf58639cd9f7107c27
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-06-25 09:18:35 +02:00
Oswald Buddenhagen
6d61dfdbb7 disable non-framework header install also for debug builds
i see no particular reason why debug builds should still get
"normal" headers.

Change-Id: I3625648549e8c234a365bab26823190ed2219cdf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-06-25 09:18:31 +02:00
Oswald Buddenhagen
7ea8c9d0f0 install private headers into frameworks
Task-number: QTBUG-31641
Change-Id: Ifadc380c0a8983b2be93194e2e2257494b13dff8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-06-25 09:18:25 +02:00
Oswald Buddenhagen
c0d5a4ee12 don't needlessly do QMAKE_BUNDLE_DATA+=FRAMEWORK_HEADERS
there is no point in adding a structure we don't actually define.

Change-Id: Ica43123f17eca6ebd4b5b7ec2526ebabef31c82a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-06-25 09:18:21 +02:00
Oswald Buddenhagen
7090d4a458 un-nest conditionals
it's cleaner, and it makes it possible to actually have a single else
branch.

Change-Id: I5ef917b678e2bd5a2face8ee19e942e5e952aa80
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-06-25 09:18:17 +02:00
Oswald Buddenhagen
d0e82ede55 mac framework build: always set QMAKE_FRAMEWORKPATH
don't mess with the -F linker flag manually. qt headers include other
headers via the canonical Module/Header syntax, which means that the
compiler also needs the -F flag. QMAKE_FRAMEWORKPATH does exactly that.

Task-number: QTBUG-29003
Change-Id: I5f4af1a462697cd6996c54436ccdb9fc2b216020
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-25 09:18:13 +02:00
Jake Petroules
bd97768ae5 Update for the newest Darwin-family operating systems.
Change-Id: Ib90296e35f8aa8d63692cf03ba9ffcb94a1a7687
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-06-25 07:14:59 +02:00
Bjoern Breitmeyer
1723a9861f Fixed testbuild with QT_NO_CURSOR
Removed the QCursor entry from the list of types
if QT_NO_CURSOR is set.

Change-Id: I6b8e925acedec75ed6e46b2e3fe34d0011667c91
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2013-06-25 07:14:54 +02:00
Frederik Gladhorn
5e4627fb85 Mac Accessibility: unify child functions
Both ways of getting the children are the same for
nsview and qcocoaaccessibleelement.
Factor out a function.

Change-Id: I4be091c6acde0de519a358f879c24eae04ec4c8d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-06-24 22:48:42 +02:00
Tor Arne Vestbø
47ab2edd01 Make the macx-xcode spec a wrapper around the default spec
... except for MAKEFILE_GENERATOR = XCODE. This means the spec no longer
hard-codes g++, and will work regardless of whether the default spec was
clang or g++.

This require us to set QMAKE_XCODE_GCC_VERSION properly for GCC, so that
additional compilation flags passed by Xcode will match the actual
compiler used.

Task-number: QTBUG-31713
Change-Id: If65140a7471cd16f483036742f1d5b86d0485c52
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-24 18:22:34 +02:00
Tor Arne Vestbø
d668e19271 Scope cached Mac SDK tool values by mkspec
Otherwise doing stuff like -spec macx-g++ when the default spec is clang
will not have an effect on the tools used.

Change-Id: Ia2769abfdd8c19f79d427b9f09707430e736305a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-24 18:22:34 +02:00
Jake Petroules
f125fa5541 Further followup to Q_OS_MACX changes.
Flip !Q_OS_IOS conditions to Q_OS_MACX where it seems appropriate,
remove a redundant condition in qtextcodec_p.h.

Change-Id: I21c8c0c490f1eb4a9337a7f2f3e907c125489438
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-06-24 15:49:31 +02:00
Kai Koehne
74ca6034e4 Fix QDir::mkpath failing for drive paths on Windows
This fixes a regression introduced in 3e2cd8ef6f. We shouldn't try
to call mkdir for just a drive letter.

Task-number: QTBUG-31862

Change-Id: I56035857aec03f9f1cceef62e82f372486b7737b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-06-24 14:51:53 +02:00
Tor Arne Vestbø
d0d158f092 Mac: Ensure that C++11 is always used when linking against a static Qt build
If Qt was built with C++11, it links to libc++, and we need all projects
that use Qt to link against the same library.

Technically, we could do QMAKE_LFLAGS += -stdlib=libc++, but that hasn't
been tested enough without also enabling C++11, so we keep the
relationship between the two for now.

Change-Id: Ic628bcbade60cc82f93707f372c2119c24d9dc8a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
2013-06-24 14:51:50 +02:00
Topi Reinio
78fe2b145e qdoc: Allow colon characters in manifest meta attribute values
The current implementation does not allow colons in attribute values,
as it's already used as a separator in the form of 'name:value'.

This change allows colons in the value string - one use case is to
have URL attributes, as in 'imageUrl:qthelp://path.to.image'.

Change-Id: I05c5cb32ffc79a39fbe5e4102f7a4b5bdcc2be53
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-06-24 11:45:26 +02:00
Sergio Ahumada
55b933e6fb test: Skip tst_qmake::include_dir() when -no-widgets is used
Only run this test case when the widgets module is present, skip it
otherwise.

Change-Id: I84f48b670b967af3bf0701ceba5a192f33989034
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-24 11:23:48 +02:00
Jonathan Liu
d3190572cc Use BSD licensing for QtOpenGLExtensions instead of LGPL
BSD licensing should be used for QtOpenGLExtensions instead of LGPL as
it is a static library that is linked into applications. Using LGPL
would impose additional requirements for application developers to
provide object files to end users to be able to relink the application
with a modified or updated QtOpenGLExtensions static library.

Task-number: QTBUG-29918
Change-Id: I0bb80f8ba5158be0a71fe4c5e1c37787ce21337d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-06-24 10:16:32 +02:00
Friedemann Kleint
a4f7bb8733 Widgets: Set qt_button_down for each press.
Do not rely on release events.

Task-number: QTBUG-31333
Change-Id: I09a056fed8892715c04ca78a42ae191e5a9a3b42
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-06-24 10:16:28 +02:00
Stephen Kelly
af23200d1a Make clients use the QT_NO_DEBUG flag when using QtCore in release mode.
This is similar to 9a5ade8abe which
modified the qt5_use_modules macro.

Change-Id: Ib63ee693ed2e25de6ac9d969e8be27ddbf8948c3
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2013-06-24 08:00:47 +02:00
Frederik Gladhorn
9d35442a6e Fix typo QCocoaAccessibility
Change-Id: Ib3fe4e30097af9c5c577757594196710c0998184
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-06-23 20:41:56 +02:00
Morten Johan Sørvig
b87af6b5e0 Remove NSPICTPboardType from pasteboard types.
NSPICTPboardType is deprecated. Mac OS will translate
pasted images of that type to a different image format.

Change-Id: Id7a68509615816a852abf1c11a70f0f0c862f0f2
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-06-23 05:51:00 +02:00
Chris Stylianou
e97c37a37a Fix incorrect uname usage.
The POSIX function uname() can return any non-negative value for success.
- Example: Solaris 10 returns 1 on success.
See: http://pubs.opengroup.org/onlinepubs/009695399/functions/uname.html

Change-Id: Ic3d51f94a31d8b562b28a2d09df3d31b04c77dc8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-21 22:03:48 +02:00
Stephen Kelly
91ca90d896 CMake: Fix test for value starting with -L
Change-Id: I02ba45beca09c2eb1b1fbdc2a8f6efbc783bd72d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-21 18:22:00 +02:00
Frederik Gladhorn
e02c6dd1d3 Mac Accessibility: skip invisible children
Change-Id: I6c3da526ecef60447a658b6b5501282729e9c6f5
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-06-21 17:42:09 +02:00
J-P Nurmi
3fb7e5aee9 Dialogs examples: remove QLayout::SetNoConstraint
These constraints were adjusted in qt4 commit 3abaecc in order to make
the dialogs fit Symbian/Maemo screens. These are not mobile oriented
examples and it breaks resizing behavior on desktop so badly, that
we will simply revert the constraint changes to make the dialogs
respect their minimum sizes.

Task-number: QTBUG-31351
Change-Id: Ibf358ddedadf05614ef7a66b6a98fe5d7073996f
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
2013-06-21 14:27:50 +02:00
Jørgen Lind
531b7d303e Fix missing shortcuts for WindowContainers
Change-Id: Iee2d97e1ff2b1f0c56b1dde4f3ce22a427fbe554
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-06-21 09:26:45 +02:00
Jørgen Lind
ad43d9a097 Fix missing focus events for mapped child windows
Its a bit brutal

Task-number: QTBUG-31776

Change-Id: I2d8b530646d1e2b2ba86f0e82d76f928c9a2bb11
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-06-21 09:26:41 +02:00
Paul Olav Tvete
07a727f8b8 Android: handle keyboard connect/disconnect
Even though the documentation says that "This should never normally
 happen", we do get a "navigation" change when an external keyboard
is connected or disconnected.

Thanks to BogDan for finding the solution.

Task-number: QTBUG-31806
Change-Id: Id92639800e617821976f842f93e09517529e14ef
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-06-21 09:26:35 +02:00
Frederik Gladhorn
533820320c Merge remote-tracking branch 'origin/release' into stable
Change-Id: I94bb158562ae6b80a87b40139d7302ea7b9b9aa8
2013-06-20 16:13:38 +02:00
Andy Shaw
442bce78c1 Don't depend on the command for extra compilers automatically
For vcproj files we should not automatically add a dependency for extra
compilers as this should be done via the depends variable for the extra
compiler instead.

This fixes a problem where something like '@echo command' was used in the
command as it would depend on echo and not the actual command anyway.

Change-Id: I7c0aa0d62143aa39c518e8bce65f302afdba33c9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-20 15:15:45 +02:00
Kai Koehne
d806944f06 Fix code indentation and comment formatting
Change-Id: Ic94200988add19d608648c8d3bd56bbfe74bde79
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-20 15:15:45 +02:00
Oswald Buddenhagen
172fa29dff fix LD_LIBRARY_PATH manipulation in uic calls not being make-escaped
the evaluator has the bug that function arguments are inherited.
work around that by passing an explicitly empty 3rd parameter to
qtAddTargetEnv().
proper fix upcoming in less critical branch.

Change-Id: Ic45cc890abaa6271985590d4ebe02c96bff6dec4
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-20 12:49:14 +02:00
Debao Zhang
25739bebba Doc: Fix spelling error
Change-Id: I9225ffeddfe17bc4f56ecd9a9c4656403840f828
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-20 10:34:58 +02:00
David Faure
a4d41f6803 Doc: QTranslator::translate() isn't an overload anymore
Change-Id: Ib50044da48be3fb4f43300aa285e15403bd8d65e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-19 20:05:43 +02:00
Tasuku Suzuki
46106c4e16 hide placeholder text when QLineEdit has preedit text
Change-Id: Ica84e9ce715702b690906ef748970e16d9162c4b
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Aurélien Gâteau <agateau@kde.org>
2013-06-19 20:05:24 +02:00
Liang Qi
0a55499c9a Doc: remove the duplicate for in QStyle documentation
Task-number: QTBUG-31739
Change-Id: I72ad52da7d7e6899148a91d22266e79dd3184d4c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-06-19 20:03:12 +02:00
Oswald Buddenhagen
60a5a56359 fix auto-enabling of windows style
it needs to come after the vista and xp style blocks.

Change-Id: I66b5c1eff41b19a76802a77b6926552d7343b29c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2013-06-19 20:02:59 +02:00
Oswald Buddenhagen
d4f89b5115 remove pointless positive QT_FOO_STYLE defines
they are not used. only the negative QT_NO_FOO_STYLE defines are used.

Change-Id: Ic39081240c78cf66bd50c300b4aad04abca6f38c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2013-06-19 20:02:49 +02:00