summaryrefslogtreecommitdiffstats
path: root/tools/designer
Commit message (Expand)AuthorAgeFilesLines
* Don't change the current page of mainwindow containerJarek Kobus2012-07-061-1/+1
* Fix compilation when QT_NO_CURSOR is definedRomain Pokrzywka2012-04-102-0/+10
* Revert "Disable activeqt on win32-g++ (it doesn't build)."Jonathan Liu2012-01-171-1/+1
* Update year in Nokia copyright messages.Jason McDonald2012-01-11557-558/+558
* Qt Designer: Fix static linking on Mac.Friedemann Kleint2011-11-082-3/+18
* Don't store the alignment attribute for spacersJarek Kobus2011-09-231-2/+18
* Designer: Fix static linking.Jarek Kobus2011-08-311-9/+2
* Disable activeqt on win32-g++ (it doesn't build).Ray Donnelly2011-08-221-1/+1
* Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-161-0/+11
|\
| * X11: Keep the menubar inside the widgetbox window in toplevel modeMichał Zając2011-05-131-0/+11
* | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13556-9409/+9409
|/
* skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditorTasuku Suzuki2011-05-021-1/+1
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-04-092-1/+4
|\
| * Designer: Allow promoted QWidget's to be buddies.Friedemann Kleint2011-04-081-1/+3
| * Designer: Specify 'notr' attribute for buttongroup name.Friedemann Kleint2011-04-081-0/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-04-041-1/+1
|\ \ | |/
| * Designer [Qt Creator integration]: Fix integrated property editor.Friedemann Kleint2011-04-041-1/+1
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-315-17/+17
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-222-3/+5
| |\ \
| * \ \ Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-232-14/+21
| |\ \ \
| * | | | Doc: Ensured that code snippets have appropriate file names.David Boddie2011-02-085-17/+17
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-282-49/+51
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Designer: Fix tab order in action editor dialog.Friedemann Kleint2011-03-281-48/+48
| * | | | Make QtUiTools use the lib-infix passed to configure.Friedemann Kleint2011-03-251-1/+3
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-241-1/+1
|\ \ \ \ \
| * | | | | desinger: Add keyboard accellerator to 'Edit' menuhjk2011-03-221-1/+1
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-229-54/+163
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Designer: Avoid nested QDialog's in item widget content dialogs.Friedemann Kleint2011-03-229-54/+163
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-213-5/+17
|\ \ \ \ \ | |/ / / /
| * | | | Designer: Remember default of main container's object name.Friedemann Kleint2011-03-212-3/+15
| * | | | Designer: Do not translate page object names of QMdiArea.Friedemann Kleint2011-03-211-2/+2
* | | | | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-162-3/+5
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-152-3/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Designer: Fix a bug affecting tab reordering of promoted tab widgets.Friedemann Kleint2011-03-151-2/+4
| | * | Designer: Fix a bug clearing the Z-Order when adding a new widget.Friedemann Kleint2011-03-151-1/+1
| | |/
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-091-1/+1
|\ \ \
| * | | Fix warning about uninitialised variable useThiago Macieira2011-03-081-1/+1
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-083-1/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Designer: Set dirty correctly in case resource paths were changed.Friedemann Kleint2011-03-073-1/+5
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-281-0/+4
|\ \ \ \
| * | | | Store property editor's column positions in settingsJarek Kobus2011-02-231-0/+4
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-02-221-6/+14
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Designer: Check for 0-spacing when loading grid settings.Friedemann Kleint2011-02-211-6/+14
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-172-3/+12
|\ \ \ \ | | |/ / | |/| |
| * | | Designer: Slots of main container not visible in signal/slot editor.Friedemann Kleint2011-02-112-3/+12
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-102-13/+11
|\ \ \ \ | |/ / /
| * | | Designer: Fix a crash in the Signal-Slot-Editor.Friedemann Kleint2011-02-042-13/+11
| | |/ | |/|
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-022-10/+15
|\ \ \ | |/ / | | / | |/ |/|
| * Fix a crash when undoing form layoutJarek Kobus2011-02-012-10/+15
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17557-558/+558
|\ \ | |/