Thiago Macieira [Mon, 23 Apr 2012 15:46:55 +0000 (17:46 +0200)]
Don't use the QRegExp methods that modify the object [Designer]
QRegExp matching methods modify the object, which we don't want to. In
particular, when we receive a QRegExp from the user or we store in a
context that might require thread-safety, make sure we make a copy
before using it.
QRegularExpression has no such shortcoming.
Task-number: QTBUG-25064
Change-Id: I58984ddce6a44cca7fe5a7b36e4595bad791d976
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Toby Tomkins [Tue, 24 Apr 2012 01:49:36 +0000 (11:49 +1000)]
Modify qtdeclarative javascript namespace to fix compilation failure.
Change-Id: I7e49dbd6cab5ca2e715e327dab41969b1e18236c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Thiago Macieira [Mon, 23 Apr 2012 15:46:29 +0000 (17:46 +0200)]
Don't use the QRegExp methods that modify the object [Assistant]
QRegExp matching methods modify the object, which we don't want to. In
particular, when we receive a QRegExp from the user or we store in a
context that might require thread-safety, make sure we make a copy
before using it.
QRegularExpression has no such shortcoming.
Task-number: QTBUG-25064
Change-Id: I63bdca450db06adf1935672ca678b779cd89f961
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Olivier Goffart [Fri, 20 Apr 2012 17:28:00 +0000 (19:28 +0200)]
Move away from deprecated API
Change-Id: I86bd8dcfb044c0dd9db1641f21e134e1008f5ec4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Taito Silvola [Fri, 20 Apr 2012 07:49:38 +0000 (10:49 +0300)]
Fixed window raise issue when handling remote commands
Fixed remote command hanling in Qt Assistant. Now Qt Assistant tries to
raise and activate main help window after processing the remote command.
Task-number: QTBUG-25407
Change-Id: I6408b9795bdf21bb920830608ba23bfda7d41604
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Andreas Holzammer [Fri, 20 Apr 2012 08:06:45 +0000 (10:06 +0200)]
Fix assistant build with QT_NO_CLIPBOARD
Change-Id: I2c31525cba5b613ad13368fe11869789e003cbd1
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Andreas Holzammer [Fri, 20 Apr 2012 08:21:10 +0000 (10:21 +0200)]
Fix build of designer components with QT_NO_CLIPBOARD
Change-Id: I8bfcb5baed75a481c279e6114ae95b62dc252dc4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Andreas Holzammer [Fri, 20 Apr 2012 08:26:14 +0000 (10:26 +0200)]
Fix building designer shared with QT_NO_CLIPBOARD
Change-Id: I25194a08f2b840276ec253d63f32cb39e3c69827
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Andreas Holzammer [Fri, 20 Apr 2012 08:32:35 +0000 (10:32 +0200)]
Compile linguist with QT_NO_CLIPBOARD defined
Change-Id: Iacbbf725d88f83720d0b7100e256912e0730a478
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Andreas Holzammer [Fri, 20 Apr 2012 08:03:25 +0000 (10:03 +0200)]
Fix Build
isspace is in std namespace.
Change-Id: Idc5f09c5c60df874fac9c91bb3a3538f4bea0998
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Andreas Holzammer [Thu, 19 Apr 2012 18:18:21 +0000 (20:18 +0200)]
Compile fix if QT_NO_CLIPBOARD defined
Change-Id: I3a4126c370b09c56c2e869254962035ae36c7c75
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stephen Kelly [Wed, 14 Mar 2012 16:23:53 +0000 (17:23 +0100)]
Remove the dbus build-tools, CMake config files and tests.
They have been moved to qtbase.
Change-Id: Id3707032bc399e2ee915581789e17a58b9413166
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Friedemann Kleint [Wed, 18 Apr 2012 11:10:42 +0000 (13:10 +0200)]
QtTools: Fix compilation after merge of the api_changes branch.
Remove Qt::LogText, fix phonon plugin.
Change-Id: If51bab691d14d7caae102b60196b2d8c5b07da70
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Kent Hansen [Thu, 1 Mar 2012 10:38:11 +0000 (11:38 +0100)]
Adapt to Qt5 meta-object changes
QMetamethod::signature() is now called methodSignature(), and it
returns a QByteArray.
The new function QMetaMethod::isValid() should be used to check
whether a method is valid, rather than relying on signature() to
return a 0 pointer as before.
Change-Id: Ifc163497293213177ef80a4ea8e4e5577513f52a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Janne Anttila [Mon, 12 Sep 2011 12:03:22 +0000 (15:03 +0300)]
Fixed cetest build for Windows CE.
The bootstrap configuration for cetest was missing a few dependencies
which broke the build. Added the missing dependencies to cetest
bootstrapped.pri.
Task-number: QTBUG-22505
Change-Id: Ibf966f9855f7eb8a7e561ea570c17ff447aa057d
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit
4a6e91d912de6039230ec6f02b0bc5f3507f06cc)
Lars Knoll [Thu, 12 Apr 2012 10:05:58 +0000 (12:05 +0200)]
Merge "Merge commit 'qt-v5.0.0-alpha1'" into refs/staging/master
Friedemann Kleint [Thu, 12 Apr 2012 09:29:11 +0000 (11:29 +0200)]
Designer/Windows: Add close button to QWidget-type previews.
Change-Id: I6063e921c0ccc3588fb6268be39c45a7479e991c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Marius Storm-Olsen [Wed, 11 Apr 2012 17:56:11 +0000 (12:56 -0500)]
Merge commit 'qt-v5.0.0-alpha1'
Change-Id: I5af4b98754ede311bfd4b2f9c77d76096447ea62
Friedemann Kleint [Thu, 5 Apr 2012 08:33:44 +0000 (10:33 +0200)]
Designer: Use QWidget::grab() instead of QPixmap::grabWidget().
Suppress deprecation warnings.
Change-Id: If254bab3683f21f8eb85f1f2a2c881d285c093ae
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Wed, 4 Apr 2012 12:08:45 +0000 (14:08 +0200)]
Fix building of the Arthur plugin.
Do not build by default as it requires a library located in the
qtbase painting examples.
Change-Id: I19ac8ad31f9b2e194f88c5c3b168a2352dd72f1e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Oswald Buddenhagen [Tue, 3 Apr 2012 19:43:55 +0000 (21:43 +0200)]
remove references to $$QT_SOURCE_TREE
Change-Id: I65b43ced4c165c9f41c107b9eefe7d9e72127b04
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Oswald Buddenhagen [Mon, 2 Apr 2012 12:39:57 +0000 (14:39 +0200)]
remove qtxml includes from public header
it's not part of the api (any more)
Change-Id: I14da9f1e8a8cce9d2942ddb7a94997c26bbadfd0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Wed, 28 Mar 2012 13:52:14 +0000 (15:52 +0200)]
Remove Qt Designer's dependency on rcc code from qtbase.
Copy the files over.
Change-Id: Iffe7e79a398c968901bf7f12e38af798bf4ca23d
Friedemann Kleint [Wed, 28 Mar 2012 13:52:14 +0000 (15:52 +0200)]
Remove Qt Designer's dependency on rcc code from qtbase.
Copy the files over.
Change-Id: Iffe7e79a398c968901bf7f12e38af798bf4ca23d
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
hjk [Mon, 26 Mar 2012 07:29:47 +0000 (09:29 +0200)]
Use "qt-project.org" instead of "trolltech" in the resource system
Task-number: QTBUG-23272
Change-Id: I383e66291fc2c5bb431792c1b93a152a9b02462e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Thiago Macieira [Thu, 20 Oct 2011 09:19:17 +0000 (11:19 +0200)]
Remove use of Q_GLOBAL_STATIC_WITH_INITIALIZER
This macro was evil. It's gone now.
Change-Id: Ib33b23e4055de7361b8527009e4bc007d077a39d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Thu, 22 Mar 2012 11:10:40 +0000 (12:10 +0100)]
Fix warnings about deprecated QtDeclarative headers in lupdate.
Change-Id: I9d15f16766da49488a170de93e3630b47e2e640f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Yuchen Deng [Wed, 21 Mar 2012 09:15:21 +0000 (17:15 +0800)]
Build fix for -force-asserts configure option
Change-Id: I6fbbc90c7af0abdac6225a33650460bc64eda163
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Thu, 15 Mar 2012 15:19:41 +0000 (16:19 +0100)]
Fix DESTDIR of Qt Assistant.
Add missing DESTDIR for assistant.exe and Use QT.help.bins for all
assistant-related binaries.
Change-Id: I9ea4f1fbd5d5de11af2449afb66fd15c4144eac9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Tue, 6 Mar 2012 15:58:49 +0000 (16:58 +0100)]
Remove xml dependency from the dbus tools.
They do not actually require it.
Change-Id: Ib80c08ccb10a19e4e3694b65e95f2e585999fe01
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Mon, 5 Mar 2012 22:45:25 +0000 (23:45 +0100)]
Generate the correct paths for libs and bins in the cmake files.
Change-Id: I33f5de28c4adad8b9822f74675d53fd6f63ef527
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Friedemann Kleint [Tue, 6 Mar 2012 11:13:27 +0000 (12:13 +0100)]
Compile fix (lupdate).
- Adapt lupdate to removal of QCoreApplication::CodecForTr.
Change-Id: Id26c49f024966d93a9845ecb69a3be46d46b5f21
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Casper van Donderen [Thu, 1 Mar 2012 18:21:38 +0000 (19:21 +0100)]
Remove the usage of deprecated qdoc macros.
QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.
Task-number: QTBUG-24578
Change-Id: I374dfb657db98235d622ec865c52364a5291ae0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Frederik Gladhorn [Mon, 13 Feb 2012 14:24:42 +0000 (15:24 +0100)]
Remove AccessibilityPrepare.
This enum value was never implemented in Qt in any meaningful way.
It will be removed from qtbase.
Change-Id: I29a89eeed5d232a1f4d2c835fd9fedb5d7e6fe97
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Stephen Kelly [Mon, 27 Feb 2012 17:13:10 +0000 (18:13 +0100)]
Fix for Qt with specified bindir.
Change-Id: Ie4492269e8a7cd35959584bf09c02d4af5303917
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stephen Kelly [Mon, 27 Feb 2012 17:18:08 +0000 (18:18 +0100)]
Make the tests somewhat more standard.
Change-Id: I1b010a23763cb0de404f8d89a385f4d389f2c6af
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stephen Kelly [Mon, 27 Feb 2012 17:16:23 +0000 (18:16 +0100)]
Port the tests in qttools to ctest.
Change-Id: I30bcbe2e38d47a390906c01efee5025bb868ca04
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stephen Kelly [Fri, 24 Feb 2012 15:54:51 +0000 (16:54 +0100)]
Port to the @lst-file support in lupdate.
Change-Id: Iac9e528e0da526a5a879a914e3e22cfb50e60cdc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Olivier Goffart [Sun, 26 Feb 2012 11:08:26 +0000 (12:08 +0100)]
Assistant: Remove usage of deprecated QAbstractItemModel::reset
Change-Id: Ibca4d3ece78e87a1a4f9065f446d9f14a1459c03
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Olivier Goffart [Sun, 26 Feb 2012 11:09:44 +0000 (12:09 +0100)]
Designer: remove usage of deprecated API
Change-Id: I6ca4d3ece78e87123e57865f446d9f14a1459c0a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Oswald Buddenhagen [Tue, 21 Feb 2012 15:35:25 +0000 (16:35 +0100)]
clean up qmake-generated projects
remove "header" and assignmets which are defaults or bogus
Change-Id: I300d4be1928e5a7dab0fdf1c5a56992e9960b1a4
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Toby Tomkins [Tue, 21 Feb 2012 07:19:27 +0000 (17:19 +1000)]
Adding condition for activeqt plugins to only build on win32.
Including activeqt only makes sense on win32 platforms, hence only
compile them on these. Because QT_CONFIG will contain activeqt even
when the module is not compiled, this needs to be explicitly set.
Change-Id: I3bd66f85b3ccbd138dac22ed4e3fbd5c907f013a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Friedemann Kleint [Mon, 20 Feb 2012 11:40:48 +0000 (12:40 +0100)]
Fix compilation of View3d plugin.
Change-Id: Ifb6c14b927d26f7ab5bb87d218d4be3f65e9bafc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Mon, 20 Feb 2012 11:39:48 +0000 (12:39 +0100)]
Designer: Build ActiveQt custom widget plugin.
Adapt profile and activate it in plugins.pro.
Change-Id: I98378d894443521dc1d3d467338391eb53ebef2d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Fri, 17 Feb 2012 09:24:29 +0000 (10:24 +0100)]
Use new plugin system in Qt Designer.
- Change interface names to use the prefix "org.qt-project.Qt."
- Add json files and use new macros.
Change-Id: I2b0e6ac59b6dfbdced70751921a588f6e417615f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Toby Tomkins [Thu, 16 Feb 2012 03:24:15 +0000 (13:24 +1000)]
Remove duplicated plugin macro to fix compilation.
Change-Id: Ie6098bc2b5e54ee1d1bef1eace05f5afe71d3c70
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Rohan McGovern [Wed, 15 Feb 2012 02:54:07 +0000 (12:54 +1000)]
Fixed dependencies in sync.profile
Remove duplicate entry for qtscript.
Add missing qtquick1.
Change-Id: Icb81f895fbb5c0f424fed4e988a0307b90562bab
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Friedemann Kleint [Tue, 7 Feb 2012 09:39:59 +0000 (10:39 +0100)]
Qt Designer: Fix compilation.
- Change module name of QDeclarativeView to quick1,
remove declarative.
Change-Id: I706832407151b03b26a3a34e00cee11e324a3439
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Stephen Kelly [Thu, 2 Feb 2012 15:16:59 +0000 (16:16 +0100)]
Fix parsing error in CMake macro.
One extra )
Change-Id: I47b64a06112a54a4199fd3fb23ded74d89bbcdef
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Faure <faure@kde.org>
Eike Ziller [Wed, 14 Sep 2011 12:14:34 +0000 (14:14 +0200)]
Add the possibility to patch additional executables.
Change-Id: I47ecf04f538e094fe67110e627a5f17a34438df9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Friedemann Kleint [Wed, 1 Feb 2012 08:24:03 +0000 (09:24 +0100)]
Designer: Fix compilation.
- QFileDialog::selectedFilter()->QFileDialog::selectedNameFilter()
- Message handler refactoring
Change-Id: Ie80ff0948ac6a6dd5cf0d785b81720d982e1f4fa
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Jason McDonald [Tue, 24 Jan 2012 05:22:34 +0000 (15:22 +1000)]
Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ib4b7580dda53886247ad6eb10d17d8e67c51980d
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Toby Tomkins [Tue, 24 Jan 2012 05:08:33 +0000 (15:08 +1000)]
Remove dependency on designer from linguist and headers autotest.
When compiling with shadow build option the Qt sources are not
available. The QtDesigner library requires direct access to these
sources to compile. Hence if we remove the dependency on designer
(which is not required) we can compile successfully with the
shadow build configure option.
Change-Id: I36fa408a32a354d54a9b47aed8a7cba447cf4129
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Jason McDonald [Fri, 20 Jan 2012 05:23:30 +0000 (15:23 +1000)]
Update obsolete contact address.
Replace Nokia contact email address with Qt Project website.
Change-Id: I3841a7c154b90b73fe8f498fda035c8b3545c692
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Friedemann Kleint [Thu, 12 Jan 2012 11:10:47 +0000 (12:10 +0100)]
Qt Designer: Add translation-attributes to string list properties.
- Add translation parameters to XML schema for ui.
- Introduce PropertySheetStringListValue to property sheet,
load & save code, add to property sheet and property editor.
Task-number: QTBUG-8926
Task-number: QTBUG-20440
Change-Id: Ib5e9e2e9ba603bb68984a102e3c3fc8ff1cb4df0
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Friedemann Kleint [Thu, 19 Jan 2012 08:31:11 +0000 (09:31 +0100)]
lupdate: Handle translation-attributes of string list properties.
Stringlists now have translation attributes that apply to all
items.
Initial-patch-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTBUG-8926
Task-number: QTBUG-20440
Change-Id: I230f3907631074df394238e30b3ed7a15adcca4b
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Rohan McGovern [Fri, 20 Jan 2012 01:13:05 +0000 (11:13 +1000)]
Fixed compile.
QDir::convertSeparators -> QDir::toNativeSeparators
convertSeparators was deprecated since Qt 4.2 (!) and recently was
removed from Qt 5.
Change-Id: I6a7dad582ed4270cfbd09defc94c73103bb2a9fe
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Gunnar Sletta [Mon, 9 Jan 2012 08:31:36 +0000 (09:31 +0100)]
Remove the use of QT_MODULE()
Change-Id: I8b9f3c04b0089047c6583f986a2fb903cf7bf62d
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Friedemann Kleint [Fri, 13 Jan 2012 08:18:19 +0000 (09:18 +0100)]
Compile fix for accessibility.
Change-Id: Ib2e668441da3fa5ab176a2dea6b5b8f22dbfec5b
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Wed, 11 Jan 2012 11:11:59 +0000 (12:11 +0100)]
Qt Designer: Simplify property editor for translatable properties.
- Introduce sub-propertymanager for translatable properties
inheriting PropertySheetTranslatableData.
- Use common enumeration values for sub-propertymanager functions
to make it easier to chain them.
Task-number: QTBUG-8926
Task-number: QTBUG-20440
Change-Id: I8e99aa01fdca7e474a0ec83b7209a28a2a689bf9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Jason McDonald [Tue, 10 Jan 2012 06:23:26 +0000 (16:23 +1000)]
Update copyright year in Nokia copyright headers.
Update copyright headers from before 2011
Change-Id: I7d822c71326283db79fa392022baa09a3c22b331
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Rohan McGovern [Tue, 10 Jan 2012 08:04:41 +0000 (18:04 +1000)]
sync.profile: introduce dependency on qtjsbackend
sync.profile needs to enumerate indirect dependencies too.
qtdeclarative now depends on qtjsbackend; update sync.profile
accordingly.
Change-Id: Ia6ccda2cfb971b2cd58bd9e2d880c76a5603ad37
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Olivier Goffart [Wed, 2 Nov 2011 18:38:10 +0000 (19:38 +0100)]
Replace Q_TYPENAME by typename
Q_TYPENAME is being removed.
Change-Id: I4b4b34dbf87e3f2f3a604d4370d1c0e55e1553c5
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Mon, 9 Jan 2012 10:22:33 +0000 (11:22 +0100)]
Port assistant to QNetworkAccessManager
Change-Id: Idd3f5ebbb6719861ee20d9cef2fc5d98c24360f3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Fri, 6 Jan 2012 15:37:12 +0000 (16:37 +0100)]
Qt Designer: Simplify code for translatable properties.
Introduce base class for PropertySheetStringValue,
PropertySheetKeySequenceValue, which allows for removing
redundant code to set/retrieve the translation parameters
to/from the DOM classes.
Task-number: QTBUG-8926
Task-number: QTBUG-20440
Change-Id: I5b65fff2bb27be82d04f96cf0d66652887b1c4b7
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Jason McDonald [Thu, 5 Jan 2012 06:10:00 +0000 (16:10 +1000)]
Update copyright year in license headers.
Change-Id: I89fb3609f49f9a4f1e7d658b05e212febcb14c94
Sanity-Review: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Stephen Kelly [Mon, 19 Dec 2011 21:51:50 +0000 (22:51 +0100)]
Convert macros to functions.
Change-Id: I08104d1189ed7d7debcb9f5bd38e8862423ef2c3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Jason McDonald [Tue, 20 Dec 2011 04:32:08 +0000 (14:32 +1000)]
Avoid using Trolltech logo in documentation.
Change-Id: Iafc6ec21069994599506562edfcd1c98a850c5f7
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 20 Dec 2011 04:22:47 +0000 (14:22 +1000)]
Rename trolltech-logo.png.
This file contains a Qt logo, not a Trolltech logo.
Change-Id: I67bdee76cb2e3e3ef762b98b729ec0babc668327
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Stephen Kelly [Mon, 19 Dec 2011 21:43:13 +0000 (22:43 +0100)]
Port to list(APPEND)
Change-Id: Ib0eeef10b68edb5a7edc07d400e1d11c1bb7ffc3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stephen Kelly [Mon, 19 Dec 2011 21:39:23 +0000 (22:39 +0100)]
Port to MacroParseArguments.
Change-Id: I030eb6e1bcd99ec867ca4f5a97fcc3bc7002b6b2
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stephen Kelly [Mon, 19 Dec 2011 21:35:19 +0000 (22:35 +0100)]
Fix CMake style.
Change-Id: I4ec793889a7f6564938203766737c957f2044a83
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stephen Kelly [Sun, 18 Dec 2011 10:56:57 +0000 (11:56 +0100)]
Remove unused include.
Change-Id: I599b45ff8aaa17fb4a255b10b008fa6c0455c5d3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Sergio Ahumada [Sun, 18 Dec 2011 10:41:39 +0000 (11:41 +0100)]
Fix compilation due to header changes
- Fix QtWidgets/QAbstractProxyModel => QtCore/QAbstractProxyModel
- Fix QtWidgets/QItemSelection => QtCore/QItemSelection
- Fix QtWidgets/QItemSelectionModel => QtCore/QItemSelectionModel
- Fix QtWidgets/QSortFilterProxyModel => QtCore/QSortFilterProxyModel
- Fix QtWidgets/QStringListModel => QtCore/QStringListModel
Change-Id: Id410fb4c6ae89d32eac3242b9a8cbfb3442b0555
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Friedemann Kleint [Fri, 9 Dec 2011 12:18:21 +0000 (13:18 +0100)]
Qt Designer/QtUiLoader: Remove support for QWorkspace.
Change-Id: Ic0ffb13c5d30528800c1beae85d5224e8f2f7104
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: David Faure <david.faure@kdab.com>
Oswald Buddenhagen [Tue, 15 Nov 2011 15:07:01 +0000 (16:07 +0100)]
make $$join() implementation qmake-compliant
Task-number: QTCREATORBUG-6441
Change-Id: I1d18c81f76cda71654a85c23b7b53b4aae0d51c6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
555e539760998fcff1e3117abc5080c4fee47275)
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Daniel Teske [Tue, 1 Nov 2011 20:43:54 +0000 (21:43 +0100)]
Make sysrootify case-insensitive on windows
Task-Number: QTCREATORBUG-6419
Change-Id: If3ab035ee3a117744213d5e3db3ffa41f7283d53
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
e7c6b9dbbbba8224dd7abaa2b513bec66fbf3abf)
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Ruben Van Boxem [Sun, 30 Oct 2011 11:27:21 +0000 (12:27 +0100)]
Work around MinGW GCC version >=4.5 always_inline+dllexport bug.
Use regular inline instead of always_inline for MinGW GCC build. GCC 4.5
and later spit out an error on always_inline dllexport functions, which
breaks the build for these versions of GCC (see bug 5938).
Change-Id: I444380ff98071b4653a91d074494ace579b4a622
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
310b446a81dd927739e503b03389641f1aa13ab4)
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Robert Loehning [Fri, 21 Oct 2011 13:23:53 +0000 (15:23 +0200)]
Removed dead assignments
Change-Id: I1368cb534284016479211160cd8bf3cbc2f738e4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
75719f04ee2c41312c70fee2271796d05ea08c0e)
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Oswald Buddenhagen [Mon, 11 Jul 2011 13:40:07 +0000 (15:40 +0200)]
implement qt5 $$sort_depends() and $$resolve_depends()
Task-number: QTCREATORBUG-5289
Change-Id: I15e08005c13d12afd5791796d676b30c726fadc3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
(cherry picked from commit
330e118424f67d7e9de764b2d1fb1dad8000974e)
(cherry picked from commit
7cd17f3f41dfbcf6c7cb791dd4db890815f8468c)
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Takumi ASAKI [Wed, 30 Nov 2011 19:29:29 +0000 (20:29 +0100)]
Qt Linguist: Fix crashes
Fix crash when select translation after close and open file.
This patches includes refactoring of
b68b59f252930538cc124b31decc990ab57bea20
Merge-request: 1480
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
27c322e0f88fa0cccba8cf914655cacb5dae51de)
Change-Id: I27c322e0f88fa0cccba8cf914655cacb5dae51de
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Roberto Raggi [Wed, 7 Dec 2011 09:24:01 +0000 (10:24 +0100)]
Improve lupdate
Merge the QML and the Javascript front-ends. Also, change the
way we process directives in QML/JS comments. The old code
was processing all the directives before visiting the AST nodes.
Unfortunately, this doesn't play nice with TRANSLATOR-like
directives.
Added support for translating extended Javascript files. That is,
QML/JS extends Javascript with pragma directives (e.g. .pragma).
We emulate the `real' QML engine and we simply remove the pragmas
from the original source code.
Change-Id: Ie2536b10199a587b97f41c5e0560acabae981807
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Jason McDonald [Mon, 12 Dec 2011 06:13:34 +0000 (16:13 +1000)]
Avoid duplicating qtestlib usage text.
The valid qtestlib command-line options change over time. Refer to the
documentation rather than creating an ongoing maintenance problem by
duplicating the list of options.
Change-Id: Id16b71e611f80b89c48b73490b816f5b908699d6
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Stephen Kelly [Thu, 1 Dec 2011 12:33:30 +0000 (13:33 +0100)]
Make it possible for CMake to find linguist and dbus tools.
This includes the BSD licenced CMake macros for invoking
those tools.
Change-Id: I57c2994af2220353a845b6622b89291de349008d
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Sanity-Review: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Jason McDonald [Tue, 6 Dec 2011 00:42:51 +0000 (10:42 +1000)]
Remove TESTED_CLASS/TESTED_FILES comments from tests.
These comments were all empty. Appropriate naming of tests and
appropriate placement of tests within the directory tree provide more
reliable indicators of what is being tested.
Change-Id: I00c7ec38e2febd68179952f683e579c82d3d79c9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Toby Tomkins [Tue, 6 Dec 2011 03:29:22 +0000 (13:29 +1000)]
Correct QtUiTools library suffix.
The project file change cleans up the previous version and follows the
coding style of the module. This fixes the suffix issue implicitly by
correctly loading module configuration.
Task-number: QTBUG-7169
Change-Id: If0a746ee3a61ba1a6b66f7d73f0470cdb9032064
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Toby Tomkins [Mon, 5 Dec 2011 05:39:38 +0000 (15:39 +1000)]
Pre-emptive changes to StringBuilder compile anomaly.
The StringBuilder issue occured after making changes to the pro file.
This change adds the use of QT_USE_QSTRINGBUILDER, however it does not
compile correctly with the above change. Added QByteArray to explicitly
define the dynamic name and return it back as char*.
Change-Id: I23ec434deb52da2d7b27f3e7fb17ceba4aa36d4f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Kent Hansen [Thu, 1 Dec 2011 07:22:48 +0000 (08:22 +0100)]
lupdate: Allow trailing commas in QtScript/JS object literals
As per ECMA-262 5th edition, section 11.1.5, trailing commas should
be allowed in object literals. E.g.
{ foo: 10, }
shouldn't cause a syntax error; the comma should simply be ignored.
Task-number: QTBUG-22970
Change-Id: I3e730ad3001760475e5e40bb4a28a05b0baf5c7e
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Kent Hansen [Thu, 1 Dec 2011 07:09:38 +0000 (08:09 +0100)]
lupdate: Regenerate QtScript/JS parser
The latest version of qlalr produces output that is different from
the previous version, even if the grammar file didn't change.
Also remove stale line from QtScript/JS grammar. (It had mistakenly
been removed from the generated parser but not from the input file.)
Change-Id: Icfc7d154230b5e908a9617c7c1a3cd607879bef9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Toby Tomkins [Wed, 30 Nov 2011 07:30:27 +0000 (17:30 +1000)]
Add correct namespace macros around Qt classes.
This change is required to support generation of correctly namespaced
code that can be used by Qt binaries configured with the -qtnamespace
option.
Task-number: QTBUG-19579
Change-Id: I6f8db9e0c60a50b51a79c1c09ac6aa7e9ace07c0
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Ralf Habacker [Tue, 25 Oct 2011 08:34:11 +0000 (10:34 +0200)]
fixed error generating wrong introspection string in header output file
When using dbus introspection files with CRLF encoding the CR is not
handled and results into a CR code at a wrong location in the output file
Bug 17634
Change-Id: If48a571a01ffe6d135f79872235341a06fb3a75f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Rohan McGovern [Wed, 23 Nov 2011 02:48:32 +0000 (12:48 +1000)]
Gracefully disable designer when QtCore sources aren't available.
Designer directly includes some source code from the qtbase repository,
so it can't be compiled against an installed Qt. Warn rather than
fail in this case.
Change-Id: I9b0395cabf13ad712cfbd4b2f661c873fa0b3b5f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Takumi ASAKI [Thu, 17 Nov 2011 15:26:05 +0000 (16:26 +0100)]
Qt Linguist: Fix crash after select 2nd translation in lengthvariant
* MessageEditor keeps deleted editor as m_selectionHolder.
QOjbect::destroyed() SIGNAL doesn't fit to fix this problem
due to destruction order problem.
Merge-request: 1466
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
b68b59f252930538cc124b31decc990ab57bea20)
Change-Id: Ib68b59f252930538cc124b31decc990ab57bea20
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Oswald Buddenhagen [Thu, 6 Oct 2011 14:56:16 +0000 (16:56 +0200)]
add -list-languages option to lupdate
(cherry picked from commit
3b3788a25f58fc443a48672c8e852e1c8658ac4e)
Change-Id: I4523cde9b12268790c32d4a129c962c3d48ed1b9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 4 Oct 2011 09:30:37 +0000 (11:30 +0200)]
remove dead code
(cherry picked from commit
a3e91910e6eed7f5523009eb0a5439f4019d16ed)
Change-Id: I8b7cac5a65c9ee17f58562d1951496ede86c71a0
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Friedemann Kleint [Wed, 9 Nov 2011 10:05:41 +0000 (11:05 +0100)]
Qt Designer: Fix static linking on Mac.
Add a comment in shared.pri explaining the problem.
See also
e7762b60d519c9ae4b47f6c4ceece584408247ea
(cherry picked from commit
74884dd3821b22453804cd726e8d10908f493adf)
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTBUG-22542
Change-Id: Id93bcc22f61825cb317c8e8f79d603589da3a10b
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Harald Fernengel [Fri, 4 Nov 2011 09:11:19 +0000 (10:11 +0100)]
compile
Change-Id: Ie0b7f1e38cdb0c81cd7b9c30738a503578b19302
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Thu, 3 Nov 2011 09:02:44 +0000 (10:02 +0100)]
Qt Designer: Fix linking of QtQuick1 plugin on Windows.
Change-Id: I611aef8f621a4f26cbfdeab725fd4dec03def448
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Fri, 28 Oct 2011 13:29:14 +0000 (15:29 +0200)]
Qt Designer: Remove QScript extension.
Change-Id: I351b1437442b65a96e07de6fa633e06f3953c128
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Thu, 27 Oct 2011 15:21:39 +0000 (17:21 +0200)]
Designer: Fix warnings about assigned/unused variables.
Change-Id: I99196befc6fe5578bc9a1813a9ec21c08c5c3b25
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>