Oswald Buddenhagen [Wed, 1 Jun 2011 16:19:57 +0000 (18:19 +0200)]
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>
Oswald Buddenhagen [Wed, 1 Jun 2011 15:58:13 +0000 (17:58 +0200)]
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>
Oswald Buddenhagen [Wed, 1 Jun 2011 15:53:27 +0000 (17:53 +0200)]
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>
Oswald Buddenhagen [Wed, 1 Jun 2011 15:08:39 +0000 (17:08 +0200)]
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>
Constantin Makshin [Mon, 5 Sep 2011 17:43:00 +0000 (19:43 +0200)]
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>
Oswald Buddenhagen [Wed, 1 Jun 2011 10:34:59 +0000 (12:34 +0200)]
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>
Michał Zając [Fri, 13 May 2011 08:40:05 +0000 (10:40 +0200)]
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>
Takumi ASAKI [Mon, 6 Jun 2011 10:13:58 +0000 (12:13 +0200)]
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>
Frederik Gladhorn [Wed, 31 Aug 2011 11:07:09 +0000 (13:07 +0200)]
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>
Roberto Raggi [Tue, 30 Aug 2011 11:56:33 +0000 (13:56 +0200)]
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>
Jason McDonald [Tue, 23 Aug 2011 05:56:34 +0000 (15:56 +1000)]
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>
Jason McDonald [Tue, 23 Aug 2011 05:41:08 +0000 (15:41 +1000)]
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>
Friedemann Kleint [Fri, 12 Aug 2011 09:34:33 +0000 (11:34 +0200)]
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>
Friedemann Kleint [Fri, 12 Aug 2011 09:33:04 +0000 (11:33 +0200)]
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>
Eike Ziller [Fri, 29 Jul 2011 08:40:47 +0000 (10:40 +0200)]
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>
Friedemann Kleint [Fri, 29 Jul 2011 11:28:28 +0000 (13:28 +0200)]
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>
Eike Ziller [Wed, 27 Jul 2011 11:47:17 +0000 (13:47 +0200)]
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>
Eike Ziller [Wed, 27 Jul 2011 08:11:42 +0000 (10:11 +0200)]
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>
Eike Ziller [Wed, 27 Jul 2011 08:10:33 +0000 (10:10 +0200)]
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>
Eike Ziller [Wed, 27 Jul 2011 08:07:24 +0000 (10:07 +0200)]
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>
Casper van Donderen [Tue, 12 Jul 2011 07:35:30 +0000 (09:35 +0200)]
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
Casper van Donderen [Wed, 6 Jul 2011 09:05:55 +0000 (11:05 +0200)]
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
Marius Storm-Olsen [Tue, 19 Jul 2011 20:42:50 +0000 (15:42 -0500)]
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>
Marius Storm-Olsen [Tue, 19 Jul 2011 20:45:00 +0000 (15:45 -0500)]
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>
J-P Nurmi [Wed, 13 Jul 2011 09:04:15 +0000 (11:04 +0200)]
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>
Alan Alpert [Thu, 7 Jul 2011 08:04:07 +0000 (18:04 +1000)]
Update sync.profile dependencies to new syntax
%dependencies now has a simpler format of gitmodule => %gitref instead
of using qt modules and keywords.
Change-Id: I785f30e24e0a793218e2e307bdde56067760c510
Reviewed-on: http://codereview.qt.nokia.com/1285
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Alan Alpert [Thu, 7 Jul 2011 09:42:17 +0000 (19:42 +1000)]
Compile against qtbase again
Probably an overlooked detail in the recent demos exorcism
Change-Id: I878898233e895f8ae23cb16b7a5ac8581eebcd00
Reviewed-on: http://codereview.qt.nokia.com/1293
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Qt Continuous Integration System [Fri, 1 Jul 2011 10:06:42 +0000 (20:06 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Mark lupdate test as unstable.
Fixed various linker errors due to missing MODULE.
Designer: Fix more includes, remove usage of QT_SOURCE_TREE.
Fix compilation of Qt Designer.
Add a --bus command line argument
Fix compilation of qtconfig without X11
Friedemann Kleint [Fri, 1 Jul 2011 10:01:44 +0000 (12:01 +0200)]
Mark lupdate test as unstable.
tst_lupdate::good(heuristics) fails due to
due to changes in qtbase/mkspecs/features/qt_config.prf.
Rohan McGovern [Fri, 1 Jul 2011 03:26:21 +0000 (13:26 +1000)]
Fixed various linker errors due to missing MODULE.
If MODULE is not explicitly set when building a module, the build system
will guess the module name from the .pro file's basename. This guess is
incorrect for these projects, so set MODULE to the correct value.
Friedemann Kleint [Thu, 30 Jun 2011 15:00:47 +0000 (17:00 +0200)]
Designer: Fix more includes, remove usage of QT_SOURCE_TREE.
Friedemann Kleint [Thu, 30 Jun 2011 08:40:28 +0000 (10:40 +0200)]
Fix compilation of Qt Designer.
Adapt to new private header structure and removal of
QPainter::UniteClip.
Lars Knoll [Thu, 23 Jun 2011 11:05:08 +0000 (13:05 +0200)]
Add a --bus command line argument
Added a command line argument to specify the
bus to use.
Reviewed-by: Thiago
Olivier Goffart [Wed, 8 Jun 2011 08:25:24 +0000 (10:25 +0200)]
Fix compilation of qtconfig without X11
Patch-by: Christian Kamm
Qt Continuous Integration System [Fri, 3 Jun 2011 13:52:31 +0000 (23:52 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Doc: Fixed qdoc warnings.
David Boddie [Fri, 3 Jun 2011 13:50:32 +0000 (15:50 +0200)]
Doc: Fixed qdoc warnings.
Qt Continuous Integration System [Tue, 24 May 2011 13:08:51 +0000 (23:08 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Update licenseheader text in source files for qttools Qt module
Jyri Tahtela [Tue, 24 May 2011 13:04:47 +0000 (16:04 +0300)]
Update licenseheader text in source files for qttools Qt module
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
Qt Continuous Integration System [Mon, 23 May 2011 12:55:05 +0000 (22:55 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Squashed commit of changes from the 4.8-temp branch.
Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit
539311f7b2687e3148ea695ce06fee768abe7b44)
David Boddie [Wed, 11 May 2011 15:35:46 +0000 (17:35 +0200)]
Squashed commit of changes from the 4.8-temp branch.
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)
Qt Continuous Integration System [Fri, 20 May 2011 10:00:08 +0000 (20:00 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Designer: 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>
Qt Continuous Integration System [Fri, 20 May 2011 09:18:48 +0000 (19:18 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Compile warning.
Friedemann Kleint [Fri, 20 May 2011 09:13:45 +0000 (11:13 +0200)]
Compile warning.
Qt Continuous Integration System [Thu, 19 May 2011 10:03:12 +0000 (20:03 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Designer: 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
Qt Continuous Integration System [Tue, 17 May 2011 13:59:30 +0000 (23:59 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Designer: 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.
Qt Continuous Integration System [Tue, 17 May 2011 12:51:50 +0000 (22:51 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Designer: 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
Qt Continuous Integration System [Sat, 14 May 2011 07:16:40 +0000 (17:16 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Revert "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.
Qt Continuous Integration System [Fri, 13 May 2011 20:37:06 +0000 (06:37 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Added missing QtXml dependency
Updated Assistant doc version number to 5.0.0
Designer: BC cleanup of QDesignerFormWindowManager.
Update module version number to 5.0.0
Designer: BC corrections in QDesignerFormWindowInterface.
Eckhart Koppen [Fri, 13 May 2011 20:33:09 +0000 (23:33 +0300)]
Added missing QtXml dependency
Library needed at runtime
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
Eckhart Koppen [Fri, 13 May 2011 12:43:28 +0000 (15:43 +0300)]
Updated Assistant doc version number to 5.0.0
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>
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
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>
Qt Continuous Integration System [Fri, 13 May 2011 07:27:57 +0000 (17:27 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Designer: 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>
Qt Continuous Integration System [Thu, 12 May 2011 02:46:48 +0000 (12:46 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
tests: 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
Qt Continuous Integration System [Wed, 11 May 2011 13:54:27 +0000 (23:54 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Designer: Link on Windows.
Friedemann Kleint [Wed, 11 May 2011 13:51:39 +0000 (15:51 +0200)]
Designer: Link on Windows.
Qt Continuous Integration System [Wed, 11 May 2011 13:13:17 +0000 (23:13 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Designer: Add functionality for IDE integration.
Compile fix (Windows).
Add QT_xxx_VERSION macros for each library in qttools
Designer: Move PropertySheet::isEnabled to base class.
Friedemann Kleint [Wed, 11 May 2011 11:40:11 +0000 (13:40 +0200)]
Designer: Add functionality for IDE integration.
to QDesignerFormEditorInterface.
Friedemann Kleint [Wed, 11 May 2011 11:39:08 +0000 (13:39 +0200)]
Compile fix (Windows).
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
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>
Qt Continuous Integration System [Mon, 9 May 2011 10:48:46 +0000 (20:48 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Qt 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.
Qt Continuous Integration System [Mon, 9 May 2011 10:26:48 +0000 (20:26 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Designer: 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>
Qt Continuous Integration System [Fri, 6 May 2011 08:12:15 +0000 (18:12 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
Qt Designer: Remove Qt3 Widget plugins.
Qt Designer: Remove Q3Support.
Friedemann Kleint [Fri, 6 May 2011 07:46:06 +0000 (09:46 +0200)]
Qt Designer: Remove Qt3 Widget plugins.
Friedemann Kleint [Fri, 6 May 2011 07:39:42 +0000 (09:39 +0200)]
Qt Designer: Remove Q3Support.
Qt Continuous Integration System [Fri, 6 May 2011 07:33:00 +0000 (17:33 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttools-staging:
skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditor
BC cleanup in uitools.
Added .tag file with Git revision.
Fix webkit detection
Use private headers
Add module.prf, and install MODULE_PRI for each module
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)
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
axis [Tue, 3 May 2011 14:21:07 +0000 (16:21 +0200)]
Added .tag file with Git revision.
Olivier Goffart [Mon, 2 May 2011 13:34:38 +0000 (15:34 +0200)]
Fix webkit detection
Marius Storm-Olsen [Thu, 21 Apr 2011 12:55:56 +0000 (07:55 -0500)]
Use private headers
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
axis [Thu, 28 Apr 2011 08:05:10 +0000 (10:05 +0200)]
Added missing define when webkit is missing.
Reviewed by: Trust me
axis [Wed, 27 Apr 2011 10:35:00 +0000 (12:35 +0200)]
Added dependency information to the sync.profile.
axis [Wed, 27 Apr 2011 10:06:07 +0000 (12:06 +0200)]
Add .gitignore to each module
Liang Qi [Fri, 25 Mar 2011 09:32:15 +0000 (10:32 +0100)]
Add tst_headersclean for each module
Liang Qi [Wed, 23 Mar 2011 16:25:22 +0000 (17:25 +0100)]
Modularized tst_compilerwarnings
Liang Qi [Tue, 22 Mar 2011 15:13:21 +0000 (16:13 +0100)]
Modularized tst_bic and add some helper functions for global test
axis [Tue, 22 Mar 2011 12:20:53 +0000 (13:20 +0100)]
Introduced the QT.<module>.plugins variable to module profiles.
axis [Fri, 18 Mar 2011 15:11:57 +0000 (16:11 +0100)]
Fixed lupdate test.
axis [Fri, 18 Mar 2011 11:12:05 +0000 (12:12 +0100)]
Fixed all qttools references to the bin directory.
axis [Thu, 17 Mar 2011 09:57:48 +0000 (10:57 +0100)]
Added QT.<module>.imports support to module profiles.
Prasanth Ullattil [Thu, 27 Jan 2011 15:55:20 +0000 (16:55 +0100)]
Generate lrelease without application bundle on Mac
Prasanth Ullattil [Thu, 27 Jan 2011 13:32:23 +0000 (14:32 +0100)]
Use the correct flags for linking to QtUitools
Prasanth Ullattil [Thu, 27 Jan 2011 13:31:44 +0000 (14:31 +0100)]
Use the correct headers.pri for designer
axis [Thu, 27 Jan 2011 09:16:36 +0000 (10:16 +0100)]
Made ActiveQt Designer plugin refer to right source location.
axis [Tue, 25 Jan 2011 07:55:19 +0000 (08:55 +0100)]
Added missing header to lrelease.
projects / platform / upstream / qttools.git / log