summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update licenseheader text in source files for qttools Qt moduleJyri Tahtela2011-05-24901-15291/+15291
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Designer: Extend container extension.Friedemann Kleint2011-05-203-14/+23
| | | | | | | | | | | | | | | | 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>
* Compile warning.Friedemann Kleint2011-05-201-1/+1
|
* Designer: Refactor save/load.Friedemann Kleint2011-05-1920-278/+98
| | | | | | | | | | | | | | | | | | | | 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
* Designer: Add documentation for new interfaces.Friedemann Kleint2011-05-173-3/+127
| | | | \internal.
* Designer: Make some interfaces needed for IDE integration public.Friedemann Kleint2011-05-1727-71/+43
| | | | | | QDesignerNewFormWidgetInterface QDesignerSettingsInterface QDesignerOptionsPageInterface
* Revert "Added missing QtXml dependency"Eckhart Koppen2011-05-141-1/+1
| | | | | | | 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.
* Added missing QtXml dependencyEckhart Koppen2011-05-131-1/+1
| | | | Library needed at runtime
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qttools-stagingEckhart Koppen2011-05-1319-381/+518
|\
| * Designer: BC cleanup of QDesignerFormWindowManager.Friedemann Kleint2011-05-138-339/+397
| | | | | | | | | | | | | | | | | | | | 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>
| * Designer: BC corrections in QDesignerFormWindowInterface.Friedemann Kleint2011-05-1311-42/+121
| | | | | | | | | | | | | | Make active resource file sets and related functions available for IDE project integration. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* | Updated Assistant doc version number to 5.0.0Eckhart Koppen2011-05-131-1/+1
|/
* Designer: BC cleanup of QDesignerIntegrationInterface.Friedemann Kleint2011-05-1320-742/+856
| | | | | | | | | | | | | | 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>
* Designer: Link on Windows.Friedemann Kleint2011-05-111-1/+1
|
* Designer: Add functionality for IDE integration.Friedemann Kleint2011-05-112-0/+32
| | | | to QDesignerFormEditorInterface.
* Compile fix (Windows).Friedemann Kleint2011-05-111-1/+1
|
* Add QT_xxx_VERSION macros for each library in qttoolsLiang Qi2011-05-113-0/+9
| | | | | | | Provide version info for each library. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
* Designer: Move PropertySheet::isEnabled to base class.Friedemann Kleint2011-05-113-3/+22
| | | | Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* Qt Designer: BC cleanupFriedemann Kleint2011-05-096-73/+142
| | | | | | Introduce private classes instead of static hacks for QDesignerFormWindowManagerInterface and Integration. Make WidgetBox::Widget a shared data class.
* Designer: Remove QDesignerIconCacheInterface and Brush manager.Friedemann Kleint2011-05-0920-1172/+3
| | | | | | | | Removed QDesignerIconCacheInterface obsoleted by resource system in Qt 4.4. Remove unused Brush manager. Rubber-stamped-by: Jarek Kobus <jkobus@trolltech.com>
* Qt Designer: Remove Qt3 Widget plugins.Friedemann Kleint2011-05-0643-5546/+0
|
* Qt Designer: Remove Q3Support.Friedemann Kleint2011-05-069-66/+6
|
* skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditorTasuku Suzuki2011-05-051-1/+1
| | | | | | | 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)
* BC cleanup in uitools.Friedemann Kleint2011-05-044-61/+8
| | | | | | | | | 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
* Fix webkit detectionOlivier Goffart2011-05-021-1/+1
|
* Use private headersMarius Storm-Olsen2011-05-0217-16/+23
|
* Add module.prf, and install MODULE_PRI for each moduleMarius Storm-Olsen2011-05-022-0/+8
| | | | Output warning if not present
* Added missing define when webkit is missing.axis2011-04-281-1/+5
| | | | Reviewed by: Trust me
* Introduced the QT.<module>.plugins variable to module profiles.axis2011-04-272-2/+2
|
* Fixed all qttools references to the bin directory.axis2011-04-2725-25/+25
|
* Generate lrelease without application bundle on MacPrasanth Ullattil2011-04-271-2/+5
|
* Use the correct flags for linking to QtUitoolsPrasanth Ullattil2011-04-271-1/+1
|
* Use the correct headers.pri for designerPrasanth Ullattil2011-04-271-1/+4
|
* Made ActiveQt Designer plugin refer to right source location.axis2011-04-271-5/+6
|
* Added missing header to lrelease.axis2011-04-271-0/+1
|
* De-bootstrapped lrelease.axis2011-04-271-6/+0
| | | | | | | | 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
* Removed activeqt references from Designer, which is in its own repo.axis2011-04-272-2/+0
|
* Added correct include paths for Designer plugins.axis2011-04-271-0/+2
|
* qdoc3 is moved from qttools to qtdocOlivier Goffart2011-04-271-2/+0
|
* Enable webkit in assistantLiang Qi2011-04-271-1/+0
|
* Move uitools from QtTools to QtBaseLiang Qi2011-04-276-10/+9
|
* Adapt QtCLucene to modularization rulesLiang Qi2011-04-271-1/+2
|
* Make tools compile.Liang Qi2011-04-2714-24/+40
|
* Add qt_help.pri and sync.profile for QtHelpMarius Storm-Olsen2011-04-271-1/+4
| | | | | | 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.
* qmake profiles for qttoolsOlivier Goffart2011-04-272-3/+1
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271589-0/+295794
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