Commit 68c920d1 authored by dt's avatar dt
Browse files

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

parents 4e8763ec 07a9efbc
......@@ -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
......@@ -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;
};
......
......@@ -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;
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment