Commit 9141727b authored by Kai Koehne's avatar Kai Koehne
Browse files

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

parents 457e9b92 24bf4c37
......@@ -29,12 +29,18 @@
#include <qglobal.h>
#include <QtCore/QHash>
#include <QtCore/QList>
#include <QtCore/QString>
#include <QtCore/QStringList>
#ifndef QT_BOOTSTRAPPED
#include <QtCore/QDateTime>
#include <QtCore/QDebug>
#include <QtCore/QDir>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QHash>
#include <QtCore/QLinkedList>
#include <QtCore/QLocale>
#include <QtCore/QMap>
......@@ -42,9 +48,7 @@
#include <QtCore/QMetaProperty>
#include <QtCore/QMetaEnum>
#include <QtCore/QModelIndex>
#include <QtCore/QObject>
#include <QtCore/QPointer>
#include <QtCore/QString>
#include <QtCore/QTextCodec>
#include <QtCore/QVector>
#include <QtCore/QTextStream>
......@@ -62,10 +66,6 @@
#include <QtCore/QWeakPointer>
#endif
#include "gdbmacros_p.h"
int qtGhVersion = QT_VERSION;
#ifndef USE_QT_GUI
# ifdef QT_GUI_LIB
# define USE_QT_GUI 1
......@@ -83,6 +83,8 @@ int qtGhVersion = QT_VERSION;
# include <QtGui/QSizePolicy>
#endif
#endif // QT_BOOTSTRAPPED
#ifdef Q_OS_WIN
# include <windows.h>
#endif
......@@ -93,6 +95,21 @@ int qtGhVersion = QT_VERSION;
#include <set>
#include <vector>
#ifdef QT_BOOTSTRAPPED
# define NS ""
# define NSX ""
# define NSY ""
#else
# include "gdbmacros_p.h"
#endif // QT_BOOTSTRAPPED
int qtGhVersion = QT_VERSION;
/*!
\class QDumper
\brief Helper class for producing "nice" output in Qt Creator's debugger.
......@@ -849,7 +866,7 @@ static void qDumpInnerCharValue(QDumper &d, char c, const char *field)
{
char buf[30];
sprintf(buf, "'?', ascii=%d", c);
if (QChar(c).isPrint() && c < 127)
if (QChar(QLatin1Char(c)).isPrint() && c < 127)
buf[1] = c;
d.putCommaIfNeeded();
d.putItem(field, buf);
......@@ -915,6 +932,7 @@ void qDumpInnerValueHelper(QDumper &d, const char *type, const void *addr,
}
break;
case 'O':
#ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QObject *")) {
if (addr) {
const QObject *ob = reinterpret_cast<const QObject *>(addr);
......@@ -930,6 +948,7 @@ void qDumpInnerValueHelper(QDumper &d, const char *type, const void *addr,
d.putItem("numchild", 0);
}
}
#endif
break;
case 'S':
if (isEqual(type, "QString")) {
......@@ -988,6 +1007,7 @@ static void qDumpInnerValueOrPointer(QDumper &d,
//////////////////////////////////////////////////////////////////////////////
#ifndef QT_BOOTSTRAPPED
struct ModelIndex { int r; int c; void *p; void *m; };
static void qDumpQAbstractItem(QDumper &d)
......@@ -1097,6 +1117,7 @@ static void qDumpQAbstractItemModel(QDumper &d)
}
d.disarm();
}
#endif // QT_BOOTSTRAPPED
static void qDumpQByteArray(QDumper &d)
{
......@@ -1140,6 +1161,7 @@ static void qDumpQChar(QDumper &d)
d.disarm();
}
#ifndef QT_BOOTSTRAPPED
static void qDumpQDateTime(QDumper &d)
{
#ifdef QT_NO_DATESTRING
......@@ -1307,6 +1329,7 @@ static void qDumpQFileInfo(QDumper &d)
}
d.disarm();
}
#endif // QT_BOOTSTRAPPED
bool isOptimizedIntKey(const char *keyType)
{
......@@ -1469,6 +1492,8 @@ static void qDumpQHashNode(QDumper &d)
d.disarm();
}
#ifndef QT_BOOTSTRAPPED
#if USE_QT_GUI
static void qDumpQImage(QDumper &d)
{
......@@ -2619,6 +2644,7 @@ static void qDumpQSharedPointer(QDumper &d)
d.disarm();
}
#endif // QT_VERSION >= 0x040500
#endif // QT_BOOTSTRAPPED
static void qDumpQString(QDumper &d)
{
......@@ -2675,6 +2701,7 @@ static void qDumpQStringList(QDumper &d)
d.disarm();
}
#ifndef QT_BOOTSTRAPPED
static void qDumpQTextCodec(QDumper &d)
{
const QTextCodec &codec = *reinterpret_cast<const QTextCodec *>(d.data);
......@@ -2775,6 +2802,8 @@ static void qDumpQWeakPointer(QDumper &d)
}
#endif // QT_VERSION >= 0x040500
#endif // QT_BOOTSTRAPPED
static void qDumpStdList(QDumper &d)
{
const std::list<int> &list = *reinterpret_cast<const std::list<int> *>(d.data);
......@@ -3136,10 +3165,12 @@ static void handleProtocolVersion2and3(QDumper & d)
qDumpStdMap(d);
break;
case 'A':
#ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QAbstractItemModel"))
qDumpQAbstractItemModel(d);
else if (isEqual(type, "QAbstractItem"))
qDumpQAbstractItem(d);
#endif
break;
case 'B':
if (isEqual(type, "QByteArray"))
......@@ -3150,10 +3181,12 @@ static void handleProtocolVersion2and3(QDumper & d)
qDumpQChar(d);
break;
case 'D':
#ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QDateTime"))
qDumpQDateTime(d);
else if (isEqual(type, "QDir"))
qDumpQDir(d);
#endif
break;
case 'e':
if (isEqual(type, "vector"))
......@@ -3162,10 +3195,12 @@ static void handleProtocolVersion2and3(QDumper & d)
qDumpStdSet(d);
break;
case 'F':
#ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QFile"))
qDumpQFile(d);
else if (isEqual(type, "QFileInfo"))
qDumpQFileInfo(d);
#endif
break;
case 'H':
if (isEqual(type, "QHash"))
......@@ -3186,14 +3221,17 @@ static void handleProtocolVersion2and3(QDumper & d)
#endif
break;
case 'L':
#ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QList"))
qDumpQList(d);
else if (isEqual(type, "QLinkedList"))
qDumpQLinkedList(d);
else if (isEqual(type, "QLocale"))
qDumpQLocale(d);
#endif
break;
case 'M':
#ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QMap"))
qDumpQMap(d);
else if (isEqual(type, "QMapNode"))
......@@ -3202,8 +3240,10 @@ static void handleProtocolVersion2and3(QDumper & d)
qDumpQModelIndex(d);
else if (isEqual(type, "QMultiMap"))
qDumpQMultiMap(d);
#endif
break;
case 'O':
#ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QObject"))
qDumpQObject(d);
else if (isEqual(type, "QObjectPropertyList"))
......@@ -3222,6 +3262,7 @@ static void handleProtocolVersion2and3(QDumper & d)
qDumpQObjectSlotList(d);
else if (isEqual(type, "QObjectChildList"))
qDumpQObjectChildList(d);
#endif
break;
case 'P':
#if USE_QT_GUI
......@@ -3230,16 +3271,18 @@ static void handleProtocolVersion2and3(QDumper & d)
#endif
break;
case 'S':
if (isEqual(type, "QSet"))
if (isEqual(type, "QString"))
qDumpQString(d);
else if (isEqual(type, "QStringList"))
qDumpQStringList(d);
#ifndef QT_BOOTSTRAPPED
else if (isEqual(type, "QSet"))
qDumpQSet(d);
#if QT_VERSION >= 0x040500
else if (isEqual(type, "QSharedPointer"))
qDumpQSharedPointer(d);
#endif
else if (isEqual(type, "QString"))
qDumpQString(d);
else if (isEqual(type, "QStringList"))
qDumpQStringList(d);
#endif // QT_BOOTSTRAPPED
break;
case 's':
if (isEqual(type, "wstring"))
......@@ -3262,20 +3305,26 @@ static void handleProtocolVersion2and3(QDumper & d)
qDumpStdWString(d);
break;
case 'T':
#ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QTextCodec"))
qDumpQTextCodec(d);
#endif
break;
case 'V':
#ifndef QT_BOOTSTRAPPED
if (isEqual(type, "QVariant"))
qDumpQVariant(d);
else if (isEqual(type, "QVector"))
qDumpQVector(d);
#endif
break;
case 'W':
#ifndef QT_BOOTSTRAPPED
#if QT_VERSION >= 0x040500
if (isEqual(type, "QWeakPointer"))
qDumpQWeakPointer(d);
#endif
#endif
break;
}
......@@ -3442,7 +3491,9 @@ void *qDumpObjectData440(
.put("char*=\"").put(sizeof(char*)).put("\",")
.put(""NS"QString=\"").put(sizeof(QString)).put("\",")
.put(""NS"QStringList=\"").put(sizeof(QStringList)).put("\",")
#ifndef QT_BOOTSTRAPPED
.put(""NS"QObject=\"").put(sizeof(QObject)).put("\",")
#endif
#if USE_QT_GUI
.put(""NS"QWidget=\"").put(sizeof(QWidget)).put("\",")
#endif
......@@ -3455,6 +3506,7 @@ void *qDumpObjectData440(
.put("std::allocator=\"").put(sizeof(std::allocator<int>)).put("\",")
.put("std::char_traits<char>=\"").put(sizeof(std::char_traits<char>)).put("\",")
.put("std::char_traits<unsigned short>=\"").put(sizeof(std::char_traits<unsigned short>)).put("\",")
#ifndef QT_BOOTSTRAPPED
#if QT_VERSION >= 0x040500
.put(NS"QSharedPointer=\"").put(sizeof(QSharedPointer<int>)).put("\",")
.put(NS"QSharedDataPointer=\"").put(sizeof(QSharedDataPointer<QSharedData>)).put("\",")
......@@ -3468,6 +3520,7 @@ void *qDumpObjectData440(
.put(NS"QMapNode<"NS"QString,int>=\"").put(sizeof(QMapNode<QString, int>)).put("\",")
.put(NS"QMapNode<"NS"QString,"NS"QString>=\"").put(sizeof(QMapNode<QString, QString>)).put("\",")
.put(NS"QMapNode<"NS"QString,"NS"QVariant>=\"").put(sizeof(QMapNode<QString, QVariant>))
#endif // QT_BOOTSTRAPPED
.put("\"}");
// Write out common expression values for CDB
#ifdef Q_CC_MSVC
......@@ -3517,7 +3570,9 @@ void *qDumpObjectData440(
}
else {
#ifndef QT_BOOTSTRAPPED
qDebug() << "Unsupported protocol version" << protocolVersion;
#endif
}
return outBuffer;
}
......@@ -44,6 +44,8 @@
#include <QtCore/QObject>
#ifndef QT_BOOTSTRAPPED
#undef NS
#ifdef QT_NAMESPACE
# define STRINGIFY0(s) #s
......@@ -156,6 +158,8 @@ public:
#endif
};
#endif // QT_BOOTSTRAPPED
#if defined(QT_BEGIN_NAMESPACE)
QT_END_NAMESPACE
#endif
......
......@@ -30,12 +30,12 @@
<message>
<location/>
<source>Executable:</source>
<translation>Exécutable:</translation>
<translation>Exécutable :</translation>
</message>
<message>
<location/>
<source>Core File:</source>
<translation type="unfinished">Fichier Core:</translation>
<translation type="unfinished">Fichier Core :</translation>
</message>
</context>
<context>
......@@ -49,17 +49,17 @@
<location/>
<source>Attach to Process ID:</source>
<translatorcomment>PID ?</translatorcomment>
<translation type="unfinished">Attacher au processus d&apos;ID:</translation>
<translation type="unfinished">Attacher au processus d&apos;ID :</translation>
</message>
<message>
<location/>
<source>Filter:</source>
<translation type="unfinished">Filtre:</translation>
<translation>Filtre :</translation>
</message>
<message>
<location/>
<source>Clear</source>
<translation type="unfinished">Effacer</translation>
<translation>Effacer</translation>
</message>
</context>
<context>
......@@ -82,12 +82,12 @@
<message>
<location/>
<source>Use server start script:</source>
<translation type="unfinished">Utiliser le script de démarrage du serveur:</translation>
<translation>Utiliser le script de démarrage du serveur :</translation>
</message>
<message>
<location/>
<source>Server start script:</source>
<translation type="unfinished">Script de démarrage du serveur:</translation>
<translation>Script de démarrage du serveur :</translation>
</message>
</context>
<context>
......@@ -113,12 +113,12 @@
<message>
<location/>
<source>Bookmark:</source>
<translation type="unfinished">Signet:</translation>
<translation>Signet :</translation>
</message>
<message>
<location/>
<source>Add in Folder:</source>
<translation type="unfinished">Ajouter dans le dossier:</translation>
<translation>Ajouter dans le dossier :</translation>
</message>
<message>
<location/>
......@@ -185,37 +185,37 @@
<message>
<location line="-435"/>
<source>Delete Folder</source>
<translation type="unfinished">Supprimer le Dossier</translation>
<translation type="unfinished">Supprimer le dossier</translation>
</message>
<message>
<location line="+1"/>
<source>Rename Folder</source>
<translation type="unfinished">Renommer le Dossier</translation>
<translation type="unfinished">Renommer le dossier</translation>
</message>
<message>
<location line="+2"/>
<source>Show Bookmark</source>
<translation type="unfinished">Afficher le Signet</translation>
<translation type="unfinished">Afficher le signet</translation>
</message>
<message>
<location line="+1"/>
<source>Show Bookmark in New Tab</source>
<translation type="unfinished">Afficher le Signet dans un Nouvel Onglet</translation>
<translation type="unfinished">Afficher le signet dans un nouvel onglet</translation>
</message>
<message>
<location line="+3"/>
<source>Delete Bookmark</source>
<translation type="unfinished">Supprimer le Signet</translation>
<translation type="unfinished">Supprimer le signet</translation>
</message>
<message>
<location line="+1"/>
<source>Rename Bookmark</source>
<translation type="unfinished">Renommer le Signet</translation>
<translation type="unfinished">Renommer le signet</translation>
</message>
<message>
<location line="+38"/>
<source>Filter:</source>
<translation type="unfinished">Filtre:</translation>
<translation type="unfinished">Filtre :</translation>
</message>
<message>
<location line="+26"/>
......@@ -2555,12 +2555,12 @@ Voulez vous les écraser?</translation>
<message>
<location/>
<source>Header suffix:</source>
<translation type="unfinished">Suffixe des header :</translation>
<translation type="unfinished">Suffixe des headers :</translation>
</message>
<message>
<location/>
<source>Source suffix:</source>
<translation type="unfinished">Suffixe des fichiers source</translation>
<translation type="unfinished">Suffixe des fichiers source:</translation>
</message>
<message>
<location/>
......@@ -2570,7 +2570,7 @@ Voulez vous les écraser?</translation>
<message>
<location/>
<source>License Template:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Modèle de licence:</translation>
</message>
</context>
<context>
......@@ -11422,12 +11422,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location filename="../../../src/plugins/texteditor/displaysettingspage.ui"/>
<source>Display</source>
<translation type="unfinished">Affichage</translation>
<translation>Affichage</translation>
</message>
<message>
<location/>
<source>Display line &amp;numbers</source>
<translation type="unfinished">Afficher les &amp;numéros de ligne</translation>
<translation>Afficher les &amp;numéros de ligne</translation>
</message>
<message>
<location/>
......@@ -11490,13 +11490,13 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<message>
<location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+210"/>
<source>Font &amp; Colors</source>
<translation type="unfinished">Polices et couleurs</translation>
<translation type="unfinished">Polices &amp; couleurs</translation>
</message>
<message>
<location line="+209"/>
<source>
This is only an example.</source>
<translation type="unfinished">\n\tCeci est seulement un exemple.</translation>
<translation>\n\tCeci est seulement un exemple.</translation>
</message>
</context>
<context>
......@@ -12207,12 +12207,12 @@ The following encodings are likely to fit:</source>
<message>
<location filename="../../../src/plugins/vcsbase/vcsbasesettingspage.ui"/>
<source>Common</source>
<translation type="unfinished">Commun</translation>
<translation>Commun</translation>
</message>
<message>
<location/>
<source>Wrap submit message at:</source>
<translation type="unfinished">Limiter la largeur du message à :</translation>
<translation>Limiter la largeur du message à :</translation>
</message>
<message>
<location/>
......@@ -12222,7 +12222,7 @@ The following encodings are likely to fit:</source>
<message>
<location/>
<source>Submit message check script:</source>
<translation type="unfinished">Script de vérification du message :</translation>
<translation>Script de vérification du message :</translation>
</message>
<message>
<location/>
......@@ -12234,7 +12234,7 @@ nom &lt;email&gt; alias &lt;/email&gt;</translation>
<message>
<location/>
<source>User/alias configuration file:</source>
<translation type="unfinished">Fichier de configuration des alias utilisateur :</translation>
<translation>Fichier de configuration des alias utilisateur :</translation>
</message>
<message>
<location/>
......@@ -12244,7 +12244,7 @@ nom &lt;email&gt; alias &lt;/email&gt;</translation>
<message>
<location/>
<source>User fields configuration file:</source>
<translation type="unfinished">Fichier de configuration des champs utilisateurs :</translation>
<translation>Fichier de configuration des champs utilisateurs :</translation>
</message>
</context>
<context>
......@@ -12252,14 +12252,14 @@ nom &lt;email&gt; alias &lt;/email&gt;</translation>
<message>
<location filename="../../../src/plugins/coreplugin/vcsmanager.cpp" line="+132"/>
<source>Version Control</source>
<translation type="unfinished">Gestion de versions</translation>
<translation>Gestion de versions</translation>
</message>
<message>
<location line="+1"/>
<source>Would you like to remove this file from the version control system (%1)?
Note: This might remove the local file.</source>
<translation type="unfinished">Voulez-vous retirer ce fichier du système de gestion de versions (%1)?
Note: Ceci peut supprimer le fichier sur le disque</translation>
Note : Ceci risque de supprimer le fichier sur le disque.</translation>
</message>
</context>
<context>
......@@ -12267,13 +12267,13 @@ Note: Ceci peut supprimer le fichier sur le disque</translation>
<message>
<location filename="../../../src/shared/cpaster/view.cpp" line="+89"/>
<source>Paste</source>
<translation type="unfinished">Coller</translation>
<translation>Coller</translation>
</message>
<message>
<location line="+11"/>
<location line="+41"/>
<source>&lt;Username&gt;</source>
<translation type="unfinished">&lt;Utilisateur&gt;</translation>
<translation>&lt;Utilisateur&gt;</translation>
</message>
<message>
<location line="-33"/>
......@@ -12285,7 +12285,7 @@ Note: Ceci peut supprimer le fichier sur le disque</translation>
<location line="-30"/>
<location line="+35"/>
<source>&lt;Comment&gt;</source>
<translation type="unfinished">&lt;Commentaire&gt;</translation>
<translation>&lt;Commentaire&gt;</translation>
</message>
</context>
<context>
......@@ -12293,17 +12293,17 @@ Note: Ceci peut supprimer le fichier sur le disque</translation>
<message>
<location filename="../../../src/shared/cpaster/view.ui"/>
<source>Send to Codepaster</source>
<translation type="unfinished">Envoyer sur Codepaster</translation>
<translation>Envoyer sur Codepaster</translation>
</message>
<message>
<location/>
<source>&amp;Username:</source>
<translation type="unfinished">&amp;Utilisateur:</translation>
<translation>&amp;Utilisateur :</translation>
</message>
<message>
<location/>
<source>&lt;Username&gt;</source>
<translation type="unfinished">&lt;Utilisateur&gt;</translation>
<translation>&lt;Utilisateur&gt;</translation>
</message>
<message>
<location/>
......@@ -12326,7 +12326,7 @@ p, li { white-space: pre-wrap; }
<message>