diff --git a/dist/changes-1.3.0 b/dist/changes-1.3.0 index c103d4eec9f560a8f468a3c657ba8da09c34fab0..25d8e12256c98cb5c2125010f70439fe4588d34f 100644 --- a/dist/changes-1.3.0 +++ b/dist/changes-1.3.0 @@ -11,6 +11,12 @@ This release introduces source and binary incompatible changes to the plugin API, so if you have created your own custom plugins, they will need to be adapted accordingly. +Debugging + * CDB: Added more types to the dumpers (QSharedPointer, QVector, common + * QMap/QSet types), dereference reference parameters + * CDB: Simplified display of STL types in the locals window + * Improved QObject dumping, print out QRect/QSize, enumerations and flags + General: * Added the option to automatically reload files when externally modified, or to ignore external modifications (contributed by Henrik Abelsson) @@ -24,4 +30,12 @@ Project support: * Added support for adding and removing files from a generic Makefile-based project (contributed by Kevin Michel) -... +Version control plugins + * Added CVS support + * Added "sync" menu item to the perforce plugin + +Wizards + * Fixed GUI project and form class wizards to use the same settings. + * Added version control checkout wizards + * Added a license header template setting + * Added a wizard for Qt Designer custom widgets diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp index 5c3c79e6ae3adf8ec4fa95be45ae649aa52106ee..0820cdc62b9eb223ea9a7d092309308580981564 100644 --- a/share/qtcreator/gdbmacros/gdbmacros.cpp +++ b/share/qtcreator/gdbmacros/gdbmacros.cpp @@ -2329,7 +2329,9 @@ static const char *qConnectionType(uint type) case Qt::QueuedConnection: output = "queued"; break; case Qt::BlockingQueuedConnection: output = "blockingqueued"; break; case 3: output = "autocompat"; break; +#if QT_VERSION >= 0x040600 case Qt::UniqueConnection: output = "unique"; break; +#endif }; return output; }; diff --git a/tests/auto/debugger/main.cpp b/tests/auto/debugger/main.cpp index 413d4d64c86757ac3513e4a4176b188feafdf177..4260e21ee0dfc01a6a0deff098657220037957d0 100644 --- a/tests/auto/debugger/main.cpp +++ b/tests/auto/debugger/main.cpp @@ -1075,7 +1075,9 @@ static const char *connectionType(uint type) case Qt::QueuedConnection: output = "queued"; break; case Qt::BlockingQueuedConnection: output = "blockingqueued"; break; case 3: output = "autocompat"; break; +#if QT_VERSION >= 0x040600 case Qt::UniqueConnection: output = "unique"; break; +#endif }; return output; };