Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp

doc/qtcreator.qdoc

@@ -6558,7 +6558,7 @@
 
     To move forward in the location history, press \key {Alt+Right}
     (\key {Cmd+Opt+Right} on Mac OS). To move backward, press \key {Alt+Left}
-    (\key {Cmd+Opt+Right} on Mac OS). For example, if you use the \gui Locator
+    (\key {Cmd+Opt+Left} on Mac OS). For example, if you use the \gui Locator
     to jump to a symbol in the same file, you can jump back to your original
     location in that file by pressing \key {Alt+Left}.
 

share/qtcreator/templates/wizards/qml-extension/wizard.xml

@@ -36,11 +36,11 @@ leave room for the Qt 4 target page.
 -->
 <wizard version="1" kind="project"
         class="qt4project" firstpage="10"
-        id="QmlRuntimePlugin" category="F.Projects">
+        id="QmlExtensionPlugin" category="F.Projects">
     <icon>lib.png</icon>
-    <description>Creates a C++ plugin to extend the funtionality of the QML runtime.</description>
-    <displayname>QML Runtime Plug-in</displayname>
-    <displaycategory>QML Runtime Plug-in</displaycategory>
+    <description>Creates a C++ plugin that makes it possible to offer extensions that can be loaded dynamically into applications using the QDeclarativeEngine class.</description>
+    <displayname>Custom QML Extension Plugin</displayname>
+    <displaycategory>QML Extension Plugin</displaycategory>
     <files>
         <file source="qmldir" target="qmldir"/>
         <file source="plugin.h" target="%ProjectName%.h"/>
@@ -50,7 +50,7 @@ leave room for the Qt 4 target page.
         <file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
     </files>
     <!-- Create a 2nd wizard page with parameters -->
-    <fieldpagetitle>QML Runtime Plug-in Parameters</fieldpagetitle>
+    <fieldpagetitle>Custom QML Extension  Plugin Parameters</fieldpagetitle>
     <fields>
         <field mandatory="false" name="ObjectName">
             <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9_]+$'  defaulttext="ExampleObject"/>

share/qtcreator/translations/translations.pro

