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

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

Get Linguist to compile again

Change-Id: If65b0e046a277bd2c83c5188285de4e8d14101b8
Reviewed-on: http://codereview.qt-project.org/4832
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Get designer to compile again.

And it actually runs! ;-)

Change-Id: I593991e3b5d423189f00d1bd9c51daca6b9e9bd0
Reviewed-on: http://codereview.qt-project.org/4831
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Add QtUiTools and uilib

This code used to live in qtbase. It doesn't belong
there however and since there are no dependencies
in qtbase left that require it move it here.

This significantly simplifies the build system with
regards to the code in uilib.

Change-Id: I41c8687bd071a1c253eb55594986f3e1424bc6cf
Reviewed-on: http://codereview.qt-project.org/4830
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Get assistant to compile against refactor

Give the source code a somewhat saner structure while
I'm at it.

Change-Id: I99766405debe231a0562dd623ba1d17f19333656
Reviewed-on: http://codereview.qt-project.org/4829
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

fix build on windows 7

remove pointless epocroot.pri inclusion

(cherry picked from commit 267e7ca0e586eb63c62deac94f8412db962d621d)

Conflicts:
tools/linguist/lrelease/lrelease.pro

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

"fix" license headers

our policy and even more its implementation is mildly braindead ...

(cherry picked from commit 29a0fc05c1c0d31adc3787feb4d79bcc0af930f8)

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

need no qlibraryinfo any more

we call qmake now

(cherry picked from commit 8f21f8aa75e4a64cdb89dbfd89663bcf5d58ab34)

Conflicts:
tools/linguist/lrelease/lrelease.pro

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

remove dead variables

(cherry picked from commit dedc3463b28fd859bc79f04655e7a13c7c2c2042)

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

optimization: avoid creating unnecessary temporaries

erase messages instead of building a new list of non-dropped ones.
modify messages instead of replacing them with modified copies.

(cherry picked from commit a6f009462876a37dc5e6b04a0f0837bc7f00694b)

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

add hash-based indexing to Translator for fast find()

(cherry picked from commit 361b7404f569f88e11f45d5d8e2dc61e183f37b6)

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

remove Translator::translatedMessages()

it's inefficient to construct a new list. on top of that, the only user
actually checks the message state again.

(cherry picked from commit 8a5d0e6c3d1cf6b269f755a8d54b25b704ba8356)

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

remove Translator::contains()

it's redundant with find() now, as the latter is cheap now

(cherry picked from commit dc587b47af5fec8268ccd33935f6abe442ae8904)

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

optimization: make the Translator::find() api index-based

(cherry picked from commit a107d3e22e128ec343d82f902de4c6ee0e33435f)

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

fix misnomer: MainWindow::closePhraseBooks() => maybeSavePhraseBooks()

(cherry picked from commit ad23439b7e112aa8a36f34e7b16224dcab742147)

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

nuke Translator::release(), make saveQM() non-static instead

this "factory" served only to obfuscate the code

(cherry picked from commit 531614ae15a2bc43e782c247a2dee5387566397a)

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

synchronize qmake project parser with qt creator

qt creator as of ddb918f.
not feeling like replaying the whole history ...

(cherry picked from commit f1249f94c07654f0b76e7a90fb81ed5b58cd30f7)

Conflicts:
tools/linguist/shared/profileevaluator.cpp

Change-Id: Ief6f9bc0eed4e8a759e95ed321d158f4017710d4
Reviewed-on: http://codereview.qt-project.org/4605
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Removed the unnecessary dependency of the QtHelp module on the QtXml one

Merge-request: 2669
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 02f55668dada4a23ab84e4d3bda1df8a4984b3ae)

Conflicts:
mkspecs/features/help.prf
tools/assistant/lib/lib.pro

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

use a printErr() function instead of std::cerr like in lupdate

(cherry picked from commit 0b92d6cc61a18ae18d254ac6ee463e74cb570db4)

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

X11: Keep the menubar inside the widgetbox window in toplevel mode

For now the appmenu protocol does not make it possible to associate a
menubar with all application windows. This means in top level mode you
can only reach the menubar when the widgetbox window is active. Since
this is quite inconvenient, better not use the native menubar in this
configuration and keep the menubar in the widgetbox window.

Merge-request: 1229
Reviewed-by: denis
(cherry-picked from commit a45398677309ab905b69c599177b4c2951292b04)

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

Update Japanese translations.

* Fix some inconsistent translations.
* Translate some missing messages.
* Update Japanese phrasebook.

Merge-request: 1249
Reviewed-by: ossi
(cherry picked from commit 7eb590b5bb00e5cfb8e153938f55013eebe94880)

