platform/upstream/qttools.git
13 years agoSquashed commit of changes from the 4.8-temp branch.
David Boddie [Wed, 11 May 2011 15:35:46 +0000 (17:35 +0200)]
Squashed commit of changes from the 4.8-temp branch.

13 years agoSquashed commit of the changes from the mobile-examples repository
David Boddie [Wed, 27 Apr 2011 17:16:41 +0000 (19:16 +0200)]
Squashed commit of the changes from the mobile-examples repository
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)

13 years agoDesigner: Extend container extension.
Friedemann Kleint [Fri, 20 May 2011 09:21:53 +0000 (11:21 +0200)]
Designer: Extend container extension.

Make it possible to disable adding/removing pages by
adding respective bool virtual functions.

Useful for implementing containers with fixed, single
children like QScrollArea, QDockWidget, which require
a container extension to work properly in Qt Designer.
Previously, the problem was that the add/remove
page context menu actions were enabled for them,
leading to crashes und undesired behaviour.

See e00b8105bfcf3d4e36275dea6355705ec5fdbc40 in qtbase.

Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
13 years agoCompile warning.
Friedemann Kleint [Fri, 20 May 2011 09:13:45 +0000 (11:13 +0200)]
Compile warning.

13 years agoDesigner: Refactor save/load.
Friedemann Kleint [Thu, 19 May 2011 07:04:51 +0000 (09:04 +0200)]
Designer: Refactor save/load.

No longer pop up message boxes in QDesignerFormWindowInterface::
contents(), introduce QDesignerFormWindowInterface::checkContents()
instead that checks for orphaned top level spacers (use in
Designer application).

Give QDesignerFormWindowInterface::setContents() a bool return and
pass an optional error string back for IDE integrations.

Remove all Qt3 form conversion logic
from the loading logic (since there is no more uic3); do not
do any additional checks there since everything has been
moved to QAbstractFormBuilder::load() (including language).

Thus, QDesignerFormWindowInterface::setContents() no
longer pops up message boxes, either.

Dependent on: qtbase/449b8a93170ecc19f2f438b160d0bc4122999401

13 years agoDesigner: Add documentation for new interfaces.
Friedemann Kleint [Tue, 17 May 2011 13:53:48 +0000 (15:53 +0200)]
Designer: Add documentation for new interfaces.

\internal.

13 years agoDesigner: Make some interfaces needed for IDE integration public.
Friedemann Kleint [Tue, 17 May 2011 12:40:34 +0000 (14:40 +0200)]
Designer: Make some interfaces needed for IDE integration public.

QDesignerNewFormWidgetInterface
QDesignerSettingsInterface
QDesignerOptionsPageInterface

13 years agoRevert "Added missing QtXml dependency"
Eckhart Koppen [Sat, 14 May 2011 07:11:12 +0000 (10:11 +0300)]
Revert "Added missing QtXml dependency"

This reverts commit 7e40b1c87d91d0c3cd06c49eb5cf98c95179d030.
Commit was reverted since building with rpath enabled will solve
creating the translations during compile time. Disabling rpath
will be investigated at a later point.

13 years agoAdded missing QtXml dependency
Eckhart Koppen [Fri, 13 May 2011 20:33:09 +0000 (23:33 +0300)]
Added missing QtXml dependency

Library needed at runtime

