David Schulz [Fri, 30 Nov 2012 13:42:20 +0000 (14:42 +0100)]
QtTools: Remove reference to deprecated Q_EXPORT_PLUGIN2
Change-Id: Ic553855393b23c8d1817e40bdff7bd219c395caf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Oswald Buddenhagen [Wed, 28 Nov 2012 15:08:05 +0000 (16:08 +0100)]
remove obsolete .desktop files
Change-Id: I2a4974229c18b5ad4d18089fc076d86457557cc1
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Leena Miettinen [Fri, 30 Nov 2012 15:14:14 +0000 (16:14 +0100)]
Doc: move Qt Linguist example docs from qtbase to qttools
Move qdoc files, images, and snippets.
Change-Id: I6ab84892dc56c23bfd056faa0713a572c814a1c2
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Sergio Ahumada [Fri, 30 Nov 2012 11:31:00 +0000 (12:31 +0100)]
Change copyright information from Nokia to Digia
In addition, some QUrl changes were required as I had to
re-genegerate test.qch
Change-Id: I03f6b3ab4a0743244fc93af92b024a084d4b7a15
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Leena Miettinen [Fri, 30 Nov 2012 10:03:36 +0000 (11:03 +0100)]
Doc: move Qt Designer example docs, images, and snippets to qttools
Change-Id: Ib02369b0a3970432685e5eb5e271902f399fab7e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
hjk [Fri, 30 Nov 2012 13:59:54 +0000 (14:59 +0100)]
Rename linguist.qdocconf to qtlinguist.qdocconf
Follow suit with the other tools.
Change-Id: I17d9216d66a92d16c0cc7c9e8794a817b98dff21
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
hjk [Fri, 30 Nov 2012 13:25:31 +0000 (14:25 +0100)]
Rename designer.qdocconf in qtdesigner.qdocconf
This is consistent with assistant.
Change-Id: Iaf61e800ae0e383d4f34bf95949895856c491f7e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Kai Koehne [Fri, 30 Nov 2012 10:01:02 +0000 (11:01 +0100)]
QHelpGenerator: Allow launch without window manager
Use the minimal plugin by default.
Change-Id: I2aa08c0ffcc76ce8692b481efb25497649b9b1d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Leena Miettinen [Thu, 29 Nov 2012 11:39:12 +0000 (12:39 +0100)]
Doc: Fix issues in Qt Designer docs
Fix the issues listed here:
http://community.kde.org/Qt5/Documentation/OverviewClassification
Change-Id: Ibdefbcc27d3ee47f06e0b0945be6d966734cb93e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Jerome Pasion [Wed, 28 Nov 2012 14:05:30 +0000 (15:05 +0100)]
Doc: Renaming Qt Assistant Manual's HTML page name.
-qtassistant-index.html conforms to the Qt 5 standard.
Change-Id: Ib8760790a389776bd9f37e5eab63adda1f3eb000
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Leena Miettinen [Wed, 28 Nov 2012 16:12:47 +0000 (17:12 +0100)]
Doc: Modularize Qt Linguist docs
Move docs from qtdoc to qttools. Move examples and example docs
from qtbase to qttools. Fix references to snippets and examples.
Change-Id: Ib9f89bac416473dcfd8b4d06a05f8d07ff7c2fd0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Oswald Buddenhagen [Wed, 28 Nov 2012 15:06:45 +0000 (16:06 +0100)]
centralize and fixup example sources install targets
follow respective change in qtbase
Change-Id: I6e892deb9fa3868579e9c556fbcf00cc7bc6145c
Reviewed-by: hjk <qthjk@ovi.com>
Eike Ziller [Wed, 28 Nov 2012 13:46:53 +0000 (14:46 +0100)]
macdeployqt: Fix deployment of sql driver plugins
Task-number: QTBUG-28248
Change-Id: I5e31770a3d31cb22b1ab17574ea38e509c59470d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
hjk [Wed, 28 Nov 2012 10:26:36 +0000 (11:26 +0100)]
Assistant: rename doc/assistant.qdocconf to doc/qtassistant.qdocconf
Change-Id: Ica76bcfc664ff143a7621cc75d0fac19afb5aa74
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Sergio Ahumada [Tue, 27 Nov 2012 19:08:55 +0000 (20:08 +0100)]
Update information from Nokia to Digia and Qt Project
Task-number: QTBUG-28156
Change-Id: I2d813a0f4fa266af004714f04b16501f5751c881
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
hjk [Tue, 27 Nov 2012 15:14:30 +0000 (16:14 +0100)]
Assistant: adjust to recently changed location of .qch files
Change-Id: If0a395d332fbbba5cd5875e325db87d2087b09e5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Leena Miettinen [Tue, 27 Nov 2012 14:46:48 +0000 (15:46 +0100)]
Doc: Modularize Qt Designer Manual
Move the appropriate files from qtdoc to qttools and fix the links.
Create a qdocconf file and modify designer.pro.
Actual content fixes will be done in a separate commit.
Task-number: QTBUG-28025
Change-Id: Ibde5c0fe0b1ddbeb845d10a2a5ebf609491235b0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Jerome Pasion [Fri, 23 Nov 2012 16:31:33 +0000 (17:31 +0100)]
Doc: Changed qch namespace from "com" to "org"
"org.qt-project" is what the Qt 5 modules use.
Change-Id: I86dc881672db7e9a56ba10c0a76c6485fe6e7c73
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Friedemann Kleint [Mon, 26 Nov 2012 14:04:27 +0000 (15:04 +0100)]
Fix static build of Qt Designer on Windows.
Ensure QT_DESIGNER_STATIC is defined everywhere such that
the EXPORT macros evaluate to empty.
Task-number: QTBUG-28131
Change-Id: I111b1351c4d81172adc9110d31b8b7ed13af7ef5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
kh1 [Fri, 23 Nov 2012 16:26:13 +0000 (17:26 +0100)]
Fix inbuild help and message. Remove Trolltech references.
Change-Id: Ibe74e744d737c68854ca98dfe72af43287ff89c7
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Konstantin Ritt [Sat, 24 Nov 2012 04:07:12 +0000 (06:07 +0200)]
Fix build after QLocale enums update
Uncomment "Missing" languages that were added recently.
Use modern language names instead of compat ones.
Change-Id: I1f4669ed17e4c814607d93fdae16eff20485d98e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Friedemann Kleint [Fri, 23 Nov 2012 09:35:12 +0000 (10:35 +0100)]
Do not compress QLayout-margin properties when writing UI files.
QLayout::margin is deprecated.
[Do not cherry-pick to 4.8.]
Task-number: QTBUG-27552
Change-Id: I8d25e31d3be0ad336557cc306c3c68e681f9033d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Friedemann Kleint [Fri, 23 Nov 2012 09:04:00 +0000 (10:04 +0100)]
Detect QMainWindow-separator as passive interactor in Qt Designer.
Ensure that dock widgets in Qt Creator can be resized.
Task-number: QTCREATORBUG-8284
Change-Id: If6aa55b2dde8fce53e1527db678f518b3912907b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Michael Brüning [Thu, 8 Nov 2012 14:55:21 +0000 (15:55 +0100)]
Backport helpviewer_qwv.cpp fixes from QtCreator bugs 7199 and 8211.
Corrected setup for HelpNetworkReply and changed uses of TextSizeMulti-
plier to use ZoomFactor.
Task-number: QTBUG-27899
modified: src/assistant/assistant/helpviewer_qwv.cpp
Change-Id: I1d0a4052abb978dc26bd1c0b94a420faf8209fa4
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Leena Miettinen [Thu, 22 Nov 2012 12:56:51 +0000 (13:56 +0100)]
Doc: Update Qt Assistant Manual to Qt 5
Make the manual more task-oriented and
update all screenshots. Check functionality
and menu item names.
Task-number: QTBUG-28024
Change-Id: I79ba3740d072fb3a6a30533a578c0a6bfbb9a26c
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Friedemann Kleint [Thu, 22 Nov 2012 14:14:40 +0000 (15:14 +0100)]
Fix build of the arthurplugin example.
Task-number: QTBUG-28147
Change-Id: I296e3d4d50dffe78e0d70c2486ad6b7641149556
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
J-P Nurmi [Thu, 22 Nov 2012 13:17:17 +0000 (14:17 +0100)]
QtAssistant: remove references to QApplication::Type
Qt3 legacy QCoreApplication::Type and QApplication::type() will be
removed -> use qobject_cast instead.
Change-Id: I4a4af17ab6c8955af33779d1e5556610c443c93e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Friedemann Kleint [Thu, 22 Nov 2012 10:03:37 +0000 (11:03 +0100)]
Fix linguist build after updating QLocale up to CLDR 22.1.
Change-Id: Ie03060fe59db43fef83f055b7000240368fe9d46
qtbase:
3791d21f72a4c7035cd1db42c36dbd1dc7efd0f6
Reviewed-by: hjk <qthjk@ovi.com>
Friedemann Kleint [Wed, 21 Nov 2012 13:40:50 +0000 (14:40 +0100)]
Fix build of installed examples.
Task-number: QTBUG-27977
Change-Id: Ic64563d120087c57c3579c1268d73531d7022111
Reviewed-by: hjk <qthjk@ovi.com>
Jerome Pasion [Wed, 21 Nov 2012 12:11:07 +0000 (13:11 +0100)]
Doc: Renamed documentation output to "qtassistant" directory.
-project name is qtassistant
-name should match index file for cross linking.
Change-Id: I2f098e3592453185c193a8fbbe97b01dbed50731
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Oswald Buddenhagen [Mon, 19 Nov 2012 11:13:28 +0000 (12:13 +0100)]
add support for TR_EXCLUDE
this is necessary for excluding 3rd party code, etc.
Change-Id: I2d32b6014741178bb8a62d29185241c90488754d
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Mon, 19 Nov 2012 10:43:06 +0000 (11:43 +0100)]
don't add DEPENDSPATH to VPATH
follow suit with qmake ...
Change-Id: Ie1748d2056c7218b76d75cddd0bc7fb3f66cf8f7
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Friedemann Kleint [Tue, 20 Nov 2012 14:43:09 +0000 (15:43 +0100)]
Fix syncqt-warnings.
Use include with module name in the public headers.
Change-Id: I29d285f54fbebf08e369a28bc1f3e40e3bfa1f75
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Tue, 20 Nov 2012 11:09:37 +0000 (12:09 +0100)]
Designer: squash warning about unused variables
Change-Id: I8418aedd6bc121ae2b9605389beb3f6612d7fb85
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
hjk [Tue, 20 Nov 2012 10:42:18 +0000 (11:42 +0100)]
Assistant: fix CONFIG value in .pro file
Move the deprecated 'help' value to QT, and remove the default 'qt'.
Change-Id: I78c987e8eed555c9c976732e216553d8002ee2b9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Eskil Abrahamsen Blomfeldt [Tue, 20 Nov 2012 09:34:55 +0000 (10:34 +0100)]
Merge branch 'newdocs'
Conflicts:
src/assistant/assistant/assistant.pro
Change-Id: If300627e2fef069274dec7785232ca144f3dfa28
Morten Johan Sorvig [Wed, 24 Oct 2012 11:04:27 +0000 (13:04 +0200)]
Make plugin deployment white-list based.
Deploy specific plugins instead of deploying all
plugins with exceptions.
Before macdeployqt would deploy nearly all plugins.
The plugins themselves weren't necessarily a problem,
but this would also pull in all plugin dependencies,
massively bloating the app bundle.
Change-Id: Ia8d8b795101958da83b299e1d8922a01b5e8f13d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Jerome Pasion [Fri, 9 Nov 2012 16:49:40 +0000 (17:49 +0100)]
Assistant: Updated documentation configuration for Qt 5
-moved content from qt5/qtdoc, including snippets, images, example doc
-added QMAKE_DOCS to create a 'docs' target
-modularized doc into doc/src, doc/images, doc/snippets
-removed unneeded files
Change-Id: I0f3774d51617c57a731aa54d7503e3d42a265747
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Oswald Buddenhagen [Mon, 29 Oct 2012 19:55:24 +0000 (20:55 +0100)]
re-bootstrap lrelease
this is needed for being able to x-compile translations.
Change-Id: Ia2a00e8195f84feaedd036e6b7b83df373425b38
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Wed, 31 Oct 2012 10:12:58 +0000 (11:12 +0100)]
fix bootstrapped build
Change-Id: I8c987e8eed555c9c976732e216553d8002ee2b87
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Mon, 29 Oct 2012 20:12:11 +0000 (21:12 +0100)]
adjust fake QCoreApplication::translate() to qtcore changes
Change-Id: I52a74c7ad499312b35b3a25c6ad6d571e0dedb61
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Mon, 29 Oct 2012 20:09:30 +0000 (21:09 +0100)]
remove stale QT_NO_TRANSLATION ifdefs
they are from the times when these files were part of the qt api
Change-Id: Ic4b0d6af68e4cbba14e7efe0ca0bb901641e021b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Fri, 2 Nov 2012 18:46:19 +0000 (19:46 +0100)]
fix non-qmake build of the evaluator
Change-Id: I024031a03e44151b0b350dea83bd5bae1740568f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Mon, 29 Oct 2012 11:43:43 +0000 (12:43 +0100)]
rewrite default spec handling
instead of symlinking (on unix) or creating a forwarding spec (on
windows), just put the default specs into (the bootstrapped)
QLibraryInfo.
Change-Id: I595500ef7399f77cb8ec117c4303bc0a2ffe505f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from qtbase/
7d20f3dd1065a20b40cb4689783fba05190fe317)
Simon Hausmann [Thu, 25 Oct 2012 08:55:00 +0000 (10:55 +0200)]
Fix qmake's pro file cache to interact correctly with write_file
When writing a file with write_file() we have to inform the pro file parser
cache to discard the file if it's existant in the cache, to ensure that
calling include() after write_file() always works.
Change-Id: I7d09269a57de55ca30b0e11dd40770de9f919f64
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/
f45d6414ad6ef1d75f049a61411cd954bcae29c3)
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Marc Mutz [Fri, 18 May 2012 18:00:23 +0000 (20:00 +0200)]
Use QStringList::join(QChar) overload where applicable [qmake]
This is an automated change performing the following replacements:
join\("(.)"\) -> join('\1')
join\(QLatin1String\("(.)"\)\) -> join(QLatin1Char('\1'))
join\(QStringLiteral\("(.)"\)\) -> join(QLatin1Char('\1'))
Change-Id: I9c9964703dedfdab6e7bfac80be22bd5570e2e49
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/
f4d47945ba17db276e94046473816014ed0342e9)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Marc Mutz [Wed, 19 Sep 2012 15:50:42 +0000 (17:50 +0200)]
qmake: add ProStringList::join(QChar)
Same reasoning as for
68e04c3ac148bcbe71f2deeb7288563f6cdbcab5 applies.
Adding the overload was easier than to teach a Perl script to distinguish
between QStringList and ProStringList instances...
Change-Id: I6de6ecf21fdad135ac213b5c794927a9bc120a92
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/
cbf447069cfeb799ff5e09902be065d77f2e7707)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Tue, 18 Sep 2012 07:32:46 +0000 (09:32 +0200)]
resolve only one level of symlinks, and only for the default specs
otherwise we end up in the source tree, which is counterproductive.
Task-number: QTBUG-26869
Change-Id: Id44a94f827dc285c75b9b243c8ef6478e668e3ff
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/
04cd23428a4f2cfa5ee02b70f2086ff832aae925)
Oswald Buddenhagen [Tue, 18 Sep 2012 08:54:52 +0000 (10:54 +0200)]
fold m_qmakespecFull back into m_qmakespec
the original value is not used any more after the final resolution.
Change-Id: Icadc219f045a1bbfd20506c4c72c53d1fb352969
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/
cc2cd0db5d0c53605ab93f796765667ead1920e8)
Oswald Buddenhagen [Wed, 31 Oct 2012 10:13:44 +0000 (11:13 +0100)]
fetch all properties from qmake
don't filter out ^QMAKE_.*:
- QMAKE_MKSPECS is not printed any more, so needs no filtering
- QMAKE_VERSION can be simply used now, as we are now rather close to the
real qmake
- QMAKE_SPEC and QMAKE_XSPEC need to be fetched
- this fixes the default spec resolution
Change-Id: Ifcfa8b5b9e2bbf5d995940e1bb7f55e7d67aed3e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Fri, 26 Oct 2012 18:03:19 +0000 (20:03 +0200)]
follow qt_tool.prf now setting up DESTDIR
Change-Id: Ia54abc71a59fd5d82760983866e820f96ec29298
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Thu, 25 Oct 2012 15:34:15 +0000 (17:34 +0200)]
adjust to qt_plugin.prf changes
DESTDIR and INSTALLS+=target are set up automatically now, but
PLUGIN_TYPE needs to be defined.
TEMPLATE, some CONFIG flags and TARGET munging are unnecessary, too.
this contains a nasty hack for examples, as we don't want users to use
the internal prf files.
Change-Id: I9af75f3040fd45d87ec9daea27e00588796ebe81
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Thu, 25 Oct 2012 16:45:30 +0000 (18:45 +0200)]
remove now unnecessary workaround for static linking of plugins
Change-Id: Ic67af762ec9fb06652a1c1658b63df2c7ae213d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Stephen Kelly [Wed, 31 Oct 2012 14:00:57 +0000 (15:00 +0100)]
CMake: Remove obsolete test_modules test
The generated module_includes test is a super-set of this test.
Change-Id: I83606455c939152bdd871926979fcc44337754df
Reviewed-by: Rohan McGovern [inactive] <rohan.mcgovern@nokia.com>
Sergio Ahumada [Tue, 30 Oct 2012 10:21:25 +0000 (11:21 +0100)]
CONFIG+=uitools is deprecated. Use QT+=uitools instead
Change-Id: I637e32d342c84c5c1e37e582f6e09f1983aaa335
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Stephen Kelly [Mon, 29 Oct 2012 09:51:16 +0000 (10:51 +0100)]
CMake: Test module includes
Change-Id: Ib1b7440a4537cc934eeec78c5b5e1a1ffbcbd222
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Simon Hausmann [Wed, 17 Oct 2012 11:21:20 +0000 (13:21 +0200)]
Add WebKit as CI build system dependency
This module uses QtWebKit APIs, so make sure WebKit is available
when build-testing this module in the CI system.
Change-Id: I41953509cabdfb6306400eb80f6d300ccceaf67b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Thiago Macieira [Fri, 19 Oct 2012 04:11:23 +0000 (21:11 -0700)]
qdbus: Don't print a newline on void replies
Only print something if there was actually something coming from the
peer.
Task-number: QTBUG-22482
Change-Id: I4536871484664ed3056cc20de7e49a176cf5a8b9
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Stephen Kelly [Wed, 17 Oct 2012 14:15:30 +0000 (16:15 +0200)]
Generate a ConfigVersion.cmake file for Qt5LinguistTools.
Change-Id: I1ea47da2d782693a16eb4ac9b8e69f6275da721d
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Gabriel de Dietrich [Thu, 27 Sep 2012 15:07:19 +0000 (17:07 +0200)]
Remove menu role conflict for preferences dialog
That conflict would result on the preferences dialog not being
accessible on Mac.
Change-Id: Ibd2e370c3e29f672d0df847ecf90ea1022a20fdc
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Gabriel de Dietrich [Thu, 27 Sep 2012 15:06:28 +0000 (17:06 +0200)]
Display initial "new form" dialog as proper dialog on Mac
Change-Id: I0497eb1aaa6af39fcc5a766a810770e1fb0322ec
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Stephen Kelly [Mon, 15 Oct 2012 14:44:01 +0000 (16:44 +0200)]
Remove insignification from CMake tests.
The failing test is working, now that a fix has been added to qtbase.
Task-number: QTBUG-27087
Change-Id: I4e4a74a49cf080a94de582da22870f8c01797ad4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Friedemann Kleint [Tue, 16 Oct 2012 08:47:50 +0000 (10:47 +0200)]
Use "QtProject" as organization name in various tools.
Change-Id: I00f896d36cba4024562703d5b808bea35a0d4008
Reviewed-by: hjk <qthjk@ovi.com>
Friedemann Kleint [Tue, 16 Oct 2012 08:37:28 +0000 (10:37 +0200)]
Qt Designer: Use "QtProject" in interfaces, organization name.
Change-Id: Ie278839ede86970a3dfd84d3d34eaf381b528bf5
Reviewed-by: hjk <qthjk@ovi.com>
Simon Hausmann [Mon, 15 Oct 2012 13:07:35 +0000 (15:07 +0200)]
Adapt to QtWebKit module changes
The widget specific API of QtWebKit is split out into a separate QtWebKitWidgets
module. Assistant and Designer use the widget specific API and therefore
need to use QT += webkitwidgets instead of QT += webkit.
Change-Id: I57b829428e079f454560676c48536aae8de15ed4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Friedemann Kleint [Tue, 9 Oct 2012 07:54:19 +0000 (09:54 +0200)]
Polish Qt Designer plugins and QtUiTools.
Do not use module includes, fix warnings about obsolete
CONFIG+=designer.
Change-Id: I6277f0e96a35171f22dced1a434a2c14c1e98d60
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Stephen Kelly [Tue, 9 Oct 2012 16:20:22 +0000 (18:20 +0200)]
Fix the use of Qt::GlobalColor with QVariant.
Before the patch, the code is setting an integer value, not a color.
Change-Id: I387759ac74149d5dea27ae59491682d63f37f843
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Friedemann Kleint [Tue, 9 Oct 2012 07:55:28 +0000 (09:55 +0200)]
Remove module includes from makeqpf, qev.
Change-Id: I5c8f8bd610bb9d83ef1feec204411163a4a170b8
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stephen Kelly [Tue, 9 Oct 2012 15:49:26 +0000 (17:49 +0200)]
Make the cmake test insignificant in QtTools on Mac.
Recent qtbase changes seem to have broken it.
Change-Id: Ie596e8b8b5bd8c6cb804c84808595a2388a2bfef
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Friedemann Kleint [Mon, 8 Oct 2012 12:25:00 +0000 (14:25 +0200)]
UiLoader: Map QLCDNumber::numDigits to QLCDNumber::digitCount'.
QLCDNumber::numDigits was deprecated in Qt 4 and removed in Qt 5.
Task-number: QTBUG-27462
Change-Id: I95e26e84cb589fd6fca74255d22bf806ea14d12e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Thiago Macieira [Fri, 5 Oct 2012 16:08:31 +0000 (09:08 -0700)]
Adapt to QUrl changes: URL with authority must have paths with /
Otherwise, QUrl considers the URL as invalid.
Change-Id: Idc33210ce75813ff8420da6efb7baf5511d43054
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Stephen Kelly [Thu, 27 Sep 2012 17:08:50 +0000 (19:08 +0200)]
Mark the cmake test here as insignificant.
The QtUiTools library, being a static library, is apparently broken
with the CMake MSVC generator.
Task-number: QTBUG-27087
Change-Id: I0e8a76c1d413fa845a4b803f08974a1907f18886
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Stephen Kelly [Thu, 27 Sep 2012 11:01:12 +0000 (13:01 +0200)]
Create IMPORTED targets for the linguist tools.
We already create IMPORTED targets for the qtbase tools
since qtbase/
189a5d8af12788a30121210066de647a6dc3a167
Change-Id: I89a1c59b4e14f0f5bdc71dfca0165e625c779715
Reviewed-by: Brad King <brad.king@kitware.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Kai Koehne [Thu, 13 Sep 2012 13:36:48 +0000 (15:36 +0200)]
CeTcpSyncServer: Use qInstallMessageHandler()
qInstallMsgHandler got deprecated in Qt 5.
Change-Id: I70f5c3f8c2d4c6f6e8d403d7cba26e71ec53e3b1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Yuchen Deng [Fri, 21 Sep 2012 12:15:17 +0000 (20:15 +0800)]
Build tools in release mode if using -debug-and-release option
Change-Id: I2d0f60e2fcba66460f5488c6f66432b76a06f05a
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Jens Bache-Wiig [Wed, 26 Sep 2012 08:16:43 +0000 (10:16 +0200)]
Better looking widget toolbox in Designer
I noticed that in many styles the widget toolbox looks rather
ugly when using the styled buttons. Instead I now draw simpler
and cleaner expander buttons.
Change-Id: I3559c8ffcae3e08a7b418c4238663af579bcc912
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Jens Bache-Wiig [Tue, 25 Sep 2012 10:53:50 +0000 (12:53 +0200)]
Add missing border to the central widget in Designer.
QMdiArea doesnt draw a border by default so we have to add one.
Change-Id: I2ee53cd62989e92919c32a6774e3d02f86927bc1
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Stephen Kelly [Tue, 25 Sep 2012 08:49:06 +0000 (10:49 +0200)]
Don't test linguist macros if cross compiling.
linguist tools are not bootstrapped.
Change-Id: Iae6b577db17be788a04036a06238191aa6896c01
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Oswald Buddenhagen [Fri, 21 Sep 2012 17:38:37 +0000 (19:38 +0200)]
make qcollectiongenerator a qt_tool
somehow i missed it during the global conversion
Change-Id: Iac9521c54da82dc5047210a6abf3e4bf526347e9
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Iikka Eklund [Mon, 24 Sep 2012 06:33:50 +0000 (09:33 +0300)]
Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia
Change-Id: If89e41b25a242ff376eacdf8790957bcf499cc66
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Stephen Kelly [Fri, 21 Sep 2012 08:32:08 +0000 (10:32 +0200)]
Remove ambiguous argument to createIndex.
Change-Id: I12cf8fe5b82f675a6c9dcaa628410fc066745bea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Thu, 6 Sep 2012 15:54:42 +0000 (17:54 +0200)]
make lupdate test significant again
everything seems to be passing
Task-number: QTBUG-25483
Change-Id: I342c68477793b2445c065a53e3d4cced56c0d97c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Oswald Buddenhagen [Mon, 17 Sep 2012 15:06:45 +0000 (17:06 +0200)]
remove hand-written manifest
it seems that with msvc 2008 (now the first supported version)
the necessary entry is added to the auto-generated manifest, so get rid
of the hand-written one.
Change-Id: Ibc49ee246f28e432f2ff0b2fedc32dd3aa620c7f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Thu, 6 Sep 2012 17:21:30 +0000 (19:21 +0200)]
make uninstalled lupdate & lrelease find qmake
Change-Id: Ifbbb0be43f20a0def3fed1a32018faa17275a095
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Thu, 6 Sep 2012 14:54:34 +0000 (16:54 +0200)]
make linguist test work with shadow builds
Change-Id: I8aefcd88f95f6527f62029cc8afc88d42b02ec33
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Fri, 7 Sep 2012 19:28:59 +0000 (21:28 +0200)]
support listing translation files as sources
source strings from such files are marked as obsolete; the only purpose
is collecting possible translations.
this is an obscure feature meant to facilitate the modularization of the
qt catalogs. it's hard to describe in a few words (the format needed for
-help), so leaving it undocumented (for now).
Change-Id: I744ec7533425aee741b909bccf51442ca5241b10
Reviewed-by: hjk <qthjk@ovi.com>
Oswald Buddenhagen [Fri, 7 Sep 2012 17:11:31 +0000 (19:11 +0200)]
implement stand-alone getSimilarityScore() with StringSimilarityMatcher()
now that the instantiation is cheap, we can do that.
Change-Id: Ifd2c3155aa976ec634d4ed96ae796a60584ca9a4
Reviewed-by: hjk <qthjk@ovi.com>
Oswald Buddenhagen [Fri, 7 Sep 2012 17:08:42 +0000 (19:08 +0200)]
make StringSimilarityMatcher instantiation cheap
... by removing an allocation.
move some of the functions out of the class to avoid polluting the header.
Change-Id: If0d3638215e59f7d88be7217e4d3abcbfd7a201e
Reviewed-by: hjk <qthjk@ovi.com>
Oswald Buddenhagen [Fri, 7 Sep 2012 16:48:07 +0000 (18:48 +0200)]
optimize similarTextHeuristicCandidates()
no need to re-calculate the matrix for the reference string every time.
Change-Id: Id4432d9fa78d5a065cfe1549a908454710e0ae26
Reviewed-by: hjk <qthjk@ovi.com>
Oswald Buddenhagen [Thu, 6 Sep 2012 19:21:06 +0000 (21:21 +0200)]
set the output directory for the qmake evaluator
this is necessary to make it find .qmake.super, which is necessary for
execution in non-installed top-level builds.
Change-Id: I8118363576ef19684cd17a6c0a23a7f8030b1104
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Oswald Buddenhagen [Thu, 6 Sep 2012 18:57:35 +0000 (20:57 +0200)]
support indirect SUBDIRS
that is, .file and .subdir "structs".
Change-Id: I6c7ea5971642802a97461d821cb1544fcc986013
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Oswald Buddenhagen [Thu, 6 Sep 2012 18:50:18 +0000 (20:50 +0200)]
less esoteric parameter passing to processProject()
just pass around fully qualified file names instead of QFileInfos.
a side effect of this is that error messages use full paths as well -
this can be considered good or not.
Change-Id: I55a7545064d32ac717ce9c57205ef59b76afc3f0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Thu, 6 Sep 2012 19:50:09 +0000 (21:50 +0200)]
update qmake evaluator to newest version from qt creator
Change-Id: I66ec46dd87f922094f6937b50cc40e02ef08cc86
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Thu, 6 Sep 2012 15:37:20 +0000 (17:37 +0200)]
sort <extra-*> tags
relying on hash sort order is no good idea
Change-Id: I314222bbfd94d29bad1cb7e8b6823b320a88ea75
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Oswald Buddenhagen [Thu, 6 Sep 2012 15:04:57 +0000 (17:04 +0200)]
check availability of qmldevtools, not declarative
that's the module we actually use
Change-Id: I928778a8638a8d0b2022696120dcaf6aa28a9d6d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Oswald Buddenhagen [Mon, 17 Sep 2012 19:47:19 +0000 (21:47 +0200)]
handle windows line endings in the qtdeclarative/js processor
apparently the parser does not do that any more, so do it here.
Change-Id: Idd7259ba1435f14be2be5afafa40689a05ab62af
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Mon, 10 Sep 2012 19:36:35 +0000 (21:36 +0200)]
fix compile of tests
they need help-private
Change-Id: I2deb56eee0d9b370a3837ca6b7495e640bfd8553
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Mon, 3 Sep 2012 10:14:37 +0000 (12:14 +0200)]
centralize load(qt_build_config)s in .qmake.conf
Change-Id: Ifbef0323f3a3fc80b10ac2c8c8a8a68ce646c1e6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oswald Buddenhagen [Wed, 19 Sep 2012 09:40:25 +0000 (11:40 +0200)]
build valid URLs
the path must always be absolute.
Change-Id: Ia2196d69cacb7116f16519c4d7e5ab9fe05a52e9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Stephen Kelly [Thu, 20 Sep 2012 08:49:25 +0000 (10:49 +0200)]
Don't test QtTools modules if widgets is not available.
All public QtTools modules depend on widgets.
Change-Id: Iac3b67337da8f6d9024e8e179646ba42ce74e23e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>