summaryrefslogtreecommitdiffstats
path: root/tools/designer
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-049-12/+12
|\ | | | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * 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>
* | Add Designer hungarian translationLaszlo Papp2010-02-031-0/+1
| | | | | | | | | | | | Signed-off-by: Laszlo Papp <djszapi@archlinux.us> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-0145-70/+69
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * 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
* | Merge branch '4.6'Thiago Macieira2010-01-211-0/+2
|\ \ | |/ | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * 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'Thiago Macieira2010-01-13555-558/+558
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * 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-06555-556/+556
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.6'Thiago Macieira2010-01-081-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * | 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
* | Merge branch '4.6'Thiago Macieira2009-12-265-109/+105
|\ \ | |/ | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * 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>
* | Merge branch '4.6'Thiago Macieira2009-12-021-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * 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 branch '4.6'Thiago Macieira2009-11-2527-157/+177
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * 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
| * | 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: Filter on classname in Widget Box.Friedemann Kleint2009-11-161-5/+21
| |/ |/| | | | | | | | | Introduce special filter string containing name plus class name if it is different and not a layout. Task-number: QTBUG-5492
* | Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-101-9/+10
|\ \ | |/ | | | | | | Conflicts: src/corelib/tools/qscopedpointer.h
| * 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
* | 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
* 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-171-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
|\ \
generated by cgit v0.12 at 2024-12-04 00:16:19 (GMT)