13 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qttools-staging
Eckhart Koppen [Fri, 13 May 2011 12:57:06 +0000 (15:57 +0300)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qttools-staging

13 years agoUpdated Assistant doc version number to 5.0.0
Eckhart Koppen [Fri, 13 May 2011 12:43:28 +0000 (15:43 +0300)]
Updated Assistant doc version number to 5.0.0

13 years agoDesigner: BC cleanup of QDesignerFormWindowManager.
Friedemann Kleint [Fri, 13 May 2011 12:24:57 +0000 (14:24 +0200)]
Designer: BC cleanup of QDesignerFormWindowManager.

Obsolete the virtual action-accessors causing Qt 4 BC grief
by action() taking an enumeration that can be easily extended.
Make actions added during Qt 4 development available.

Make preview functionality public for IDE integration.

Acked-by: Jarek Kobus <jkobus@trolltech.com>
13 years agoUpdate module version number to 5.0.0
Eckhart Koppen [Fri, 13 May 2011 10:35:32 +0000 (13:35 +0300)]
Update module version number to 5.0.0

Updated .pri file variables

13 years agoDesigner: BC corrections in QDesignerFormWindowInterface.
Friedemann Kleint [Fri, 13 May 2011 09:56:29 +0000 (11:56 +0200)]
Designer: BC corrections in QDesignerFormWindowInterface.

Make active resource file sets and related functions
available for IDE project integration.

Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
13 years agoDesigner: BC cleanup of QDesignerIntegrationInterface.
Friedemann Kleint [Fri, 13 May 2011 07:16:24 +0000 (09:16 +0200)]
Designer: BC cleanup of QDesignerIntegrationInterface.

Add features enumeration similar to that of
QDesignerFormWindowInterface. Add missing virtuals for IDE
integration.

Make a cleaned-up version of Qt Designer's implemenation
public as QDesignerIntegration such that IDE integrations
can use an integration class derived from it.

Add a bit of documentation, marked as \internal.

Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
13 years agotests: build autotests by default for qttools
Rohan McGovern [Wed, 11 May 2011 22:52:57 +0000 (08:52 +1000)]
tests: build autotests by default for qttools

Configure Qt with `-nomake tests' if you don't want the tests.

Reviewed-by: Jason McDonald
Change-Id: I505b7e0d2e3b182f735a7cc06bae538dbb287e9a

13 years agoDesigner: Link on Windows.
Friedemann Kleint [Wed, 11 May 2011 13:51:39 +0000 (15:51 +0200)]
Designer: Link on Windows.

13 years agoDesigner: Add functionality for IDE integration.
Friedemann Kleint [Wed, 11 May 2011 11:40:11 +0000 (13:40 +0200)]
Designer: Add functionality for IDE integration.

to QDesignerFormEditorInterface.

13 years agoCompile fix (Windows).
Friedemann Kleint [Wed, 11 May 2011 11:39:08 +0000 (13:39 +0200)]
Compile fix (Windows).

13 years agoAdd QT_xxx_VERSION macros for each library in qttools
Liang Qi [Wed, 11 May 2011 10:53:17 +0000 (12:53 +0200)]
Add QT_xxx_VERSION macros for each library in qttools

Provide version info for each library.

Task-number: QTMODULARIZATION-44
Reviewed-by: axis
13 years agoDesigner: Move PropertySheet::isEnabled to base class.
Friedemann Kleint [Wed, 11 May 2011 09:01:15 +0000 (11:01 +0200)]
Designer: Move PropertySheet::isEnabled to base class.

Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
13 years agoQt Designer: BC cleanup
Friedemann Kleint [Mon, 9 May 2011 10:36:48 +0000 (12:36 +0200)]
Qt Designer: BC cleanup

Introduce private classes instead of static hacks
for QDesignerFormWindowManagerInterface and
Integration. Make WidgetBox::Widget a shared data class.

13 years agoDesigner: Remove QDesignerIconCacheInterface and Brush manager.
Friedemann Kleint [Mon, 9 May 2011 08:08:47 +0000 (10:08 +0200)]
Designer: Remove QDesignerIconCacheInterface and Brush manager.

Removed QDesignerIconCacheInterface obsoleted by resource system
in Qt 4.4.
Remove unused Brush manager.

Rubber-stamped-by: Jarek Kobus <jkobus@trolltech.com>
13 years agoQt Designer: Remove Qt3 Widget plugins.
Friedemann Kleint [Fri, 6 May 2011 07:46:06 +0000 (09:46 +0200)]
Qt Designer: Remove Qt3 Widget plugins.

13 years agoQt Designer: Remove Q3Support.
Friedemann Kleint [Fri, 6 May 2011 07:39:42 +0000 (09:39 +0200)]
Qt Designer: Remove Q3Support.

13 years agoskip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditor
Tasuku Suzuki [Mon, 2 May 2011 09:03:07 +0000 (11:03 +0200)]
skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditor

TabOrderEditor should allow user to set tab order for widget that focusPolicy contains Qt::TabFocus.

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit c08151e01cdf466ac659c469c7ebceb46c10c2b2)

13 years agoBC cleanup in uitools.
Friedemann Kleint [Wed, 4 May 2011 14:23:01 +0000 (16:23 +0200)]
BC cleanup in uitools.

Remove virtual functions obsoleted by new resource handling
in Qt Designer 4.4. Remove static hash of private objects
for formbuilder.
Depends on a4b96f62237e0dcf6678969933e73c83c708f509 in qtbase.

Rubber-stamped-by: axis
13 years agoAdded .tag file with Git revision.
axis [Tue, 3 May 2011 14:21:07 +0000 (16:21 +0200)]
Added .tag file with Git revision.

13 years agoFix webkit detection
Olivier Goffart [Mon, 2 May 2011 13:34:38 +0000 (15:34 +0200)]
Fix webkit detection

13 years agoUse private headers
Marius Storm-Olsen [Thu, 21 Apr 2011 12:55:56 +0000 (07:55 -0500)]
Use private headers

13 years agoAdd module.prf, and install MODULE_PRI for each module
Marius Storm-Olsen [Fri, 1 Apr 2011 10:47:28 +0000 (05:47 -0500)]
Add module.prf, and install MODULE_PRI for each module

Output warning if not present

13 years agoAdded missing define when webkit is missing.
axis [Thu, 28 Apr 2011 08:05:10 +0000 (10:05 +0200)]
Added missing define when webkit is missing.

Reviewed by: Trust me

13 years agoAdded dependency information to the sync.profile.
axis [Wed, 27 Apr 2011 10:35:00 +0000 (12:35 +0200)]
Added dependency information to the sync.profile.

13 years agoAdd .gitignore to each module
axis [Wed, 27 Apr 2011 10:06:07 +0000 (12:06 +0200)]
Add .gitignore to each module

13 years agoAdd tst_headersclean for each module
Liang Qi [Fri, 25 Mar 2011 09:32:15 +0000 (10:32 +0100)]
Add tst_headersclean for each module

13 years agoModularized tst_compilerwarnings
Liang Qi [Wed, 23 Mar 2011 16:25:22 +0000 (17:25 +0100)]
Modularized tst_compilerwarnings

13 years agoModularized tst_bic and add some helper functions for global test
Liang Qi [Tue, 22 Mar 2011 15:13:21 +0000 (16:13 +0100)]
Modularized tst_bic and add some helper functions for global test

13 years agoIntroduced the QT.<module>.plugins variable to module profiles.
axis [Tue, 22 Mar 2011 12:20:53 +0000 (13:20 +0100)]
Introduced the QT.<module>.plugins variable to module profiles.

13 years agoFixed lupdate test.
axis [Fri, 18 Mar 2011 15:11:57 +0000 (16:11 +0100)]
Fixed lupdate test.

13 years agoFixed all qttools references to the bin directory.
axis [Fri, 18 Mar 2011 11:12:05 +0000 (12:12 +0100)]
Fixed all qttools references to the bin directory.

13 years agoAdded QT.<module>.imports support to module profiles.
axis [Thu, 17 Mar 2011 09:57:48 +0000 (10:57 +0100)]
Added QT.<module>.imports support to module profiles.

13 years agoGenerate lrelease without application bundle on Mac
Prasanth Ullattil [Thu, 27 Jan 2011 15:55:20 +0000 (16:55 +0100)]
Generate lrelease without application bundle on Mac

13 years agoUse the correct flags for linking to QtUitools
Prasanth Ullattil [Thu, 27 Jan 2011 13:32:23 +0000 (14:32 +0100)]
Use the correct flags for linking to QtUitools

13 years agoUse the correct headers.pri for designer
Prasanth Ullattil [Thu, 27 Jan 2011 13:31:44 +0000 (14:31 +0100)]
Use the correct headers.pri for designer

13 years agoMade ActiveQt Designer plugin refer to right source location.
axis [Thu, 27 Jan 2011 09:16:36 +0000 (10:16 +0100)]
Made ActiveQt Designer plugin refer to right source location.

13 years agoAdded missing header to lrelease.
axis [Tue, 25 Jan 2011 07:55:19 +0000 (08:55 +0100)]
Added missing header to lrelease.

13 years agoDe-bootstrapped lrelease.
axis [Mon, 24 Jan 2011 10:36:00 +0000 (11:36 +0100)]
De-bootstrapped lrelease.

It is difficult to keep it bootstrapped in a modularized repository,
and in the end bootstrapping every build tool does not scale. So from
now on, lrelease depends on regular Qt libraries.

Discussed-with: Oswald Buddenhagen

13 years agoRemoved activeqt references from Designer, which is in its own repo.
axis [Mon, 24 Jan 2011 10:35:32 +0000 (11:35 +0100)]
Removed activeqt references from Designer, which is in its own repo.

13 years agoAdded correct include paths for Designer plugins.
axis [Mon, 24 Jan 2011 10:34:27 +0000 (11:34 +0100)]
Added correct include paths for Designer plugins.

13 years agoqdoc3 is moved from qttools to qtdoc
Olivier Goffart [Wed, 19 Jan 2011 16:16:33 +0000 (17:16 +0100)]
qdoc3 is moved from qttools to qtdoc

13 years agoEnable webkit in assistant
Liang Qi [Wed, 12 Jan 2011 20:08:23 +0000 (21:08 +0100)]
Enable webkit in assistant

13 years agoMove uitools from QtTools to QtBase
Liang Qi [Wed, 12 Jan 2011 20:06:11 +0000 (21:06 +0100)]
Move uitools from QtTools to QtBase

13 years agoMake each module refer to its own bin/
Marius Storm-Olsen [Thu, 6 Jan 2011 18:52:17 +0000 (12:52 -0600)]
Make each module refer to its own bin/

Since modules cannot rely on QtCore having a build directory, nor
can they build the applications directly into $$[QT_INSTALL_BINS]
each module needs their own bin/. Add this path to each module's
pri file, so others can use their applications

13 years agoExtended module profiles.
axis [Mon, 3 Jan 2011 18:01:57 +0000 (19:01 +0100)]
Extended module profiles.

Each module now sets the QT_CONFIG variable itself.

13 years agoAdapt QtCLucene to modularization rules
Liang Qi [Wed, 5 Jan 2011 06:56:41 +0000 (07:56 +0100)]
Adapt QtCLucene to modularization rules

13 years agoAdd the private_includes path to the modules .pri file
Liang Qi [Thu, 23 Dec 2010 08:38:00 +0000 (09:38 +0100)]
Add the private_includes path to the modules .pri file

13 years agoMake tools compile.
Liang Qi [Tue, 11 Jan 2011 07:40:22 +0000 (08:40 +0100)]
Make tools compile.

13 years agoAdd the source path to the modules .pri file
Marius Storm-Olsen [Fri, 17 Dec 2010 05:34:20 +0000 (23:34 -0600)]
Add the source path to the modules .pri file

13 years agoAdd qt_help.pri and sync.profile for QtHelp
Marius Storm-Olsen [Tue, 30 Nov 2010 17:33:48 +0000 (11:33 -0600)]
Add qt_help.pri and sync.profile for QtHelp

Also make sure that QtHelp can see its own header files from the
syncqted module include path, and include qbase.pri from the
proper location.

13 years agoqmake profiles for qttools
Olivier Goffart [Fri, 12 Nov 2010 11:48:25 +0000 (12:48 +0100)]
qmake profiles for qttools

13 years agoMoved to using a feature profile instead of direct inclusion.
axis [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Moved to using a feature profile instead of direct inclusion.

13 years agoInitial import from the monolithic Qt.
Qt by Nokia [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Initial import from the monolithic Qt.

This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://qt.gitorious.org/qt/pages/GitIntroductionWithQt

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12