review.tizen.org Git - platform/upstream/qttools.git/log

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>

Make the tests somewhat more standard.

Change-Id: I1b010a23763cb0de404f8d89a385f4d389f2c6af
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

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>

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>

Assistant: Remove usage of deprecated QAbstractItemModel::reset

Change-Id: Ibca4d3ece78e87a1a4f9065f446d9f14a1459c03
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

Designer: remove usage of deprecated API

Change-Id: I6ca4d3ece78e87123e57865f446d9f14a1459c0a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

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>

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>

Fix compilation of View3d plugin.

Change-Id: Ifb6c14b927d26f7ab5bb87d218d4be3f65e9bafc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

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>

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>

Remove duplicated plugin macro to fix compilation.

Change-Id: Ie6098bc2b5e54ee1d1bef1eace05f5afe71d3c70
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Fixed dependencies in sync.profile

Remove duplicate entry for qtscript.

Add missing qtquick1.

Change-Id: Icb81f895fbb5c0f424fed4e988a0307b90562bab
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

Qt Designer: Fix compilation.

- Change module name of QDeclarativeView to quick1,
remove declarative.

Change-Id: I706832407151b03b26a3a34e00cee11e324a3439
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

compile

Change-Id: Ie0b7f1e38cdb0c81cd7b9c30738a503578b19302
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

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>

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>

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>

Remove "Trolltech" from installation path.

Note that this commit makes no attempt to fix the otherwise outdated
test data.

Change-Id: Idce7358175cdbdd7cbbc9d3094ae02efb2a1b768
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Sanity-Review: Jason McDonald <jason.mcdonald@nokia.com>

Remove SkipMode parameter from QSKIP.

The SkipMode parameter has been removed from the API in qtbase, so it
must be in all calls to QSKIP.

Task-number: QTBUG-21851, QTBUG-21652
Change-Id: I7f4f5627242d942b02eb0e2b34bea7e4bcd08f7c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Fixed compile; QDesktopServices -> QStandardPaths

Broken by qtbase dfa24768a3243eda68d91f573050bf23f96da2dd.

Change-Id: Id5940e90ac4a0853a5bda99c9db95bc77d53dfe1
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

QtTools: Remove qqmeegographicssystemhelper library.

Acked-by: Samuel Rødal <samuel.rodal@nokia.com>
Change-Id: Idf32af82727d81137c12d7d158d6fb792a720eb2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

QtTools: Remove qvfb

Acked-by: Paul Olav Tvete <paul.tvete@nokia.com>
Change-Id: I407da6c847a1c210bcc8cdf0be8c6109a7bdcd8a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

QtTools: Various build fixes.

Change-Id: Ib627113e9dae8b12cf79ef88a29543439eead427
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

QtTools/Assistant: Replace Q_WS_ by Q_OS_ where appropriate.

Change-Id: Ifbd9c374a8a7947191528c947ec0f419bcf20081
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

QtTools: Various build fixes.

Change-Id: Idc46165f16208efc2e59fc4b2b3a6eb486a91ff5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

QtTools/Designer/shared: Replace Q_WS_ by Q_OS_ where appropriate.

Change-Id: I166d859f8f446fb4bd08ed05aae1e3db0346b263
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

QtTools: Remove symbian branches from .pro-files.

Change-Id: I9b84010a5e0628e348569201503ab6c25a3bbfd5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Don't build empty tests.

If the help tools aren't part of the Qt build, avoid building the
associated tests instead of building them as empty tests.

Change-Id: I40a74b464f46dfe0835a55321e1f3dade4e5c9f3
Reviewed-on: http://codereview.qt-project.org/6499
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Make lupdate use QmlDevTools library for parsing QML

Gets rid of the dependency on the qtdeclarative sources.

Change-Id: Ifbb00d856416943a3701f7355499667e11ecdf90
Reviewed-on: http://codereview.qt-project.org/6117
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

tests: eliminated usage of qttest_p4.prf

qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.

Change-Id: Ie775d011e6f63d4d174c2be78cda138d7bbe85ff
Reviewed-on: http://codereview.qt-project.org/6186
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

Remove redundant check in WidgetFactory

Checking for "QDockWidget" once should be enough.

Change-Id: I9276c4d0c80eb4f18d604c056dd1dd694dbd2f5f
Reviewed-on: http://codereview.qt-project.org/6061
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Designer: Compile on Windows.

Clean up .pro-files, remove fiddling with libraryTarget.

Change-Id: I81e1b7cf6e2bbafec3a36e56f92e44a83886bb31
Reviewed-on: http://codereview.qt-project.org/5978
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Make "#include <QtUiTools/QUiLoader>" work

We need to add the base include directory to allow this type of
includes to work. The same approach is taken by all other modules.

Merge-request: 2
Change-Id: I3bdac5fe0096637b42dae49e306761f489fff8ff
Reviewed-on: http://codereview.qt-project.org/5909
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Tools: Compile examples.

Change-Id: I0ca17a4632c69aa8bf1cd33111dc5fbeb2e62d44
Reviewed-on: http://codereview.qt-project.org/5866
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Don't crash when running qhelpgenerator.

It's not enough to link to libQtGui, QGuiApplication must also be used.

Change-Id: Ie8ea0e3aa711308052fcbd4e670eef7fc1269403
Reviewed-on: http://codereview.qt-project.org/5516
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Fixed compile (Qt::escape -> toHtmlEscaped())

Fixed compile after source-incompatible qtbase change
b863df7de926448cf0057272c16da04b7cfb11ee .