@@ -32,7 +32,7 @@ QMAKE_EXTRA_TARGETS += extract
 
 files = $$files($$PWD/*_??.ts) $$PWD/qtcreator_untranslated.ts
 for(file, files) {
-    lang = $$replace(file, .*_(.*)\\.ts, \\1)
+    lang = $$replace(file, .*_([^/]*)\\.ts, \\1)
     v = ts-$${lang}.commands
     $$v = cd $$IDE_SOURCE_TREE && $$LUPDATE src share/qtcreator/qmldesigner $$MIME_TR_H $$CUSTOMWIZARD_TR_H -ts $$file
     v = ts-$${lang}.depends

src/plugins/coreplugin/editormanager/editormanager.cpp

@@ -1634,7 +1634,10 @@ void EditorManager::showPopupOrSelectDocument() const
     if (QApplication::keyboardModifiers() == Qt::NoModifier) {
         windowPopup()->selectAndHide();
     } else {
-        const QPoint p(mapToGlobal(QPoint(0, 0)));
+        // EditorManager is invisible when invoked from Design Mode.
+        const QPoint p = isVisible() ?
+                         mapToGlobal(QPoint(0, 0)) :
+                         m_d->m_core->mainWindow()->mapToGlobal(QPoint(0, 0));
         windowPopup()->move((width()-m_d->m_windowPopup->width())/2 + p.x(),
                             (height()-m_d->m_windowPopup->height())/2 + p.y());
         windowPopup()->setVisible(true);

src/plugins/debugger/cdb/cdboptionspagewidget.ui

@@ -98,7 +98,7 @@
       <item row="1" column="0">
        <widget class="QCheckBox" name="fastLoadDebuggingHelpersCheckBox">
         <property name="text">
-         <string>fast loading of debugging helpers</string>
+         <string>Fast loading of debugging helpers</string>
         </property>
        </widget>
       </item>

src/plugins/debugger/debuggeruiswitcher.cpp

@@ -144,8 +144,13 @@ DebuggerUISwitcher::~DebuggerUISwitcher()
     delete d;
 }
 
-void DebuggerUISwitcher::addMenuAction(Core::Command *command,
-    const QString &langName, const QString &group)
+QStringList DebuggerUISwitcher::supportedLanguages() const
+{
+    return d->m_languages;
+}
+
+void DebuggerUISwitcher::addMenuAction(Core::Command *command, const QString &langName,
+                                       const QString &group)
 {
     d->m_debugMenu->addAction(command, group);
     d->m_menuCommands.insert(d->m_languages.indexOf(langName), command);

src/plugins/debugger/debuggeruiswitcher.h

@@ -78,6 +78,8 @@ public:
     void addMenuAction(Core::Command *command, const QString &langName,
                        const QString &group = QString());
 
+    QStringList supportedLanguages() const;
+
     // Changes the active language UI to the one specified by langName.
     // Does nothing if automatic switching is toggled off from settings.
     void setActiveLanguage(const QString &langName);

src/plugins/git/gitclient.cpp

@@ -600,18 +600,22 @@ bool GitClient::synchronousInit(const QString &workingDirectory)
 bool GitClient::synchronousCheckoutFiles(const QString &workingDirectory,
                                          QStringList files /* = QStringList() */,
                                          QString revision /* = QString() */,
-                                         QString *errorMessage /* = 0 */)
+                                         QString *errorMessage /* = 0 */,
+                                         bool revertStaging /* = true */)
 {
     if (Git::Constants::debug)
         qDebug() << Q_FUNC_INFO << workingDirectory << files;
-    if (revision.isEmpty())
+    if (revertStaging && revision.isEmpty())
         revision = QLatin1String("HEAD");
     if (files.isEmpty())
         files = QStringList(QString(QLatin1Char('.')));
     QByteArray outputText;
     QByteArray errorText;
     QStringList arguments;
-    arguments << QLatin1String("checkout") << revision << QLatin1String("--") << files;
+    arguments << QLatin1String("checkout");
+    if (revertStaging)
+        arguments << revision;
+    arguments << QLatin1String("--") << files;
     const bool rc = fullySynchronousGit(workingDirectory, arguments, &outputText, &errorText);
     if (!rc) {
         const QString fileArg = files.join(QLatin1String(", "));
@@ -1479,7 +1483,10 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory,
  * reverting a directory pending a sophisticated selection dialog in the
  * VCSBase plugin. */
 
-GitClient::RevertResult GitClient::revertI(QStringList files, bool *ptrToIsDirectory, QString *errorMessage)
+GitClient::RevertResult GitClient::revertI(QStringList files,
+                                           bool *ptrToIsDirectory,
+                                           QString *errorMessage,
+                                           bool revertStaging)
 {
     if (Git::Constants::debug)
         qDebug() << Q_FUNC_INFO << files;
@@ -1541,7 +1548,7 @@ GitClient::RevertResult GitClient::revertI(QStringList files, bool *ptrToIsDirec
     if (Git::Constants::debug)
         qDebug() << Q_FUNC_INFO << data.stagedFiles << data.unstagedFiles << allStagedFiles << allUnstagedFiles << stagedFiles << unstagedFiles;
 
-    if (stagedFiles.empty() && unstagedFiles.empty())
+    if ((!revertStaging || stagedFiles.empty()) && unstagedFiles.empty())
         return RevertUnchanged;
 
     // Ask to revert (to do: Handle lists with a selection dialog)
@@ -1555,19 +1562,22 @@ GitClient::RevertResult GitClient::revertI(QStringList files, bool *ptrToIsDirec
         return RevertCanceled;
 
     // Unstage the staged files
-    if (!stagedFiles.empty() && !synchronousReset(repoDirectory, stagedFiles, errorMessage))
+    if (revertStaging && !stagedFiles.empty() && !synchronousReset(repoDirectory, stagedFiles, errorMessage))
         return RevertFailed;
+    QStringList filesToRevert = unstagedFiles;
+    if (revertStaging)
+        filesToRevert += stagedFiles;
     // Finally revert!
-    if (!synchronousCheckoutFiles(repoDirectory, stagedFiles + unstagedFiles, QString(), errorMessage))
+    if (!synchronousCheckoutFiles(repoDirectory, filesToRevert, QString(), errorMessage, revertStaging))
         return RevertFailed;
     return RevertOk;
 }
 
-void GitClient::revert(const QStringList &files)
+void GitClient::revert(const QStringList &files, bool revertStaging)
 {
     bool isDirectory;
     QString errorMessage;
-    switch (revertI(files, &isDirectory, &errorMessage)) {
+    switch (revertI(files, &isDirectory, &errorMessage, revertStaging)) {
     case RevertOk:
         m_plugin->gitVersionControl()->emitFilesChanged(files);
         break;

src/plugins/git/gitclient.h

@@ -114,7 +114,8 @@ public:
     bool synchronousInit(const QString &workingDirectory);
     bool synchronousCheckoutFiles(const QString &workingDirectory,
                                   QStringList files = QStringList(),
-                                  QString revision = QString(), QString *errorMessage = 0);
+                                  QString revision = QString(), QString *errorMessage = 0,
+                                  bool revertStaging = true);
     // Checkout branch
     bool synchronousCheckoutBranch(const QString &workingDirectory, const QString &branch, QString *errorMessage = 0);
 
@@ -164,7 +165,7 @@ public:
     void subversionLog(const QString &workingDirectory);
 
     void stashPop(const QString &workingDirectory);
-    void revert(const QStringList &files);
+    void revert(const QStringList &files, bool revertStaging);
     void branchList(const QString &workingDirectory);
     void stashList(const QString &workingDirectory);
     bool synchronousStashList(const QString &workingDirectory,
@@ -259,7 +260,10 @@ private:
     unsigned synchronousGitVersion(bool silent, QString *errorMessage = 0);
 
     enum RevertResult { RevertOk, RevertUnchanged, RevertCanceled, RevertFailed };
-    RevertResult revertI(QStringList files, bool *isDirectory, QString *errorMessage);
+    RevertResult revertI(QStringList files,
+                         bool *isDirectory,
+                         QString *errorMessage,
+                         bool revertStaging);
     void connectRepositoryChanged(const QString & repository, GitCommand *cmd);
     bool synchronousPull(const QString &workingDirectory, bool rebase);
     void syncAbortPullRebase(const QString &workingDir);

src/plugins/git/gitplugin.cpp

@@ -332,9 +332,15 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
                                globalcontext, true, SLOT(blameFile()));
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+B")));
 
+    parameterActionCommand
+            = createFileAction(actionManager, gitContainer,
+                               tr("Undo Unstaged Changes"), tr("Undo Unstaged Changes for \"%1\""),
+                               QLatin1String("Git.UndoUnstaged"), globalcontext,
+                               true, SLOT(undoUnstagedFileChanges()));
+
     parameterActionCommand
         = createFileAction(actionManager, gitContainer,
-                           tr("Undo Changes"), tr("Undo Changes for \"%1\""),
+                           tr("Undo Uncommitted Changes"), tr("Undo Uncommitted Changes for \"%1\""),
                            QLatin1String("Git.Undo"), globalcontext,
                            true, SLOT(undoFileChanges()));
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+U")));
@@ -561,12 +567,17 @@ void GitPlugin::logProject()
     m_gitClient->log(state.currentProjectTopLevel(), state.relativeCurrentProject());
 }
 
-void GitPlugin::undoFileChanges()
+void GitPlugin::undoFileChanges(bool revertStaging)
 {
     const VCSBase::VCSBasePluginState state = currentState();
     QTC_ASSERT(state.hasFile(), return)
     Core::FileChangeBlocker fcb(state.currentFile());
-    m_gitClient->revert(QStringList(state.currentFile()));
+    m_gitClient->revert(QStringList(state.currentFile()), revertStaging);
+}
+
+void GitPlugin::undoUnstagedFileChanges()
+{
+    undoFileChanges(false);
 }
 
 void GitPlugin::undoRepositoryChanges()

src/plugins/git/gitplugin.h

@@ -109,7 +109,8 @@ private slots:
     void logFile();
     void blameFile();
     void logProject();
-    void undoFileChanges();
+    void undoFileChanges(bool revertStaging = true);
+    void undoUnstagedFileChanges();
     void undoRepositoryChanges();
     void stageFile();
     void unstageFile();

src/plugins/help/helpplugin.cpp

@@ -942,12 +942,13 @@ void HelpPlugin::highlightSearchTerms()
             if (name.isEmpty())
                 continue;
 
-            if (m_oldAttrValue == name) {
+            if (m_oldAttrValue == name
+                || name.startsWith(m_oldAttrValue + QLatin1Char('-'))) {
                 QWebElement parent = element.parent();
                 parent.setStyleProperty(property, m_styleProperty);
             }
 
-            if (attrValue == name) {
+            if (attrValue == name || name.startsWith(attrValue + QLatin1Char('-'))) {
                 QWebElement parent = element.parent();
                 m_styleProperty = parent.styleProperty(property,
                     QWebElement::InlineStyle);
@@ -956,7 +957,6 @@ void HelpPlugin::highlightSearchTerms()
         }
         m_oldAttrValue = attrValue;
 #endif
-        viewer->findText(m_idFromContext, 0, false, true);
     }
 }
 

src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp

@@ -63,9 +63,10 @@ Core::BaseFileWizardParameters QmlProjectApplicationWizard::parameters()
     Core::BaseFileWizardParameters parameters(ProjectWizard);
     parameters.setIcon(QIcon(QLatin1String(Constants::QML_WIZARD_ICON)));
     parameters.setDisplayName(tr("Qt QML Application"));
+    parameters.setDisplayName(tr("QML Application"));
     parameters.setId(QLatin1String("QA.QML Application"));
-    parameters.setDescription(tr("Creates a Qt QML application project with a single QML file containing the main view.\n\n"
-                                 "QML application projects are executed through the QML runtime and do not need to be built."));
+    parameters.setDescription(tr("Creates a QML application project with a single QML file containing the main view.\n\n"
+                                 "QML application projects are executed by the Qt QML Viewer and do not need to be built."));
     parameters.setCategory(QLatin1String(Constants::QML_WIZARD_CATEGORY));
     parameters.setDisplayCategory(QCoreApplication::translate(Constants::QML_WIZARD_TR_SCOPE,
                                                               Constants::QML_WIZARD_TR_CATEGORY));

src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp

@@ -61,7 +61,7 @@ namespace Internal {
 QmlProjectImportWizardDialog::QmlProjectImportWizardDialog(QWidget *parent)
     : Utils::Wizard(parent)
 {
-    setWindowTitle(tr("Import Existing Qt QML Directory"));
+    setWindowTitle(tr("Import Existing QML Directory"));
 
     // first page
     m_firstPage = new FileWizardPage;
@@ -113,7 +113,7 @@ Core::BaseFileWizardParameters QmlProjectImportWizard::parameters()
         p.drawPixmap(3, 3, 16, 16, qApp->style()->standardIcon(QStyle::SP_DirIcon).pixmap(16));
         parameters.setIcon(icon);
     }
-    parameters.setDisplayName(tr("Import Existing Qt QML Directory"));
+    parameters.setDisplayName(tr("Import Existing QML Directory"));
     parameters.setId(QLatin1String("QI.QML Import"));
     parameters.setDescription(tr("Creates a QML project from an existing directory of QML files."));
     parameters.setCategory(QLatin1String(Constants::QML_WIZARD_CATEGORY));

src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp

@@ -36,7 +36,6 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/applicationlauncher.h>
 #include <utils/qtcassert.h>
-#include <debugger/debuggerconstants.h>
 
 #include <debugger/debuggerconstants.h>
 #include <debugger/debuggeruiswitcher.h>
@@ -141,8 +140,12 @@ QmlRunControlFactory::~QmlRunControlFactory()
 bool QmlRunControlFactory::canRun(RunConfiguration *runConfiguration,
                                   const QString &mode) const
 {
-    Q_UNUSED(mode);
-    return (qobject_cast<QmlProjectRunConfiguration*>(runConfiguration) != 0);
+    QmlProjectRunConfiguration *config = qobject_cast<QmlProjectRunConfiguration*>(runConfiguration);
+    if (mode == ProjectExplorer::Constants::RUNMODE) {
+        return config != 0;
+    } else {
+        return (config != 0) && Debugger::DebuggerUISwitcher::instance()->supportedLanguages().contains(Qml::Constants::LANG_QML);
+    }
 }
 
 RunControl *QmlRunControlFactory::create(RunConfiguration *runConfiguration,

src/plugins/qt4projectmanager/qt-s60/s60devices.cpp

@@ -524,25 +524,41 @@ QList<ProjectExplorer::HeaderPath> S60ToolChainMixin::epocHeaderPaths() const
 
     rc << ProjectExplorer::HeaderPath(epocRootPath,
                      ProjectExplorer::HeaderPath::GlobalHeaderPath)
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("include"),
+                     ProjectExplorer::HeaderPath::GlobalHeaderPath)
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("mkspecs/common/symbian"),
+                     ProjectExplorer::HeaderPath::GlobalHeaderPath)
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include"),
+                     ProjectExplorer::HeaderPath::GlobalHeaderPath)
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/osextensions/stdapis"),
+                     ProjectExplorer::HeaderPath::GlobalHeaderPath)
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/osextensions/stdapis/sys"),
+                     ProjectExplorer::HeaderPath::GlobalHeaderPath)
        << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/stdapis"),
                      ProjectExplorer::HeaderPath::GlobalHeaderPath)
        << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/stdapis/sys"),
                      ProjectExplorer::HeaderPath::GlobalHeaderPath)