Conflicts:
translations/assistant_ja.ts
translations/designer_ja.ts
translations/linguist_ja.ts
translations/qt_help_ja.ts
translations/qt_ja.ts
translations/qtconfig_ja.ts

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

Silently ignore a wrong parameter count instead of crashing

Merge-request: 1363
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
(cherry picked from commit 7fb04c5964e47e71b709a413be7839a3cedbba9e)

Change-Id: I39149c00a2e3b6e7c995be42c2d0edd84bb86e63
Reviewed-on: http://codereview.qt.nokia.com/3950
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>

Compile against the new QML front-end.

Change-Id: I35b841b440a2cb3aa8cf180a8cc42613c0c41915
Reviewed-on: http://codereview.qt.nokia.com/3881
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

Remove obsolete testlib files from .gitignore

Change-Id: I7ab2d3999ce326613381754fa0a86aa974d94883
Reviewed-on: http://codereview.qt.nokia.com/3381
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Remove obsolete qtestlib updater utility.

The utility updates Qt 2.x autotests to Qt 4. As qtestlib was not
public until Qt 4.1, it is very unlikely that there are any Qt 2.x
autotests in the wild.

Change-Id: Iaa9eac5f18778ae9ea4aeba87269b2fba7bc2005
Reviewed-on: http://codereview.qt.nokia.com/3365
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

Use QXmlStreamReader/Writer from QtCore instead of QtXml.

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

Qt Designer: Remove QDom from XSLT used for generating uic/uiloader.

Done-with: Kai Koehne <kai.koehne@nokia.com>

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

Make macdeployqt more robust against usage of symbolic links.

If binaries linked against Versions/Current *and* a specific version,
the framework's binary would be copied twice, leading to duplicate
symbols exceptions. Instead we now check for that condition and
replicate the symbolic link.
(cherry picked from 3a66c5da851223cb4017d69ef3cca7d3818431c7)

Change-Id: I9151eb8bb345674014339586be2f79b08b22aca2
Reviewed-by: TrustMe
Reviewed-on: http://codereview.qt.nokia.com/2400
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Designer: Fix build warnings about missing QLatin1String().

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

Document support for Linguist on Mac.

Fixes dragging documents on Linguist dock icon, double clicking document
in Finder, and the "open" terminal command.
(cherry-picked from 80c5ea1a99e0c7794245e53175c949597315c96f)

Task-number: QTBUG-20194
Change-Id: Ice077ca397c6274f48e6911434a71c9934e42142
Reviewed-by: Oswald Buddenhagen
Reviewed-on: http://codereview.qt.nokia.com/2282
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle.

Needed e.g. for Qt Creator, which is a bundle of plugins.
Ported from 4.8 4bda273330f6705b79cf18c3ea8ef294f58a5239

Change-Id: Icc966fb1f663c3156ac057acba3923a6db27ee09
Reviewed-on: http://codereview.qt.nokia.com/2257
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Guard macdeployqt against @rpath and @loader_path too.

Ported from 4.8 2ccef4f57f036a486cb96904298a8b4673ff0aec

Change-Id: I01f6449ebdb610684d0aab3a37fe66ed0a37b522
Reviewed-on: http://codereview.qt.nokia.com/2256
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Fix typo.

Ported from 4.8 0b16c7a8a5522e3bc7414130dc609763bc2f4e3d
Change-Id: I0ca572dd3a096609ecf914a5df66e19b1fd51e6f
Reviewed-on: http://codereview.qt.nokia.com/2255
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Remove references to qtdemo.

Change-Id: Ib6d0b4546f4f30425beca21171cafe8da2a3485b
Reviewed-on: http://codereview.qt.nokia.com/1496
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie

Merge demos and examples.

Change-Id: Ib8598b8e1f28ed6d2f2dd0cb0cb7f45480cabdca
Reviewed-on: http://codereview.qt.nokia.com/1495
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie

Don't use QT_BUILD_TREE anymore

Modules have their own variables to use for such things
If there's no way of getting to what you need outside of those,
you probably shouldn't be doing it in the first place.

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

have libQtDesigner load(qt_module_config) like all Qt libs

load(qt_module_config) is the same as include(.../qbase.pri) before
and set up the library to match how Qt libraries are normally
configured. It's needed to pull in various thing like for example
CONFIG+=explicitlib, etc.

Also remove redundant QT += uilib-private

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

Fixed build break

QDeclarativeItem was moved from QtDeclarative to QtQuick1

Change-Id: Ic5b018ff73dbb808bbbd26d7cd7209c287d26811
Reviewed-on: http://codereview.qt.nokia.com/1562
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>