Change-Id: I400ead7bd2ec80057dba9c4c3163427ffa4b7c4c
Reviewed-on: http://codereview.qt-project.org/5830
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>

Fixed compile (QMimeData header change)

Fixes the breakage caused by e9ccc40c28d11d7d17e6c79a627590f730b7c120
in qtbase.

Change-Id: Id77ca08ad9b207d1a661c9d45f560423bb9d0285
Reviewed-on: http://codereview.qt-project.org/5829
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>

Designer, QtUiTools, uic: Add Perl script to generate sources.

Add a script to generate ui4.cpp/ui4.h used in uic, Qt Designer
and QtUiTools from the .ui file schema.

Tested on Linux.

Change-Id: Iace3805f9e58c223fd71c8b8cc6f34ce0a930d38
Reviewed-on: http://codereview.qt-project.org/5711
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Designer: Fix compilation with MSVC 2010.

Remove overzealous use of QStringLiteral.
Adapt XSLT accordingly.

Change-Id: I281a56feb299eaa0cca7dde25353c9bbd158909d
Reviewed-on: http://codereview.qt-project.org/5700
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Assistant: Fix compilation with QT_NO_PRINTER (Windows).

Change-Id: I145022208ac245c4904dbabd9910985ea43f00bf
Reviewed-on: http://codereview.qt-project.org/5687
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Designer: Remove highlighting of Qt3 support slots/signals.

Leave highlighting infrastructure intact should there be
another version switch causing deprecation of signals and slots.

Change-Id: Ic16c29f480750e85200ba68345a3c6b8dcba6c7c
Reviewed-on: http://codereview.qt-project.org/5682
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Designer: Fix string conversion warnings/introduce QStringLiteral.

on this occasion.

Change-Id: Ib80dfdf8aae162b02500293a83e3bc12941f7406
Reviewed-on: http://codereview.qt-project.org/5637
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Don't store the alignment attribute for spacers

And for QLayoutWidget as it is not allowed and will create
a code which doesn't compile

Reviewed-by: con <qtc-committer@nokia.com>
Task-number: QTBUG-21575

(cherry-picked from commit a6f87c60ed135c8f92a0de846dba5734fa7cf6c6)

Change-Id: Ifb0afe488a028565ca1ff4a7e8b2150b4ef1d4c8
Reviewed-on: http://codereview.qt-project.org/5556
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Fixed linking against QtUiTools on mac when frameworks are enabled.

QtUiTools is always built as a staticlib. On mac, anyone linking
against it needs to know this, otherwise they will incorrectly attempt
to link with `-framework QtUiTools'.

Change-Id: I231eb17ee9d387cab6ab8534ff3112e35ef82946
Reviewed-on: http://codereview.qt-project.org/5289
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>

Fixed compile of qhelpconverter.

This needs to link against libQtWidgets (e.g., it uses QWizard).

Change-Id: I4164519b205f9797814ea2884a38e5789510c0a3
Reviewed-on: http://codereview.qt-project.org/5285
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

Fixed compile of QtHelp on mac when frameworks are in use

Removed the incorrect assumption that QtCLucene is never a
framework.

Note that this logic still doesn't match exactly what is in qtAddLibrary
or qtAddModule in qt_functions.prf, therefore the build may still
fail in some exotic setups.

Change-Id: If032c0c4ac6031b5bb28033996a8773ecdb077e9
Reviewed-on: http://codereview.qt-project.org/5264
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

Removed qtwebkit from qttools sync.profile

The qt-modularization-base branch of webkit doesn't compile against
post-refactor Qt, and isn't likely to any time soon.

The qtwebkit dependency for qttools is optional, so we'll remove it for
now and test without it until the webkit situation is improved.

Change-Id: I1ed57bd5a91fb7056a3c8daddde33d33a41e72a3
Reviewed-on: http://codereview.qt-project.org/5187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

Fixed compile of lupdate.

lupdate wants to use private QtDeclarative symbols.
Either the symbols need to be made public, or lupdate needs to compile
its own copy of the code.

This commit applies the latter approach.

Change-Id: I119c2d044fe2a8953867f7b6e2fc446dee65cce3
Reviewed-on: http://codereview.qt-project.org/5181
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

Fixed compile; removed reference to nonexistent directory

`uitools' directory does not exist.

Change-Id: Ib0f3ee78200089da09a9120c455f09fc6dabe8ea
Reviewed-on: http://codereview.qt-project.org/5180
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

Merge remote-tracking branch 'origin/refactor' into master

Conflicts:
src/assistant/help/help.pro
src/designer/src/components/formeditor/formwindow.cpp
src/designer/src/components/formeditor/formwindow_dnditem.cpp
src/designer/src/components/formeditor/layout_propertysheet.cpp
src/designer/src/components/formeditor/qdesigner_resource.cpp
src/designer/src/components/lib/lib.pro
src/designer/src/components/signalsloteditor/signalsloteditor.cpp
src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
src/designer/src/lib/lib.pro
src/designer/src/lib/shared/qdesigner_formbuilder.cpp
src/designer/src/lib/shared/qdesigner_propertysheet.cpp
src/designer/src/lib/shared/shared.pri
src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro
src/linguist/lupdate/qdeclarative.cpp
src/linguist/shared/profileevaluator.cpp
src/linguist/shared/qph.cpp
src/linguist/shared/ts.cpp
src/qtconfig/mainwindow.cpp
src/shared/qtgradienteditor/qtcolorline.cpp
src/shared/qtgradienteditor/qtgradientwidget.cpp
sync.profile

Change-Id: I53f0ce4efae4179257cbf3aab87e1af12c3aa4ff