summaryrefslogtreecommitdiffstats
path: root/tools/designer
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-103-3/+3
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtKeith Isdale2009-08-109-62/+114
| |\
| * | In a .pro file the include() function does not warn if specified fileKeith Isdale2009-08-103-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can not be found change that behavior to warn by default. Currently the default behavior of include() in a .pro file is not to warn if the supplied file argument can not be found which can lead to hard to find build errors. The include() will now,by default, warn if the specified file can not be found. If a warning is not required because the included file is optional then example use in the .pro file: include(SomePriFile.pri", "", true) Task-number:259398 Reviewed-by:Marius Storm-Olsen
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-109-62/+114
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/widgets/qdatetimeedit.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlineedit.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qmultiscreen/qmultiscreen.pro tests/auto/qresourceengine/qresourceengine.pro tests/auto/qresourceengine/tst_qresourceengine.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
| * | Designer: Cannot edit menus in an RTL form when Designer uses LTR.Friedemann Kleint2009-08-069-62/+114
| |/ | | | | | | | | | | | | | | | | | | | | Use widget->layoutDirection() instead of QApplication::layoutDirection() where applicable, which caused it to break for the case that Designer's layoutDirection does not match that of a widget [property]. In addition, position the submenu correctly on the left side in the case of RTL. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: 259238
* | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-067-10/+10
| | | | | | | | | | | | Rationale: We're using template magic now to get the private pointer in qglobal.h, so no need to have two macros. Also keeps backward compatibility with outside (KDE) code.
* | Merge commit 'origin/master'Jason Barron2009-08-048-10/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-037-10/+10
| | | | | | | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
| * | Enabled QtUiTools and related example building for Symbian OS.Janne Anttila2009-07-271-0/+1
| | |
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-281-4/+24
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/io.pri src/corelib/io/qfilesystemwatcher.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/configure/configureapp.cpp
| * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-07-241-4/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h src/3rdparty/webkit/WebCore/page/DragController.cpp src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp src/3rdparty/webkit/WebKit/qt/ChangeLog src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp src/gui/painting/qpaintengineex_p.h tools/linguist/lupdate/main.cpp
| | * | Enabled setting of DESIGNABLE=false-properties using FormWindowCursor APIFriedemann Kleint2009-07-231-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression breakage introduced by the PropertySheet::isEnabled handling in 4.5. Task-number: 253278 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-2717-45/+84
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
| * | Merge commit 'origin/4.5'Olivier Goffart2009-07-221-2/+5
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qt_cocoa_helpers_mac_p.h
| | * Designer: Fixed bug in setting QUrl property values from resources.Friedemann Kleint2009-07-221-2/+5
| | | | | | | | | | | | | | | | | | | | | Setting a file from a resource would result in 'qrc::/file' as the resource browser returns ':/file'. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Initial-patch-by: andy <qt-info@nokia.com>
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-201-2/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp src/3rdparty/webkit/WebCore/page/DOMWindow.idl src/corelib/io/qdiriterator.cpp src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h tests/auto/qxmlquery/tst_qxmlquery.cpp tools/linguist/lconvert/main.cpp
| | * Designer fails to compile if Qt is compiled without size grip supportAntonio Aloisio2009-07-151-2/+4
| | | | | | | | | | | | Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * | Update to also use a uifile.icns file for Designer.Norwegian Rock Cat2009-07-173-1/+4
| | | | | | | | | | | | | | | If we are doing it for Creator, we may as well be nice and do a similar thing for Designer.
| * | Added a version information to our executables.Denis Dzyubenko2009-07-151-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | On Windows, the FileDescription part of the version information is used as a caption for the grouped taskbar button. Task-number: 253065 Reviewed-by: Prasanth Ullattil
| * | Merge commit 'origin/4.5'Bill King2009-07-131-4/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/kbddrivers/usb/main.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qwidget/tst_qwidget.cpp
| | * Designer: Restore Widget box title when switching to docked modeJoão Abecasis2009-07-091-0/+6
| | | | | | | | | | | | Reviewed-by: Friedemann Kleint
| | * Stop showing then hiding windows on starting designer in top-level modeJoão Abecasis2009-07-091-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kind of like f37bd111f7622a34b3a7bd63f5a82f6042dc0f0d, but the real thing. The widget box wasn't showing on Linux when switching to top-level mode. Incidentally, this was the main window there... Reviewed-by: Friedemann Kleint After some persuasion the Cat also came to see things this way.
| * | Merge commit 'origin/4.5'Bill King2009-07-081-3/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/ibase/qsql_ibase.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qsqldatabase/tst_databases.h tests/auto/qsqldatabase/tst_qsqldatabase.cpp translations/qt_ru.ts
| | * Stop showing then hiding windows on starting designer in top-level mode.Norwegian Rock Cat2009-07-071-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | We've had this since 4.5 and it's very annoying to see the window show and quickly hide itself. I was hoping it wasn't a bug in Qt, and it turns it isn't and it was happening on all platforms. Reviewed-by: Friedemann Kleint Shout outs: João for testing.
| * | general wording change for some file type namesFrederik Schwarzer2009-07-069-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - .ts file -> TS file - .qm file -> QM file - .ui file -> UI file + a handfull of typos I stumbled over Merge-request: 802 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | tools: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | Also QString::fromUtf16() -> QString::fromWCharArray() Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| * | fix column-spanning in Designer ConnectDialog's layoutRitt Konstantin2009-06-301-4/+4
| | | | | | | | | | | | | | | | | | | | | if showAllCheckBox's text is longer than 1/2 of dialog's width then dialog became asymmetric. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-30545-1104/+1121
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * | Fixed license header broken by 137bb787.Friedemann Kleint2009-06-291-2/+0
| | |
| * | Merge branch '4.5'Thiago Macieira2009-06-241-2/+2
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/qsqldatabase/tst_databases.h
| | * fix crash when using plugin that supplies a QDesignerMemberSheetExtensionJoel Nordell2009-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | plugins external to Qt Designer can not define objects inheriting from QDesignerMemberSheet, as that is defined in a private header. the functions isQt3Signal and isQt3Slot assume that all QDesignerMemberSheetExtension objects at QDesignerMemberSheet, but this is not the case with 3rd party plugins. Merge-request: 452 Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-By: Thorbjørn Lindeijer
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-232-1/+5
| |\ \ | | |/ | | | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| | * Fix compilation after the last change.Thiago Macieira2009-06-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The #include <phonon> header no longer exists. And the <Phonon> or <Phonon/Phonon> headers have never existed (neither for us nor for the Phonon sources). You have to select each and every header that you do want now. Reviewed-By: Marius Storm-Olsen
| | * Fix crash in widget box when using load mode "LoadCustomWidgetsOnly"Eskil Abrahamsen Blomfeldt2009-06-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When loading the widget box with load mode "LoadCustomWidgetsOnly", it will create an empty category. This will indirectly cause a resize event to be posted for the tree widget of the widget box, which in turn will cause adjustSubListSize() to be called for each category item in the tree widget. Since the category has not yet been populated, the assumption in adjustSubListSize() that cat_item->child(0) is non-null would cause a crash. The fix is to return immediately if the category is empty. Reviewed-by: Friedemann Kleint
| * | Fixed an oversight in Qt Designer that prevents one from designing empty tab ↵J-P Nurmi2009-06-171-5/+7
| | | | | | | | | | | | | | | | | | widgets. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * | Fixed an oversight in Qt Designer that prevents one from designing empty ↵J-P Nurmi2009-06-171-4/+7
| | | | | | | | | | | | | | | | | | stacked widgets. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-06-161-0/+10
| |\ \
| | * | Store promoted Widgets correctly in the ScratchPad.Friedemann Kleint2009-06-161-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add code to make promoted widget entries to widget DB to widget box form builder. Task-number: 233683
| * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-16545-1090/+1090
| |\ \ \ | | |/ / | |/| / | | |/
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-16545-1090/+1090
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-2579-512/+1123
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * | Fixed docs for task 254824.Friedemann Kleint2009-05-291-2/+1
| | | | | | | | | | | | Task-number: 254824
| * | Enable overriding of the factory functions of QUiLoader.Friedemann Kleint2009-05-294-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move initialization of QAction/QActionGroups elsewhere. Detect the root widget by checking its parent against the parent widget passed in and apply only the size part of the geometry property to it. Task-number: 254824 Initial-patch-by: joao <joao@abecasis.name>
| * | Call QFormBuilderExtra::instance lessJoão Abecasis2009-05-291-4/+6
| | | | | | | | | | | | Reviewed-by: Friedemann Kleint
| * | Merge branch '4.5'Tom Cooksey2009-05-281-12/+22
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/embedded/qkbdtty_qws.cpp
| * | Fixed crash when encountering invalid forms.Friedemann Kleint2009-05-261-1/+4
| | | | | | | | | | | | | | | | | | | | | Crash when replacing the QDockWidget contents widget by a widget using a container extension. Task-number: 254553
| * | Fixed compilation Solaris.Friedemann Kleint2009-05-251-10/+6
| | |
| * | Enabled the use of promoted widgets in new form templates.Friedemann Kleint2009-05-226-124/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The form builder used for preview of the templates did not implement custom widget handling (FormBuilder::createCustomWidgets()). On encountering a promoted widget, the widget factory would then create a Widget Database entry specifying QWidget inheritance (emergency fallback) which could not be overidden later on. To fix this, moved the code for handling custom widgets from QDesignerResource to QSimpleResource and create a new formbuilder class that handles it especially for the New Form Dialog preview. Task-number: 254282
| * | Remove unused variables from various About dialogs.Jason McDonald2009-05-201-5/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge commit 'origin/4.5'Olivier Goffart2009-05-183-3/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
generated by cgit v0.12 at 2025-03-06 07:09:53 (GMT)