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>
Oswald Buddenhagen [Wed, 19 Sep 2012 18:33:45 +0000 (20:33 +0200)]
don't test assistant stuff unless assistant was built
the previous test whether tools are built is implied by that.
Change-Id: I3eb683c0dcaff1ebe3d51fae3e9b6ca4e4712169
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Oswald Buddenhagen [Thu, 20 Sep 2012 11:50:09 +0000 (13:50 +0200)]
make headersclean test compile with -no-widgets
Change-Id: Iaa521a06730aebbbdef13c74ed9f6e13653862dd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Kai Koehne [Thu, 6 Sep 2012 12:40:02 +0000 (14:40 +0200)]
CLucene: Fix compilation with win32-g++ and C++11
We plan to enable -std=c++0x for MinGW gcc. However, this let gcc set
__STRICT_ANSI__, and the MinGW headers then do not declare e.g. _i64tow.
Instead of working around this in clucene we just switch to less strict -std=gnu++0x mode.
Change-Id: I734908048a8ab93f7b68a7be6b8a6cb8edae7b43
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Friedemann Kleint [Wed, 12 Sep 2012 13:30:11 +0000 (15:30 +0200)]
Fix .pro-file warnings in examples.
uitools/designer should go to QT.
Change-Id: I00fe86bfcc6c500d6a277c0e79cb4c3ad54441d4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Friedemann Kleint [Wed, 12 Sep 2012 13:29:15 +0000 (15:29 +0200)]
Fix warnings about unused variables in Qt Designer.
Apparently, the function declarations are a copy&paste error.
Change-Id: If42728b3c545fb93638e73566af5d8937fb5ced5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Andreas Holzammer [Tue, 11 Sep 2012 14:15:18 +0000 (16:15 +0200)]
Remove checksdk
This was used to produce a Windows CE environment,
but nowadays its integrated into qmake. This makes
this tool obsolete, so remove it.
Change-Id: Ib1e1ee43132795cafa410a0eafe5b142177fae8c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Oswald Buddenhagen [Fri, 7 Sep 2012 17:06:09 +0000 (19:06 +0200)]
fix pointer abuse
Change-Id: Iff87cd6f8df7faed0ac4b9d1025a0bda67d3b200
Reviewed-by: hjk <qthjk@ovi.com>
Joerg Bornemann [Fri, 24 Aug 2012 09:56:50 +0000 (11:56 +0200)]
lupdate: use QMAKE_MANIFEST to embed our special manifest file
Task-number: QTBUG-27080
Change-Id: Ieacc116ef091f0473f2c543a76685f7c851a2456
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Jonathan Liu [Tue, 4 Sep 2012 11:49:57 +0000 (21:49 +1000)]
Fix narrowing conversion compile error
Explicitly specify conversion from int to TCHAR to avoid a narrowing
conversion compile error when compiling with GCC option -std=c++0x.
Change-Id: I15d71502e4fd51f85adf7d3fc1c83cf135c4b420
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Thiago Macieira [Wed, 29 Aug 2012 14:10:05 +0000 (16:10 +0200)]
Update the git-archive export options
The .gitattributes and .gitignore files do not need to be present in
packaged sources, as they are for people using the Git repository.
People who download tarballs usually don't reimport into Git -- they
should just download the actual repositories.
Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the $n string, ask git-archive to store
the SHA-1 of the commit being packaged.
Change-Id: I4525d2264d9ef92d978dc5e4186313709f8ba67b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Jonathan Liu [Sat, 1 Sep 2012 07:03:05 +0000 (17:03 +1000)]
QtDesignerComponents: Avoid MinGW GCC cc1plus crash using PCH
MinGW GCC cc1plus crashes when precompile_header is used. This has been
observed with several versions of MinGW GCC from MinGW-builds and
MinGW-w64. Disable precompile_header when using win32-g++ mkspec to
avoid the crash.
Change-Id: I538563bf1dc0f45eb9cf0528ad8b95fc0e87b7e8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Tasuku Suzuki [Thu, 30 Aug 2012 15:45:44 +0000 (00:45 +0900)]
Make compile with -no-widgets
Change-Id: I8b725e8f600268ad3d2105eb2015bcf778adf48d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Thiago Macieira [Wed, 29 Aug 2012 14:22:52 +0000 (16:22 +0200)]
Return from main instead of exit()ing in qdbus
This way, the automatic variables' destructors will be run.
Change-Id: I2550969a0dde981f2de14be0ddaae285b68181db
Reviewed-by: L Potter <lorn.potter@gmail.com>
Teemu Katajisto [Wed, 29 Aug 2012 13:58:47 +0000 (16:58 +0300)]
assistant: don't crash when run as non-gui in mac/linux
Also don't use obsolete QApplication constructor.
Change-Id: Ibe172e13caeccb08a388b0fe8ebbddf25c5ca0ec
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Jarek Kobus [Mon, 13 Aug 2012 13:49:23 +0000 (15:49 +0200)]
Make sure the parent widget still exists.
It may happen that InPlaceWidgetHelper's destructor
is called after parent widget destructor. Now inside
InPlaceWidgetHelper's destructor we check if parent
widget still exists.
Task-number: QTCREATORBUG-7684
Change-Id: I4c9ecbfae7323fd95345ccabc113218a7011ebe8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Lars Knoll [Tue, 21 Aug 2012 10:35:11 +0000 (12:35 +0200)]
Continue processing the qhp file on missing attributes
qhelpgenerator would bail out with an error if a keyword would contain
a missing or empty attribute. This can e.g. happen on a missing
\relates in the documentation.
This makes the whole help generation rather fragile, as CI doesn't stop
these kind of errors from making it into the code base. So rather then
failing to generate the docs simply skip the one keyword that the
helpgenerator can't place into a context.
Change-Id: I265dc75ba9b29c868d5b9cf8a9aae5ce880374b1
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Lars Knoll [Mon, 6 Aug 2012 13:57:23 +0000 (15:57 +0200)]
Remove doxygen support files
These were only needed for phonon, which is not part
of qt5.git anymore.
Change-Id: I308fa1963ca7270a4e6ed1453bdde60dd3205329
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Lars Knoll [Mon, 6 Aug 2012 13:53:15 +0000 (15:53 +0200)]
Small cleanup in the pro file
Qt Console edition doesn't exist anymore, so remove the
reference to it.
Adding x11 to the config also doesn't make any sense
anymore.
Change-Id: I8020a648575ef4482ffbe7d4f2c47dd5cc5eb143
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Mon, 20 Aug 2012 09:22:31 +0000 (11:22 +0200)]
Fix deleting of QTreeWidget items.
Breakage introduced by
af617c319772a34115d0c4d802f25a807cb43065,
which caused the autoconnections to no longer work.
Task-number: QTBUG-26770
Change-Id: Id00341d93d4a830f3f48a1db6234818e6d262977
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Lars Knoll [Mon, 6 Aug 2012 13:48:28 +0000 (15:48 +0200)]
Remove runonphone
runonphone was a pure symbian utility. Remove it.
Change-Id: I6fa1b7884fb86a161ff4f7f8ba7f54de687faa43
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Jason Barron <jason.barron@nokia.com>
Lars Knoll [Mon, 6 Aug 2012 13:47:14 +0000 (15:47 +0200)]
Remove qttracereplay
This helper app only worked with the trace graphics system, something
that is gone in Qt 5.
Change-Id: Ib50216f4abdfb0f14e0afb1c164ce37590931c72
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Stephen Kelly [Mon, 13 Aug 2012 08:54:27 +0000 (10:54 +0200)]
Use Qt::WindowFlags, not Qt::WFlags.
The latter seems to date from the Qt 1 days, and such abbreviations
are not current Qt style.
Change-Id: I2208e3d0db14220398d9b0249ab6f07c9859ba14
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Oswald Buddenhagen [Tue, 7 Aug 2012 17:36:07 +0000 (19:36 +0200)]
make use of QT_PRIVATE to specify private Qt dependencies
Change-Id: I6f347fc1ee6e3319545564dc3eadfe2fd330e25e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Oswald Buddenhagen [Tue, 7 Aug 2012 17:13:03 +0000 (19:13 +0200)]
follow rename of qt_module_config.prf to qt_module.prf
Change-Id: I20e609469de3cd050fd2ef0dceeefbf424249b44
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Oswald Buddenhagen [Mon, 13 Aug 2012 08:53:49 +0000 (10:53 +0200)]
remove manual linking of libQtClucene
the qt module magic handles that automatically nowadays
Change-Id: If67a83f50c1593461ec3abfc32132b594fd9ee18
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Kevin Ottens [Wed, 1 Aug 2012 13:38:03 +0000 (15:38 +0200)]
Properly handle include cycles
Currently lupdate is just issuing a warning when it detects an
include cycle. Since it's not a full preprocessor, most of those
warnings are false positives, but they need special handling, this
patch provides that.
Now every result is stored as part of a cycle (so in the general
case a cycle of one file). When detecting a cycle, instead instead
of issuing a warning, we record the presence of the newly detected
cycle for later use and merge the other relevant cycles with it.
When retrieving results now it's not for a single file anymore but
for a complete cycle at once (which can turn out to be a cycle of
one file).
Task-number: QTBUG-6587
Change-Id: Ia12bc680e645b9704a3178e8a843a554a60811bf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Pierre Rossi [Thu, 2 Aug 2012 10:12:30 +0000 (12:12 +0200)]
Add support for modular docs in QHelpGenerator.
Very cool.
Change-Id: Ic3332a4a780fb357138545117e78be641d2ea14f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Pierre Rossi [Wed, 1 Aug 2012 12:20:32 +0000 (14:20 +0200)]
Prepare QtHelp library for modularized documentation.
- Support ".." in QCH documentation file paths.
This essentially means that we stop using cleanPath, and where needed,
prepend the virtual folder name, followed by "/..", in front of the
original path.
- Remove com.trolltech default DocPath since this was not used anymore.
Done-with: Casper van Donderen <casper.vandonderen@nokia.com>
Change-Id: I7309805000f343e2f58c74cd0655a936399fd939
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Thiago Macieira [Wed, 1 Aug 2012 14:56:29 +0000 (16:56 +0200)]
Add export macros to QtCLucene
QtCLucene is not the same library as QtHelp, so it can't use the same
macros and same #define as QtHelp.
Change-Id: Idefe46cbd8842f406131c8f041b531a92a2261a2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Pierre Rossi [Wed, 1 Aug 2012 12:34:21 +0000 (14:34 +0200)]
Fix a crash in Assistant.
Change-Id: I8fa3f5845db515d5f9efc74acd392058ef1e1ec5
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Pierre Rossi [Wed, 1 Aug 2012 20:30:23 +0000 (22:30 +0200)]
Enforce sans-serif by default in assistant
Make the default font sans serif for HelpViewer's QWebView-based implementation
since it is what QTextBrowser uses by default, we probably want to blend in.
Change-Id: I07257d61cac9bffa28f90f31e352101b2e04cb0e
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Thiago Macieira [Wed, 1 Aug 2012 15:14:06 +0000 (17:14 +0200)]
Set the Qt API level to compatibility mode in all tests.
Qt 5.0 beta requires changing the default to the 5.0 API, disabling
the deprecated code. However, tests should test (and often do) the
compatibility API too, so turn it back on.
Task-number: QTBUG-25053
Change-Id: I73b99cd8e948dbebcdac30c4e5f2772eacb958ab
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Thiago Macieira [Wed, 1 Aug 2012 15:05:16 +0000 (17:05 +0200)]
Non-UTF8 encoding for source code is deprecated.
So the encoding marker for translations is unnecessary. It's always
UTF-8 now.
Change-Id: I2013451f917fa6b58125a6cf3cd5db6c99ab0ff2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Thiago Macieira [Wed, 1 Aug 2012 15:12:41 +0000 (17:12 +0200)]
Restore the forms/ subdir that was lost in the uitools reimport
These files are referenced in the .qrc file, so they are necessary
during compilation.
The files were copied from the commit referenced in the initial import
of the qttools.git repository.
Change-Id: Id1f182a7a9dd4e08e63fb903b978de192b85cd98
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Thiago Macieira [Wed, 1 Aug 2012 15:10:20 +0000 (17:10 +0200)]
QHeaderView::setResizeMode is deprecated.
Replace with the Qt 5 name setSectionResizeMode.
Change-Id: I908e669708c3595f110e41774475eea4cbdb7325
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Toby Tomkins [Wed, 1 Aug 2012 02:34:47 +0000 (12:34 +1000)]
Remove phonon as per removal in qt5.
5fb5e0dfc7d794df882408d4c7b6c0e14073282b removes qtphonon from qt5
compilation, also remove it in this repository.
Change-Id: I31a3dd4a47bab49039af00b5e385eed61a1cc35c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Corentin Jabot [Fri, 27 Jul 2012 16:00:18 +0000 (18:00 +0200)]
make lupdate compilable without qml/js support
In case the declarative module is not present.
Change-Id: I2652b245506e2a04c4e588f62de2a39ebf652677
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Mon, 23 Jul 2012 07:41:41 +0000 (09:41 +0200)]
Mark QCLucene and QtDesignerComponents libraries as internal.
The QCLucene library is obviously internal, and the only headers installed
by QtDesignerComponents are apparently pch headers.
This causes the avoidance of creation of CMake files.
Change-Id: Icb0b7e4ad622af3b2bc37043678dd6dc134be724
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Sat, 23 Jun 2012 08:37:20 +0000 (10:37 +0200)]
Test that the package configs for QtTools work.
Change-Id: I366c5f0a964739cc0fc607c72cf1e42d7ea92f06
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Stephen Kelly [Mon, 23 Jul 2012 07:52:22 +0000 (09:52 +0200)]
Add the CMake directory created during unit testing to .gitignore.
Change-Id: I6835b9c034ab3ba1933bd8726c035a8c328daa4f
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Stephen Kelly [Sat, 14 Jul 2012 11:29:55 +0000 (13:29 +0200)]
Generate a fatal error as appropriate.
Otherwise, subdirectories under directories which are added to
a resource file generate garbage in the binary.
The easiest way to see this is
cd tests/auto/corelib/kernel/qvariant
mkdir stream/qt4.9/somedir
make && ./tst_qvariant loadQt4Stream
Change-Id: I92e4660ffe41c96b41a393cd0748d9b05517aa8b
Reviewed-by: hjk <qthjk@ovi.com>
Casper van Donderen [Tue, 17 Jul 2012 08:01:49 +0000 (10:01 +0200)]
Export qhelpgenerator for use with qtPrepareTool()
Change-Id: I537864e24718cd5164f4346710c66cc83d649f0f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Sat, 14 Jul 2012 11:28:59 +0000 (13:28 +0200)]
Fix typo qith -> with
Change-Id: I71ee5f14c91f4265b71a1f097187408fb70f0867
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Jan-Arve Saether [Tue, 26 Jun 2012 08:43:17 +0000 (10:43 +0200)]
Enable modularization of translation files.
This is accomplished by introducing dependencies to catalogs.
Task-number: QTBUG-26138
Change-Id: Ia05918e1e043366ae0bf992f461275592f566c61
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Thiago Macieira [Fri, 22 Jun 2012 09:18:11 +0000 (11:18 +0200)]
Update the export macros in qttools.git
Use the new, simpler QT_STATIC macro.
Change-Id: I44a3767d80ed7d468684698353c9af885a459ee8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Thiago Macieira [Tue, 29 May 2012 16:52:01 +0000 (18:52 +0200)]
Change CONFIG += staticlib to CONFIG += static
That's the targetted, correct way of defining a static library.
Change-Id: I3a255dd1df213a470a36242869dd35a4bc283044
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 3 Jul 2012 19:43:14 +0000 (21:43 +0200)]
use centralized handling of QT_BUILD_PARTS
Change-Id: I220d36267e36bd2993fc520dea1fdffa3405b0a5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Friedemann Kleint [Mon, 9 Jul 2012 15:19:35 +0000 (17:19 +0200)]
QtTools: Replace CONFIG+=help by QT+=help
Change-Id: I2e195430241288cf6e9fc809d4a1b0d6b0e79314
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 3 Jul 2012 18:10:38 +0000 (20:10 +0200)]
"export" the linguist tools for qtPrepareTool() use
Change-Id: I2f7dee558e286e81b0f6a79bc428d1e5cda3321a
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Jarek Kobus [Thu, 5 Jul 2012 13:02:47 +0000 (15:02 +0200)]
Don't change the current page of mainwindow container
Task-number: QTBUG-12097
Change-Id: I5a4c7c5803b1f82d5ebdc1d61dc00d3dcd43a53f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Wed, 27 Jun 2012 12:43:05 +0000 (14:43 +0200)]
Designer: Fix crash when switching from docked to multiple windows.
Make sure the preference dialog is destroyed before changing the
UI mode by introducing a flag that is set on UI mode changes,
triggering the update afterwards.
Change-Id: I9c488ba6b1b24faccb0a1606994aaf0474b56fc2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Stephen Kelly [Fri, 22 Jun 2012 11:46:09 +0000 (13:46 +0200)]
Run the cmake unit tests as part of the qttools CI.
Change-Id: I565e715ba869298d4a8b9e4b42b7b41587336b9b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Yuchen Deng [Mon, 2 Jul 2012 13:55:38 +0000 (21:55 +0800)]
Fix compilation
Change-Id: I8e51a941c9ef6946fcc60a66cc33dba472959bf7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Joerg Bornemann [Mon, 2 Jul 2012 13:18:11 +0000 (15:18 +0200)]
cetest: remove support for X.sources of DEPLOYMENT variables
The .sources property has been deprecated in Qt 4.8.0 and
will be removed for Qt 5.
Task-number: QTBUG-3216
Change-Id: Ib37ef0913ddb16c89578f75277c41c27e2d8cdd1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Stephen Kelly [Mon, 2 Jul 2012 11:32:41 +0000 (13:32 +0200)]
Copy the LinguistTools macros to the build directory.
Allows running the unit test before installation.
Change-Id: I18947b625ad1a77ba4b7dd405ce5f1520b4d3125
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Yuchen Deng [Sun, 1 Jul 2012 08:23:06 +0000 (16:23 +0800)]
Fix cross compilation
Change-Id: I1c9fba9bcbec9cc2b9bcca7bbb77525173937a16
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Giuseppe D'Angelo [Wed, 27 Jun 2012 12:09:38 +0000 (13:09 +0100)]
Port QStandardItem/QStandardItemModel includes to QtGui
Change-Id: Ic2842dc4d1814e43b07faae0fd72fb2ce4ce1125
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Stephen Kelly [Wed, 27 Jun 2012 07:30:09 +0000 (09:30 +0200)]
Create a Qt5LinguistTools config file in the build directory.
As it is not using qt_module_config, it is otherwise not created there,
which breaks CI.
Change-Id: Ia4264d721a4f4a70542bc50329fd77def23d3914
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Oswald Buddenhagen [Fri, 29 Jun 2012 13:08:42 +0000 (15:08 +0200)]
remove stale reference to QTDIR_build
the flag is never set anymore, and the condional requires() would never
be true, either.
Change-Id: Ia23f57263aead3dd869902b2ed8b9be0133a0c08
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Oswald Buddenhagen [Wed, 27 Jun 2012 20:47:08 +0000 (22:47 +0200)]
Merge branch 'buildsystem'
Change-Id: Ibe002ec394142f4e2d36a6d7e1fc0e1239a68672
Friedemann Kleint [Wed, 27 Jun 2012 13:08:12 +0000 (15:08 +0200)]
QtTools/Linguist: Replace Q_WS_ by Q_OS_ where appropriate.
Change-Id: I009ebac85dd4c47afd042dba33edcda8212a812a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 8 May 2012 18:26:19 +0000 (20:26 +0200)]
purge QT_(SOURCE|BUILD)_TREE usage
Change-Id: I5e08266f27e1436f3c07a8f92b6d3565fbb304fb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Oswald Buddenhagen [Thu, 12 Apr 2012 10:42:47 +0000 (12:42 +0200)]
build system cleanups
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- setup of PKGCONFIG* variables (automated now)
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- pointless QPRO_PWD assignments
- qmake -project boilerplate
Change-Id: I64ce8134c471ccf674b6815878b4090a7eb8d961
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Oswald Buddenhagen [Thu, 12 Apr 2012 09:25:06 +0000 (11:25 +0200)]
auto-generate module pris
Change-Id: I1ba2a287525556fcdc1c0db5a1ef3ade16c12eda
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Friedemann Kleint [Mon, 25 Jun 2012 10:58:01 +0000 (12:58 +0200)]
Clucene: Fixed MSVC2011 build.
This is basically taken from Qt 4.8 /
69f84b9514f8f22d27590ac890dbd20aec369702.
Clucene is broken in MVS2011 due to changed stdext::hash_map which
is used as the ancestor in inner CLucene classes. It ended up with
names collision and double inheritance from the one base class.
Fix reflects that change.
Change-Id: Ia733c3b51dafc5d22674cc3822e6305819582429
Initial-patch-by: Eugene Shcherbina <eugene@eshcher.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>