summaryrefslogtreecommitdiff
path: root/tools/designer
Commit message (Collapse)AuthorAgeFilesLines
* Change copyrights from Nokia to Digia4.6Sergio Ahumada2012-11-27556-9976/+9976
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I8b2ed2e09e9beb46bdda354017c29f00be6ae76f Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update copyright year to 2011.Jason McDonald2011-01-11555-556/+556
| | | | Reviewed-by: Trust Me
* Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed..Friedemann Kleint2010-02-095-21/+25
| | | | | Reviewed-by: Trond Kjernåsen <trond@trolltech.com> Task-number: QTBUG-8046
* Added Czech translations.Pavel Fric2010-02-021-0/+1
| | | | | Merge-request: 440 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Designer/uic/related examples: Fix source code scanning issues II.Friedemann Kleint2010-02-018-12/+11
| | | | | Fix spelling errors, foreach()/QString usage, explicit constructors. Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-2842-65/+63
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Designer: Fix source code scanning issues.
| * Designer: Fix source code scanning issues.Friedemann Kleint2010-01-2842-65/+63
| | | | | | | | | | Fix spelling errors, foreach()/QString usage, explicit constructors. Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
* | don't build unneeded QtDesigner parts on Windows CEJoerg Bornemann2010-01-281-3/+1
|/ | | | | | | | | | We just build uitools like on Symbian. The following subdirs have been removed from tools/designer/src/src.pro tools/designer/src/lib tools/designer/src/components Reviewed-by: mauricek
* Designer: Add lower/raise to context menu.Friedemann Kleint2010-01-272-2/+5
| | | | Task-number: QTCREATORBUG-592
* Designer: Fixed a crash when previewing in a non-existent style.Friedemann Kleint2010-01-211-0/+2
| | | | | Task-number: QTBUG-7432 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-07555-558/+558
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QIODevice: Fix readAll() Temporary hackiesh solution to prevent BOM in the xml data. Fixed qxmlstream autotest when using shadow builds. Attempt at readding the capital P headers for Phonon Remove special Phonon processing from syncqt. Use the lowercase/shortname.h headers for Phonon includes Fixes a crash when setting focus on a widget with a focus proxy. Update copyright year to 2010 doc: Clarified activeSubControls and subControls. Remove warning "statement with no effect" doc: Clarified that .lnk files are System files on Windows.
| * Use the lowercase/shortname.h headers for Phonon includesThiago Macieira2010-01-061-2/+2
| | | | | | | | | | Task-number: QTBUG-4685 Reviewed-by: TrustMe
| * Update copyright year to 2010Jason McDonald2010-01-07555-556/+556
| | | | | | | | Reviewed-by: Trust Me
* | Designer: Selection handles disappear when using style sheet on form.Friedemann Kleint2010-01-041-2/+2
|/ | | | | | | | ... that has a white background color. The selection handles inherited the form's stylesheet. Fix by parenting them on the (internal) form container widget. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-6757
* Designer: Fix compilation with -static on Mac OS XFriedemann Kleint2009-12-172-3/+16
| | | | | | | | Avoid linking the solutions used by Designer twice (in the two Designer libraries). Just use the include paths in case of static linking. Reviewed-by: Carlos Duclos <carlos.duclos@nokia.com> Task-number: QTBUG-6863
* Designer: Show actions in action editor in QKeySequence::NativeTextFriedemann Kleint2009-12-141-1/+1
| | | | | format as in Property editor and elsewhere for consistence. Task-number: QTBUG-6760
* Designer: Handle "visible"-properties of item view headers correctly.Friedemann Kleint2009-12-102-105/+88
| | | | | | | | Implement the property sheet (isChanged/reset) correctly and do a hack for resetting the visibility. Task-number: QTBUG-6505 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
* Creator crashes when reloading externally modified .ui files on MacPrasanth Ullattil2009-12-011-0/+1
| | | | | | | | | | | | On Mac QWidget::destroy() sends an AcceptDropsChange event after clearing the guards for QPointer. This was used to store a QPointer to the widget being deleted & that will never be cleared. The fix removed the setAcceptDrops() from destroy. And as an extra protection make sure designer will not treat that event as interesting. Task-number: QTCREATORBUG-307 Reviewed-by: Denis Dzyubenko Reviewed-by: Friedemann Kleint
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1922-106/+114
|\
| * Ran the script utils/normalizeOlivier Goffart2009-11-1821-105/+105
| | | | | | | | Over src/ tools/ examples/ and demos/
| * QMenu: make the menu follow its parent/caused layout directionThierry Bastian2009-11-181-1/+9
| | | | | | | | | | | | | | The autotest are included Task-number: QTBUG-5884 Reviewed-by: ogoffart
* | French translation of designerBenjamin Poulain2009-11-181-0/+1
| | | | | | | | Reviewed-by: Pierre Rossi
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-101-1/+1
|\ \ | |/ | | | | | | Conflicts: tools/configure/configureapp.cpp
| * Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-101-9/+10
| |\ | | | | | | | | | | | | Conflicts: src/corelib/tools/qscopedpointer.h
| * | API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | QRegExp::numCaptures() is marked as obsolete. Replaced all usage in Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* | | uic/Designer: Use correct margin defaults for custom page-based containers.Friedemann Kleint2009-11-104-51/+62
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Designer-formbuilder/uic incorrectly considered custom containers that do not inherit a known page-based container (say QTabWidget) as instances of QLayoutWidget, giving them a default margin of 0. Add a check for the custom widget <container>-element to the checks for QLayoutWidget in uic/formbuilder. In the formbuilder, introduce a new data structure to store custom widget information instead of using 3 separate hashes. Adapt one autotest baseline (Qt 3). Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-5335
* | Designer: Use toolbar in Signal/Slot editorFriedemann Kleint2009-11-101-9/+10
|/ | | | | | as in the other tool windows. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTCREATORBUG-239
* Designer: Fix potential crash when moving pages of a QTabWidgetFriedemann Kleint2009-10-271-0/+3
| | | | | | | ... which has movable=true, conflicting with its internal drag and drop. Introduce 'movable' as fake property. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QT-1788
* The plugindialog was moved to tools/designer/src/lib/sharedJoão Abecasis2009-10-071-4/+1
| | | | Reviewed-by: Friedemann Kleint
* fix ts and qm targets for shadow builds and builds with -prefixOswald Buddenhagen2009-10-011-7/+9
|
* remove *_untranslated.tsOswald Buddenhagen2009-10-011-2/+1
| | | | | | | with the current scheme of running "make ts" only when doing a particular translation and checking in only the relevant file, these files are never updated. lconvert can generate an empty template from any translation anyway.
* Add Slovenian translationJure Repinc2009-09-291-0/+1
| | | | | Merge-request: 1320 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch 'origin/4.5' into 4.6Oswald Buddenhagen2009-09-251-1/+1
|\ | | | | | | | | Conflicts: translations/qt_ru.ts
| * Add Russian translation for Qt DesignerRitt Konstantin2009-09-251-1/+1
| | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Fix broken .ui file - class name was not specified correctly.Rhys Weatherley2009-09-181-1/+1
| | | | | | | | Reviewed-by: trustme
* | Make menu editor work on Mac OS X.Friedemann Kleint2009-09-252-2/+11
| | | | | | | | | | | | | | | | | | | | Fix a regression caused by the introduction of the QMenuBar::nativeMenuBar property (defaulting to true), which caused it the menu editor to disappear. Handle QMenuBar::nativeMenuBar it as a fake property, keeping it set to false for Form Editor. Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
* | Removed empty line before the license header in qdesigner_utils_p.h.Kim Motoyoshi Kalland2009-09-211-1/+0
| | | | | | | | Reviewed-by: Trustme
* | Fix broken .ui file - class name was not specified correctly.Rhys Weatherley2009-09-181-1/+1
| | | | | | | | Reviewed-by: trustme
* | Merge branch '4.5' into 4.6Tom Cooksey2009-09-171-38/+46
|\ \ | |/ | | | | | | | | | | Conflicts: tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qpainter/tst_qpainter.cpp tests/auto/qtwidgets/tst_qtwidgets.cpp
| * Designer: tab order in DeviceProfileDialog correctedJoerg Bornemann2009-09-171-38/+46
| | | | | | | | Reviewed-by: Friedemann Kleint
| * Update license headers again.Jason McDonald2009-09-08545-2180/+2180
| | | | | | | | Reviewed-by: Trust Me
* | Fix alpha setting in Designer's "Edit Palette" windowFriedemann Kleint2009-09-161-5/+2
| | | | | | | | | | | | | | | | | | Use QColorDialog::getColor() instead of deprecated QColorDialog::getRgba(), which causes alpha value to get lost in the process. Task-number: QT-4494 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-09554-2216/+2216
|\ \
| * | Update license headers again.Jason McDonald2009-09-09554-2216/+2216
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Took armcc_warnings.prf in use also for uitools build.Janne Anttila2009-09-091-2/+5
|/ / | | | | | | | | | | | | | | | | | | armcc_warnings.prf suppresses warnings for some common patterns used in Qt. Since armcc_warnings.prf is already used when compiling the libraries from src folder, it is should be ok to use it also for libraries under tools folder. Task-number: Reviewed-by: TrustMe
* | compile since broken merge from 4.5Gunnar Sletta2009-09-031-1/+1
| |
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-032-6/+1
|\ \
| * \ Merge branch '4.5' into 4.6Thiago Macieira2009-09-032-6/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/qtdbus.qdoc src/gui/accessible/qaccessible_mac_cocoa.mm src/gui/kernel/qapplication_win.cpp src/xmlpatterns/parser/createTokenLookup.sh tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui tests/auto/linguist/lupdate/testdata/good/parseui/project.ui tests/auto/runQtXmlPatternsTests.sh tests/auto/test.pl tests/auto/uic/baseline/batchtranslation.ui tests/auto/uic/baseline/batchtranslation.ui.h tests/auto/uic/baseline/config.ui tests/auto/uic/baseline/config.ui.h tests/auto/uic/baseline/finddialog.ui tests/auto/uic/baseline/finddialog.ui.h tests/auto/uic/baseline/formwindowsettings.ui tests/auto/uic/baseline/formwindowsettings.ui.h tests/auto/uic/baseline/helpdialog.ui tests/auto/uic/baseline/helpdialog.ui.h tests/auto/uic/baseline/listwidgeteditor.ui tests/auto/uic/baseline/listwidgeteditor.ui.h tests/auto/uic/baseline/mainwindowbase.ui tests/auto/uic/baseline/mainwindowbase.ui.h tests/auto/uic/baseline/newactiondialog.ui tests/auto/uic/baseline/newactiondialog.ui.h tests/auto/uic/baseline/newform.ui tests/auto/uic/baseline/newform.ui.h tests/auto/uic/baseline/orderdialog.ui tests/auto/uic/baseline/orderdialog.ui.h tests/auto/uic/baseline/paletteeditor.ui tests/auto/uic/baseline/paletteeditor.ui.h tests/auto/uic/baseline/paletteeditoradvancedbase.ui tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h tests/auto/uic/baseline/phrasebookbox.ui tests/auto/uic/baseline/phrasebookbox.ui.h tests/auto/uic/baseline/plugindialog.ui tests/auto/uic/baseline/plugindialog.ui.h tests/auto/uic/baseline/previewwidget.ui tests/auto/uic/baseline/previewwidget.ui.h tests/auto/uic/baseline/previewwidgetbase.ui tests/auto/uic/baseline/previewwidgetbase.ui.h tests/auto/uic/baseline/qfiledialog.ui tests/auto/uic/baseline/qfiledialog.ui.h tests/auto/uic/baseline/qtgradientdialog.ui tests/auto/uic/baseline/qtgradientdialog.ui.h tests/auto/uic/baseline/qtgradientviewdialog.ui tests/auto/uic/baseline/qtgradientviewdialog.ui.h tests/auto/uic/baseline/saveformastemplate.ui tests/auto/uic/baseline/saveformastemplate.ui.h tests/auto/uic/baseline/statistics.ui tests/auto/uic/baseline/statistics.ui.h tests/auto/uic/baseline/stringlisteditor.ui tests/auto/uic/baseline/stringlisteditor.ui.h tests/auto/uic/baseline/tabbedbrowser.ui tests/auto/uic/baseline/tabbedbrowser.ui.h tests/auto/uic/baseline/tablewidgeteditor.ui tests/auto/uic/baseline/tablewidgeteditor.ui.h tests/auto/uic/baseline/translatedialog.ui tests/auto/uic/baseline/translatedialog.ui.h tests/auto/uic/baseline/treewidgeteditor.ui tests/auto/uic/baseline/treewidgeteditor.ui.h tests/auto/uic/baseline/trpreviewtool.ui tests/auto/uic/baseline/trpreviewtool.ui.h tests/auto/uic3/baseline/about.ui tests/auto/uic3/baseline/about.ui.4 tests/auto/uic3/baseline/actioneditor.ui tests/auto/uic3/baseline/actioneditor.ui.4 tests/auto/uic3/baseline/config.ui tests/auto/uic3/baseline/config.ui.4 tests/auto/uic3/baseline/configtoolboxdialog.ui tests/auto/uic3/baseline/configtoolboxdialog.ui.4 tests/auto/uic3/baseline/connectiondialog.ui tests/auto/uic3/baseline/connectiondialog.ui.4 tests/auto/uic3/baseline/createtemplate.ui tests/auto/uic3/baseline/createtemplate.ui.4 tests/auto/uic3/baseline/customwidgeteditor.ui tests/auto/uic3/baseline/customwidgeteditor.ui.4 tests/auto/uic3/baseline/dbconnection.ui tests/auto/uic3/baseline/dbconnection.ui.4 tests/auto/uic3/baseline/dbconnectioneditor.ui tests/auto/uic3/baseline/dbconnectioneditor.ui.4 tests/auto/uic3/baseline/dbconnections.ui tests/auto/uic3/baseline/dbconnections.ui.4 tests/auto/uic3/baseline/editfunctions.ui tests/auto/uic3/baseline/editfunctions.ui.4 tests/auto/uic3/baseline/finddialog.ui tests/auto/uic3/baseline/finddialog.ui.4 tests/auto/uic3/baseline/formsettings.ui tests/auto/uic3/baseline/formsettings.ui.4 tests/auto/uic3/baseline/gotolinedialog.ui tests/auto/uic3/baseline/gotolinedialog.ui.4 tests/auto/uic3/baseline/helpdialog.ui tests/auto/uic3/baseline/helpdialog.ui.4 tests/auto/uic3/baseline/iconvieweditor.ui tests/auto/uic3/baseline/iconvieweditor.ui.4 tests/auto/uic3/baseline/listboxeditor.ui tests/auto/uic3/baseline/listboxeditor.ui.4 tests/auto/uic3/baseline/listeditor.ui tests/auto/uic3/baseline/listeditor.ui.4 tests/auto/uic3/baseline/listvieweditor.ui tests/auto/uic3/baseline/listvieweditor.ui.4 tests/auto/uic3/baseline/mainfilesettings.ui tests/auto/uic3/baseline/mainfilesettings.ui.4 tests/auto/uic3/baseline/mainwindowbase.ui tests/auto/uic3/baseline/mainwindowbase.ui.4 tests/auto/uic3/baseline/mainwindowwizard.ui tests/auto/uic3/baseline/mainwindowwizard.ui.4 tests/auto/uic3/baseline/multilineeditor.ui tests/auto/uic3/baseline/multilineeditor.ui.4 tests/auto/uic3/baseline/newform.ui tests/auto/uic3/baseline/newform.ui.4 tests/auto/uic3/baseline/paletteeditor.ui tests/auto/uic3/baseline/paletteeditor.ui.4 tests/auto/uic3/baseline/paletteeditoradvanced.ui tests/auto/uic3/baseline/paletteeditoradvanced.ui.4 tests/auto/uic3/baseline/paletteeditoradvancedbase.ui tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4 tests/auto/uic3/baseline/pixmapcollectioneditor.ui tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4 tests/auto/uic3/baseline/pixmapfunction.ui tests/auto/uic3/baseline/pixmapfunction.ui.4 tests/auto/uic3/baseline/preferences.ui tests/auto/uic3/baseline/preferences.ui.4 tests/auto/uic3/baseline/previewwidget.ui tests/auto/uic3/baseline/previewwidget.ui.4 tests/auto/uic3/baseline/previewwidgetbase.ui tests/auto/uic3/baseline/previewwidgetbase.ui.4 tests/auto/uic3/baseline/projectsettings.ui tests/auto/uic3/baseline/projectsettings.ui.4 tests/auto/uic3/baseline/replacedialog.ui tests/auto/uic3/baseline/replacedialog.ui.4 tests/auto/uic3/baseline/richtextfontdialog.ui tests/auto/uic3/baseline/richtextfontdialog.ui.4 tests/auto/uic3/baseline/settingsdialog.ui tests/auto/uic3/baseline/settingsdialog.ui.4 tests/auto/uic3/baseline/sqlformwizard.ui tests/auto/uic3/baseline/sqlformwizard.ui.4 tests/auto/uic3/baseline/startdialog.ui tests/auto/uic3/baseline/startdialog.ui.4 tests/auto/uic3/baseline/statistics.ui tests/auto/uic3/baseline/statistics.ui.4 tests/auto/uic3/baseline/tabbedbrowser.ui tests/auto/uic3/baseline/tabbedbrowser.ui.4 tests/auto/uic3/baseline/tableeditor.ui tests/auto/uic3/baseline/tableeditor.ui.4 tests/auto/uic3/baseline/topicchooser.ui tests/auto/uic3/baseline/topicchooser.ui.4 tests/auto/uic3/baseline/variabledialog.ui tests/auto/uic3/baseline/variabledialog.ui.4 tests/auto/uic3/baseline/wizardeditor.ui.4 tests/auto/uiloader/baseline/batchtranslation.ui tests/auto/uiloader/baseline/config.ui tests/auto/uiloader/baseline/finddialog.ui tests/auto/uiloader/baseline/formwindowsettings.ui tests/auto/uiloader/baseline/helpdialog.ui tests/auto/uiloader/baseline/listwidgeteditor.ui tests/auto/uiloader/baseline/mainwindowbase.ui tests/auto/uiloader/baseline/newactiondialog.ui tests/auto/uiloader/baseline/newform.ui tests/auto/uiloader/baseline/orderdialog.ui tests/auto/uiloader/baseline/paletteeditor.ui tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui tests/auto/uiloader/baseline/phrasebookbox.ui tests/auto/uiloader/baseline/plugindialog.ui tests/auto/uiloader/baseline/previewwidget.ui tests/auto/uiloader/baseline/previewwidgetbase.ui tests/auto/uiloader/baseline/qfiledialog.ui tests/auto/uiloader/baseline/qtgradientdialog.ui tests/auto/uiloader/baseline/qtgradienteditor.ui tests/auto/uiloader/baseline/qtgradientviewdialog.ui tests/auto/uiloader/baseline/saveformastemplate.ui tests/auto/uiloader/baseline/statistics.ui tests/auto/uiloader/baseline/stringlisteditor.ui tests/auto/uiloader/baseline/tabbedbrowser.ui tests/auto/uiloader/baseline/tablewidgeteditor.ui tests/auto/uiloader/baseline/translatedialog.ui tests/auto/uiloader/baseline/treewidgeteditor.ui tests/auto/uiloader/baseline/trpreviewtool.ui tools/assistant/compat/mainwindow.cpp tools/assistant/tools/assistant/mainwindow.cpp tools/designer/src/designer/versiondialog.cpp tools/linguist/linguist/mainwindow.cpp tools/linguist/shared/make-qscript.sh tools/qdbus/qdbusviewer/qdbusviewer.cpp
| | * Update license headers.Jason McDonald2009-09-022-6/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Added missing TARGET.UID3 definitions to various components.Miikka Heikkinen2009-09-031-0/+1
|/ / | | | | | | | | | | | | Every non-test binary built for Symbian needs explicitly assigned UID3, so added TARGET.UID3 for components that were missing it. Reviewed-by: Janne Anttila
View Lorry Controller Status