Commit 2ac1f797 authored by con's avatar con
Browse files

Merge commit 'origin/1.2'

Conflicts:
	src/plugins/coreplugin/welcomemode.ui
parents 313cb44e 7b165504
......@@ -5,7 +5,7 @@
\title Qt Creator Manual
\section1 Version 1.1.80
\section1 Version 1.2.0
The goal of Qt Creator is to provide a cross-platform, complete Integrated
Development Environment (IDE) to develop Qt projects. It is available for
......
......@@ -18,15 +18,15 @@ sources.fileextensions = "qtcreator.qdoc"
qhp.projects = QtCreator
qhp.QtCreator.file = qtcreator.qhp
qhp.QtCreator.namespace = com.nokia.qtcreator.1180
qhp.QtCreator.namespace = com.nokia.qtcreator.120
qhp.QtCreator.virtualFolder = doc
qhp.QtCreator.indexTitle = Qt Creator
qhp.QtCreator.indexRoot =
qhp.QtCreator.extraFiles = classic.css \
images/qt-logo.png
qhp.QtCreator.filterAttributes = qtcreator 1.1.80
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.1.80
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.1.80
qhp.QtCreator.filterAttributes = qtcreator 1.2.0
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 1.2.0
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 1.2.0
# macros.qdocconf
......@@ -202,5 +202,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
"<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia</td>\n" \
"<td width=\"40%\" align=\"center\">&nbsp;</td>\n" \
"<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Creator 1.1.80</div></td>\n" \
"<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Creator 1.2.0</div></td>\n" \
"</tr></table></div></address>"
......@@ -95,7 +95,7 @@ mv -f "${TMPFILE}" "${INSTALLER_RC}"
## Patch Info.plist
TMPFILE=`mktemp versionPatch.XXXXXX`
INFO_PLIST="${SCRIPT_DIR}/share/qtcreator/Info.plist"
INFO_PLIST="${SCRIPT_DIR}/src/app/Info.plist"
echo "Patching \`${INFO_PLIST}'"
sed \
-e "s/"${OLD}"/"${NEW}"/" \
......
......@@ -61,11 +61,9 @@ static const WCHAR *debuggerRegistryDefaultValueNameC = L"Debugger.Default";
static const char *linkC = "http://msdn.microsoft.com/en-us/library/cc266343.aspx";
static inline QString wCharToQString(const WCHAR *w) { return QString::fromUtf16(reinterpret_cast<const ushort *>(w)); }
#ifdef __GNUC__
static inline QString wCharToQString(const WCHAR *w) { return QString::fromUtf16(reinterpret_cast<const ushort*>(w)); }
#define RRF_RT_ANY 0x0000ffff // no type restriction
#else
static inline QString wCharToQString(const WCHAR *w) { return QString::fromUtf16(w); }
#endif
......
......@@ -2,9 +2,11 @@ include(../../qtcreator.pri)
TEMPLATE = app
TARGET = phony_target
QT =
LIBS =
isEmpty(vcproj) {
QMAKE_LINK = : IGNORE REST
QMAKE_LINK = @: IGNORE THIS LINE
OBJECTS_DIR =
win32:CONFIG -= embed_manifest_exe
} else {
......
......@@ -121,7 +121,7 @@
<message>
<location/>
<source>+</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location/>
......@@ -1763,19 +1763,18 @@ Sollen sie überschrieben werden?</translation>
<translation>Anleitungen</translation>
</message>
<message>
<location line="+1"/>
<source>Qt Demos and Examples</source>
<translation>Qt Demos und Beispiele</translation>
<translation type="obsolete">Qt Demos und Beispiele</translation>
</message>
<message>
<location line="+1"/>
<location line="+2"/>
<source>Did you know?</source>
<translation>Wussten Sie schon?</translation>
</message>
<message>
<location line="+1"/>
<source>News from the Qt Labs</source>
<translation>Neuigkeiten von Qt Labs</translation>
<translation type="unfinished">Neuigkeiten aus den Qt Labs</translation>
</message>
<message>
<location line="+1"/>
......@@ -1783,7 +1782,7 @@ Sollen sie überschrieben werden?</translation>
<translation>Qt Internetseiten</translation>
</message>
<message>
<location line="+31"/>
<location line="+36"/>
<source>http://labs.trolltech.com/blogs/feed</source>
<extracomment>Add localized feed here only if one exists</extracomment>
<translation type="unfinished"></translation>
......@@ -1827,17 +1826,22 @@ Sollen sie überschrieben werden?</translation>
<translation type="obsolete">Qt Creator - Schnelleinstieg</translation>
</message>
<message>
<location line="+2"/>
<location line="+4"/>
<source>Understanding widgets</source>
<translation>Widgets verstehen</translation>
</message>
<message>
<location line="+2"/>
<location line="-2"/>
<source>Creating an address book</source>
<translation>Erstellen einer Adressbuch-Beispielanwendung</translation>
<translation>Erstellen eines Adressbuchs</translation>
</message>
<message>
<location line="+2"/>
<location line="-49"/>
<source>Explore Qt Examples</source>
<translation type="unfinished">Qt Beispiele öffnen</translation>
</message>
<message>
<location line="+53"/>
<source>Building with qmake</source>
<translation>Mit qmake arbeiten</translation>
</message>
......@@ -1857,7 +1861,12 @@ Sollen sie überschrieben werden?</translation>
<translation>%1 (zuletzt benutzt)</translation>
</message>
<message>
<location line="+58"/>
<location line="+63"/>
<source>Choose an example...</source>
<translation>Beispiel wählen...</translation>
</message>
<message>
<location line="+73"/>
<source>New Project...</source>
<translation>Neues Projekt...</translation>
</message>
......@@ -2054,6 +2063,11 @@ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0
<source>Manage Sessions...</source>
<translation>Sitzungen...</translation>
</message>
<message>
<location/>
<source>Examples not installed</source>
<translation>Beispiele nicht installiert</translation>
</message>
</context>
<context>
<name>Core::ModeManager</name>
......@@ -2069,12 +2083,13 @@ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0
<location filename="../../../src/plugins/coreplugin/scriptmanager/scriptmanager.cpp" line="+237"/>
<source>Exception at line %1: %2
%3</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Ausnahme in Zeile%1: %2
%3</translation>
</message>
<message>
<location line="+67"/>
<source>Unknown error</source>
<translation type="unfinished"></translation>
<translation>Unbekannter Fehler</translation>
</message>
</context>
<context>
......@@ -3559,7 +3574,7 @@ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0
<message>
<location line="+30"/>
<source>Ctrl+Shift+F11</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>
......@@ -3907,7 +3922,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>&lt;nicht im Bereich&gt;</translation>
</message>
<message numerus="yes">
<location line="+98"/>
<location line="+100"/>
<source>Retrieving data for watch view (%n requests pending)...</source>
<translation>
<numerusform>Daten der für die Anzeige der lokalen Variablen werden empfangen (noch eine austehende Anfrage) ...</numerusform>
......@@ -3923,7 +3938,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
</translation>
</message>
<message numerus="yes">
<location line="+282"/>
<location line="+284"/>
<source>&lt;%n items&gt;</source>
<extracomment>In string list</extracomment>
<translation>
......@@ -3936,7 +3951,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation type="obsolete">Daten der für die Anzeige der lokalen Variablen werden empfangen (noch %1 austehende Anfragen) ...</translation>
</message>
<message>
<location line="-346"/>
<location line="-348"/>
<source>Finished retrieving data.</source>
<translation>Alle Daten erhalten.</translation>
</message>
......@@ -3956,7 +3971,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<translation>Ausgabe-Hilfsbibliothek-Initialisierung: %1</translation>
</message>
<message>
<location line="+165"/>
<location line="+167"/>
<source>&lt;0 items&gt;</source>
<translation>&lt;leer&gt;</translation>
</message>
......@@ -4275,7 +4290,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<message>
<location filename="../../../src/plugins/debugger/stackhandler.cpp" line="+97"/>
<source>...</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location line="+2"/>
......@@ -4397,7 +4412,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<message>
<location filename="../../../src/plugins/debugger/tcf/tcfengine.cpp" line="+189"/>
<source>%1.</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location line="+381"/>
......@@ -4447,7 +4462,7 @@ Es wird empfohlen, gdb 6.7 oder später zu benutzen.</translation>
<context>
<name>Debugger::Internal::WatchHandler</name>
<message>
<location line="+185"/>
<location line="+187"/>
<source>Expression</source>
<translation>Ausdruck</translation>
</message>
......@@ -5276,7 +5291,7 @@ Grund: %3</translation>
<context>
<name>FakeVim::Internal::FakeVimHandler</name>
<message>
<location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+827"/>
<location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+828"/>
<source>%1,%2</source>
<translation type="unfinished"></translation>
</message>
......@@ -5292,14 +5307,14 @@ Grund: %3</translation>
<translation>In FakeVim nicht implementiert</translation>
</message>
<message>
<location line="+120"/>
<location line="+685"/>
<location line="+127"/>
<location line="+687"/>
<location line="+19"/>
<source>E20: Mark &apos;%1&apos; not set</source>
<translation>E20: Die Marke &apos;%1&apos; ist nicht gesetzt</translation>
</message>
<message>
<location line="+103"/>
<location line="+115"/>
<source>File &apos;%1&apos; exists (add ! to override)</source>
<translation>Die &apos;%1&apos; existiert bereits (Fügen Sie ! an, um sie zu überschreiben)</translation>
</message>
......@@ -5314,7 +5329,7 @@ Grund: %3</translation>
<translation>&quot;%1&quot; %2 %3L, %4C geschrieben</translation>
</message>
<message>
<location line="+4"/>
<location line="+8"/>
<source>Cannot open file &apos;%1&apos; for reading</source>
<translation>Die Datei &apos;%1&apos; kann nicht zum Lesen geöffnet werden</translation>
</message>
......@@ -5380,7 +5395,7 @@ Grund: %3</translation>
<context>
<name>FakeVim::Internal::FakeVimOptionPage</name>
<message>
<location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="+112"/>
<location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="+114"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
......@@ -5393,8 +5408,8 @@ Grund: %3</translation>
<context>
<name>FakeVim::Internal::FakeVimPluginPrivate</name>
<message>
<location line="+299"/>
<location line="+141"/>
<location line="+329"/>
<location line="+146"/>
<source>Quit FakeVim</source>
<translation>FakeVim Beenden</translation>
</message>
......@@ -5645,6 +5660,11 @@ Grund: %3</translation>
<source>Whole Words Only</source>
<translation>Ganze Worte</translation>
</message>
<message>
<location line="+9"/>
<source>Use Regular Expressions</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Find::Internal::FindWidget</name>
......@@ -6813,7 +6833,7 @@ Grund: %3</translation>
<message>
<location line="+221"/>
<location line="+4"/>
<location line="+66"/>
<location line="+73"/>
<source>Unfiltered</source>
<translation>Kein</translation>
</message>
......@@ -9377,43 +9397,36 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<context>
<name>QrcEditor</name>
<message>
<location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+151"/>
<source>Form</source>
<translation>Formular</translation>
<translation type="obsolete">Formular</translation>
</message>
<message>
<location filename="../../../src/shared/qrceditor/qrceditor.ui"/>
<location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Add</source>
<translation>Hinzufügen</translation>
</message>
<message>
<location/>
<location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
<message>
<location/>
<location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Properties</source>
<translation>Eigenschaften</translation>
</message>
<message>
<location/>
<location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Prefix:</source>
<translation>Präfix:</translation>
</message>
<message>
<location/>
<location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Language:</source>
<translation>Sprache:</translation>
</message>
<message>
<location/>
<location filename="../../../src/shared/qrceditor/test/ui_qrceditor.h" line="+1"/>
<source>Alias:</source>
<translation>Aliasname:</translation>
</message>
......@@ -10320,7 +10333,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>Qt4ProjectManager::QtVersionManager</name>
<message>
<location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+245"/>
<location filename="../../../src/plugins/qt4projectmanager/qtversionmanager.cpp" line="+281"/>
<source>&lt;not found&gt;</source>
<translation>&lt;nicht gefunden&gt;</translation>
</message>
......@@ -11551,7 +11564,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>TextEditor::BaseFileFind</name>
<message>
<location filename="../../../src/plugins/texteditor/basefilefind.cpp" line="+113"/>
<location filename="../../../src/plugins/texteditor/basefilefind.cpp" line="+114"/>
<location line="+19"/>
<source>%1 found</source>
<translation>%1 gefunden</translation>
......@@ -11601,7 +11614,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>TextEditor::BaseTextEditorEditable</name>
<message>
<location line="+3652"/>
<location line="+3655"/>
<source>Line: %1, Col: %2</source>
<translation>Zeile: %1, Spalte: %2</translation>
</message>
......@@ -11822,6 +11835,14 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<translation>Mit Encoding abspeichern</translation>
</message>
</context>
<context>
<name>TextEditor::Internal::FindInCurrentFile</name>
<message>
<location filename="../../../src/plugins/texteditor/findincurrentfile.cpp" line="+57"/>
<source>Current File</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TextEditor::Internal::FindInFiles</name>
<message>
......@@ -11933,7 +11954,7 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<translation type="obsolete">Erzeugt eine neue Textdatei (.txt)</translation>
</message>
<message>
<location filename="../../../src/plugins/texteditor/texteditorplugin.cpp" line="+93"/>
<location filename="../../../src/plugins/texteditor/texteditorplugin.cpp" line="+94"/>
<source>Creates a text file (.txt).</source>
<translation>Erzeugt eine Textdatei (.txt)</translation>
</message>
......
......@@ -17,10 +17,10 @@ contains(QT_VERSION, ^4\.[0-5]\..*):ts.commands = @echo This Qt version is too o
else:ts.commands = (cd $$IDE_SOURCE_TREE && $$LUPDATE src -ts $$TS_FILES)
QMAKE_EXTRA_TARGETS += ts
contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1
TEMPLATE = app
TARGET = phony_target2
QT =
LIBS =
updateqm.target = $$IDE_DATA_DIR/translations
updateqm.input = TS_FILES
......@@ -32,7 +32,7 @@ updateqm.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += updateqm
isEmpty(vcproj) {
QMAKE_LINK = : IGNORE REST
QMAKE_LINK = @: IGNORE THIS LINE
OBJECTS_DIR =
win32:CONFIG -= embed_manifest_exe
} else {
......
......@@ -182,8 +182,8 @@
<key>CFBundleIdentifier</key>
<string>com.nokia.qtcreator</string>
<key>CFBundleVersion</key>
<string>1.1.80</string>
<string>1.2.0</string>
<key>CFBundleShortVersionString</key>
<string>1.1.80</string>
<string>1.2.0</string>
</dict>
</plist>
......@@ -75,7 +75,8 @@ void PluginDetailsView::update(PluginSpec *spec)
m_ui->version->setText(spec->version());
m_ui->compatVersion->setText(spec->compatVersion());
m_ui->vendor->setText(spec->vendor());
m_ui->url->setText(spec->url());
const QString link = QString::fromLatin1("<a href=\"%1\">%1</a>").arg(spec->url());
m_ui->url->setText(link);
m_ui->location->setText(QDir::toNativeSeparators(spec->filePath()));
m_ui->description->setText(spec->description());
m_ui->copyright->setText(spec->copyright());
......
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ExtensionSystem::Internal::PluginDetailsView</class>
<widget class="QWidget" name="ExtensionSystem::Internal::PluginDetailsView" >
<property name="geometry" >
<widget class="QWidget" name="ExtensionSystem::Internal::PluginDetailsView">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
......@@ -9,124 +10,114 @@
<height>505</height>
</rect>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<layout class="QGridLayout">
<property name="margin">
<number>2</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Name:</string>
</property>
<property name="alignment" >
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLabel" name="name" >
</widget>
<item row="0" column="1">
<widget class="QLabel" name="name"/>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Version:</string>
</property>
<property name="alignment" >
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLabel" name="version" >
</widget>
<item row="1" column="1">
<widget class="QLabel" name="version"/>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Compatibility Version:</string>
</property>
<property name="alignment" >
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QLabel" name="compatVersion" >
</widget>
<item row="2" column="1">
<widget class="QLabel" name="compatVersion"/>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Vendor:</string>
</property>
<property name="alignment" >
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="3" column="1" >
<widget class="QLabel" name="vendor" >
</widget>
<item row="3" column="1">
<widget class="QLabel" name="vendor"/>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="label_6" >
<property name="text" >
<item row="4" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Url:</string>
</property>
<property name="alignment" >
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="1" >
<widget class="QLabel" name="url" >
<item row="4" column="1">
<widget class="QLabel" name="url">
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0" >
<widget class="QLabel" name="label_7" >
<property name="text" >
<item row="5" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Location:</string>
</property>
<property name="alignment" >
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="1" >
<widget class="QLabel" name="location" >
<property name="wordWrap" >
<item row="5" column="1">
<widget class="QLabel" name="location">
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="6" column="0" >
<layout class="QVBoxLayout" >
<item row="6" column="0">
<layout class="QVBoxLayout">
<item>
<widget class="QLabel" name="label_8" >
<property name="text" >