-       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/stdapis/stlportv5"),
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/osextensions/stdapis/stlport"),
                      ProjectExplorer::HeaderPath::GlobalHeaderPath)
-       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/mw"),
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/stdapis/stlport"),
                      ProjectExplorer::HeaderPath::GlobalHeaderPath)
-       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/platform/mw"),
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/oem"),
                      ProjectExplorer::HeaderPath::GlobalHeaderPath)
-       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/platform"),
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/middleware"),
                      ProjectExplorer::HeaderPath::GlobalHeaderPath)
-       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/platform/loc"),
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/middleware"),
                      ProjectExplorer::HeaderPath::GlobalHeaderPath)
-       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/platform/mw/loc"),
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/osextensions"),
                      ProjectExplorer::HeaderPath::GlobalHeaderPath)
-       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/platform/loc/sc"),
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/osextensions"),
                      ProjectExplorer::HeaderPath::GlobalHeaderPath)
-       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/platform/mw/loc/sc"),
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/osextensions/loc"),
+                     ProjectExplorer::HeaderPath::GlobalHeaderPath)
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/middleware/loc"),
+                     ProjectExplorer::HeaderPath::GlobalHeaderPath)
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/osextensions/loc/sc"),
+                     ProjectExplorer::HeaderPath::GlobalHeaderPath)
+       << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/middleware/loc/sc"),
                      ProjectExplorer::HeaderPath::GlobalHeaderPath);
     return rc;
 }