Merge remote-tracking branch 'origin/3.0'

dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs

@@ -157,7 +157,14 @@ Component.prototype.createOperations = function()
                                 component.qtCreatorBinaryPath,
                                 "@StartMenuDir@/Qt Creator.lnk",
                                 "workingDirectory=@homeDir@" );
-        component.addElevatedOperation("Execute", "{0,3010,1638}", "@TargetDir@\\lib\\vcredist_msvc2010\\vcredist_x86.exe", "/norestart", "/q");
+
+        // only install c runtime if it is needed, no minor version check of the c runtime till we need it
+        if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\VC\\VCRedist\\x86\\Installed") != 1) {
+           // return value 3010 means it need a reboot, but in most cases it is not needed for run Qt application
+           // return value 5100 means there's a newer version of the runtime already installed
+           component.addElevatedOperation("Execute", "{0,1638,3010,5100}", "@TargetDir@\\lib\\vcredist_msvc2010\\vcredist_x86.exe", "/norestart", "/q");
+        }
+
         registerWindowsFileTypeExtensions();
 
         if (component.userInterface("AssociateCommonFiletypesForm").AssociateCommonFiletypesCheckBox
@@ -191,8 +198,9 @@ function isRoot()
 
 Component.prototype.installationFinishedPageIsShown = function()
 {
+    isroot = isRoot();
     try {
-        if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success && !isRoot()) {
+        if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success && !isroot) {
             installer.addWizardPageItem( component, "LaunchQtCreatorCheckBoxForm", QInstaller.InstallationFinished );
         }
     } catch(e) {
@@ -203,7 +211,7 @@ Component.prototype.installationFinishedPageIsShown = function()
 Component.prototype.installationFinished = function()
 {
     try {
-        if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success && !isRoot()) {
+        if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success && !isroot) {
             var isLaunchQtCreatorCheckBoxChecked = component.userInterface("LaunchQtCreatorCheckBoxForm").launchQtCreatorCheckBox.checked;
             if (isLaunchQtCreatorCheckBoxChecked)
                 installer.executeDetached(component.qtCreatorBinaryPath, new Array(), "@homeDir@");

scripts/createSourcePackages.sh

 #!/bin/bash
 
 ## Command line parameters
-if [[ $# != 1 ]]; then
+if [[ $# != 2 ]]; then
     cat <<USAGE
 usage:
-  $0 <version>
+  $0 <version> <edition>
 
   Creates tar and zip source package from HEAD of the main repository and submodules.
-  Files and directories are named after <version>.
+  Files and directories are named after qt-creator-<edition>-src-<version>.
   example:
-    $0 2.2.0-beta
+    $0 2.2.0-beta opensource
 USAGE
     exit 1
 fi
 
 VERSION=$1
-PREFIX=qt-creator-${VERSION}-src
+EDITION=$2
+PREFIX=qt-creator-${EDITION}-src-${VERSION}
 cd `dirname $0`/..
 RESULTDIR=`pwd`
 TEMPSOURCES=`mktemp -d -t qtcCreatorSourcePackage.XXXXXX`

share/qtcreator/templates/qml/qtquick_1_1/main.qmlproject

-/* File generated by Qt Creator, version 2.7.0 */
+/* File generated by Qt Creator */
 
 import QmlProject 1.1
 

share/qtcreator/templates/qml/qtquick_2_0/main.qmlproject

-/* File generated by Qt Creator, version 2.7.0 */
+/* File generated by Qt Creator */
 
 import QmlProject 1.1
 

share/qtcreator/templates/qml/qtquickcontrols_1_0/main.qmlproject

-/* File generated by Qt Creator, version 2.7.0 */
+/* File generated by Qt Creator */
 
 import QmlProject 1.1
 

share/qtcreator/welcomescreen/examples.qml

@@ -38,10 +38,12 @@ Rectangle {
     CustomizedGridView {
         id: grid
         anchors.rightMargin: 38
-        anchors.bottomMargin: 60
         anchors.leftMargin: 38
-        anchors.topMargin: 82
-        anchors.fill: parent
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: scrollView.height - 82
+        y: scrollView.flickableItem.contentY + 82
+        contentY: scrollView.flickableItem.contentY
 
         model: examplesModel
     }

share/qtcreator/welcomescreen/widgets/Delegate.qml

@@ -117,7 +117,7 @@ Rectangle {
         y: 170
         color: colors.strongForegroundColor
         text: qsTr("2D PAINTING EXAMPLE long description")
-        clip: true
+        elide: Text.ElideRight
         anchors.right: parent.right
         anchors.rightMargin: 16
         anchors.left: parent.left
@@ -330,7 +330,6 @@ Rectangle {
         height: 32
         anchors.left: tags.right
         anchors.leftMargin: 6
-        clip: true
 
         spacing: 2
 
@@ -355,7 +354,7 @@ Rectangle {
                 onClicked: appendTag(modelData)
                 property bool hugeTag: (text.length > 12) && index > 1
                 property bool isExampleTag: text === "example"
-                visible: !hugeTag && !isExampleTag && index < 8
+                visible: !hugeTag && !isExampleTag && index < 8 && y < 32
             }
         }
     }

share/qtcreator/welcomescreen/widgets/Tabs.qml

@@ -51,6 +51,7 @@ Column {
 
             onClicked: {
                 customTab.currentIndex = index
+                checked = true
             }
         }
     }

src/libs/cplusplus/Macro.h

@@ -137,12 +137,6 @@ public:
     void setVariadic(bool isVariadic)
     { f._variadic = isVariadic; }
 
-    bool isPredefined() const
-    { return f._predefined; }
-
-    void setPredefined(bool isPredefined)
-    { f._predefined = isPredefined; }
-
     QString toString() const;
     QString toStringWithLineBreaks() const;
 
@@ -157,7 +151,6 @@ private:
         unsigned _hidden: 1;
         unsigned _functionLike: 1;
         unsigned _variadic: 1;
-        unsigned _predefined: 1;
     };
 
     QByteArray _name;

src/libs/cplusplus/MatchingText.h

@@ -36,9 +36,6 @@ QT_FORWARD_DECLARE_CLASS(QChar)
 
 namespace CPlusPlus {
 
-class BackwardsScanner;
-class TokenCache;
-
 class CPLUSPLUS_EXPORT MatchingText
 {
 public:

src/libs/cplusplus/pp-engine.cpp

@@ -917,21 +917,23 @@ bool Preprocessor::handleIdentifier(PPToken *tk)
             && macroNameRef[0] == '_'
             && macroNameRef[1] == '_') {
         PPToken newTk;
-        QByteArray txt;
         if (macroNameRef == ppLine) {
-            txt = QByteArray::number(tk->lineno);
+            QByteArray txt = QByteArray::number(tk->lineno);
             newTk = generateToken(T_STRING_LITERAL, txt.constData(), txt.size(), tk->lineno, false);
         } else if (macroNameRef == ppFile) {
+            QByteArray txt;
             txt.append('"');
             txt.append(m_env->currentFileUtf8);
             txt.append('"');
             newTk = generateToken(T_STRING_LITERAL, txt.constData(), txt.size(), tk->lineno, false);
         } else if (macroNameRef == ppDate) {
+            QByteArray txt;
             txt.append('"');
             txt.append(QDate::currentDate().toString().toUtf8());
             txt.append('"');
             newTk = generateToken(T_STRING_LITERAL, txt.constData(), txt.size(), tk->lineno, false);
         } else if (macroNameRef == ppTime) {
+            QByteArray txt;
             txt.append('"');
             txt.append(QTime::currentTime().toString().toUtf8());
             txt.append('"');
@@ -939,14 +941,10 @@ bool Preprocessor::handleIdentifier(PPToken *tk)
         }
 
         if (newTk.hasSource()) {
-            Macro macro;
-            macro.setName(macroNameRef.toByteArray());
-            macro.setFileName(m_env->currentFile);
-            macro.setPredefined(true);
-            macro.setDefinition(txt, QVector<PPToken>() << newTk);
-            m_env->bind(macro);
-            if (m_client)
-                m_client->macroAdded(macro);
+            newTk.f.newline = tk->newline();
+            newTk.f.whitespace = tk->whitespace();
+            *tk = newTk;
+            return false;
         }
     }
 

src/plugins/cppeditor/cppeditor.cpp

@@ -797,12 +797,10 @@ const Macro *CPPEditorWidget::findCanonicalMacro(const QTextCursor &cursor, Docu
     if (const Macro *macro = doc->findMacroDefinitionAt(line)) {
         QTextCursor macroCursor = cursor;
         const QByteArray name = identifierUnderCursor(&macroCursor).toLatin1();
-        if (macro->name() == name && !macro->isPredefined())
+        if (macro->name() == name)
             return macro;
     } else if (const Document::MacroUse *use = doc->findMacroUseAt(cursor.position())) {
-        const Macro &macro = use->macro();
-        if (!macro.isPredefined())
-            return &macro;
+        return &use->macro();
     }
 
     return 0;

src/plugins/cppeditor/cppfollowsymbolundercursor.cpp

@@ -592,13 +592,11 @@ BaseTextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor &
             m_widget->showPreProcessorWidget();
         } else if (fileName != CppModelManagerInterface::configurationFileName()) {
             const Macro &macro = use->macro();
-            if (!macro.isPredefined()) {
             link.targetFileName = macro.fileName();
             link.targetLine = macro.line();
             link.linkTextStart = use->begin();
             link.linkTextEnd = use->end();
         }
-        }
         return link;
     }
 

src/plugins/cpptools/cppfindreferences.cpp

@@ -558,8 +558,6 @@ restart_search:
         usages.clear();
         foreach (const Document::MacroUse &use, doc->macroUses()) {
             const Macro &useMacro = use.macro();
-            if (useMacro.isPredefined())
-                continue;
 
             if (useMacro.fileName() == macro.fileName()) { // Check if this is a match, but possibly against an outdated document.
                 if (source.isEmpty())

src/plugins/cpptools/cpphighlightingsupportinternal.cpp

@@ -58,9 +58,6 @@ QFuture<TextEditor::HighlightingResult> CppHighlightingSupportInternal::highligh
 
     // Get macro definitions
     foreach (const CPlusPlus::Macro& macro, doc->definedMacros()) {
-        if (macro.isPredefined())
-            continue; // No "real" definition location
-
         int line, column;
         editor()->convertPosition(macro.offset(), &line, &column);
         ++column; //Highlighting starts at (column-1) --> compensate here

src/plugins/debugger/debuggerprotocol.cpp

@@ -33,7 +33,9 @@
 #include <QDateTime>
 #include <QDebug>
 #include <QHostAddress>
+#if QT_VERSION >= 0x050200
 #include <QTimeZone>
+#endif
 
 #include <ctype.h>
 
@@ -504,6 +506,7 @@ static QTime timeFromData(int ms)
     return ms == -1 ? QTime() : QTime(0, 0, 0, 0).addMSecs(ms);
 }
 
+#if QT_VERSION >= 0x050200
 // Stolen and adapted from qdatetime.cpp
 static void getDateTime(qint64 msecs, int status, QDate *date, QTime *time)
 {
@@ -550,6 +553,7 @@ static void getDateTime(qint64 msecs, int status, QDate *date, QTime *time)
     *date = (status & NullDate) ? QDate() : QDate::fromJulianDay(jd);
     *time = (status & NullTime) ? QTime() : QTime::fromMSecsSinceStartOfDay(ds);
 }
+#endif
 
 QString decodeData(const QByteArray &ba, int encoding)
 {
@@ -678,6 +682,7 @@ QString decodeData(const QByteArray &ba, int encoding)
             return QString::fromUtf8(decodedBa);
         }
         case DateTimeInternal: { // 29, DateTimeInternal: msecs, spec, offset, tz, status
+#if QT_VERSION >= 0x050200
             int p0 = ba.indexOf('/');
             int p1 = ba.indexOf('/', p0 + 1);
             int p2 = ba.indexOf('/', p1 + 1);
@@ -708,6 +713,10 @@ QString decodeData(const QByteArray &ba, int encoding)
                 dateTime = QDateTime(date, time, spec);
             }
             return dateTime.toString();
+#else
+            // "Very plain".
+            return QString::fromLatin1(ba);
+#endif
         }
     }
     qDebug() << "ENCODING ERROR: " << encoding;

src/plugins/fakevim/fakevim_test.cpp

@@ -2219,6 +2219,17 @@ void FakeVimPlugin::test_vim_substitute()
     COMMAND("'<,'>s/^/*", "abc" N "**def" N X "**ghi" N "jkl");
     KEYS("u", "abc" N X "*def" N "*ghi" N "jkl");
     KEYS("gv:s/^/+<CR>", "abc" N "+*def" N X "+*ghi" N "jkl");
+
+    // replace empty string
+    data.setText("abc");
+    COMMAND("s//--/g", "--a--b--c");
+
+    // remove characters
+    data.setText("abc def");
+    COMMAND("s/[abde]//g", "c f");
+    COMMAND("undo | s/[bcef]//g", "a d");
+    COMMAND("undo | s/\\w//g", " ");
+    COMMAND("undo | s/f\\|$/-/g", "abc de-");
 }
 
 void FakeVimPlugin::test_vim_ex_yank()

src/plugins/fakevim/fakevimhandler.cpp

@@ -623,10 +623,22 @@ static bool substituteText(QString *text, QRegExp &pattern, const QString &repla
 {
     bool substituted = false;
     int pos = 0;
+    int right = -1;
     while (true) {
         pos = pattern.indexIn(*text, pos, QRegExp::CaretAtZero);
         if (pos == -1)
             break;
+
+        // ensure that substitution is advancing towards end of line
+        if (right == text->size() - pos) {
+            ++pos;
+            if (pos == text->size())
+                break;
+            continue;
+        }
+
+        right = text->size() - pos;
+
         substituted = true;
         QString matched = text->mid(pos, pattern.cap(0).size());
         QString repl;
@@ -652,7 +664,7 @@ static bool substituteText(QString *text, QRegExp &pattern, const QString &repla
             }
         }
         text->replace(pos, matched.size(), repl);
-        pos += qMax(1, repl.size());
+        pos += (repl.isEmpty() && matched.isEmpty()) ? 1 : repl.size();
 
         if (pos >= text->size() || !global)
             break;

src/plugins/ios/iosconfigurations.cpp

@@ -113,7 +113,8 @@ void IosConfigurations::updateAutomaticKitList()
             iter.next();
             const Platform &p = iter.value();
             if (p.compilerPath == toolchain->compilerCommand()
-                    && p.backendFlags == toolchain->platformCodeGenFlags()) {
+                    && p.backendFlags == toolchain->platformCodeGenFlags()
+                    && !platformToolchainMap.contains(p.name)) {
                 platformToolchainMap[p.name] = toolchain;
                 found = true;
             }
@@ -251,7 +252,7 @@ void IosConfigurations::updateAutomaticKitList()
                 qDebug() << "skipping existing kit with deviceKind " << deviceKind.toString();
             continue;
         }
-        if (!k->isAutoDetected()) // use also used set kits?
+        if (!k->isAutoDetected())
             continue;
         existingKits << k;
         kitMatched << false;
@@ -285,15 +286,20 @@ void IosConfigurations::updateAutomaticKitList()
 
             QList<BaseQtVersion *> qtVersions = qtVersionsForArch.value(arch);
             foreach (BaseQtVersion *qt, qtVersions) {
+                Kit *kitAtt = 0;
                 bool kitExists = false;
                 for (int i = 0; i < existingKits.size(); ++i) {
                     Kit *k = existingKits.at(i);
                     if (DeviceTypeKitInformation::deviceTypeId(k) == pDeviceType
                             && ToolChainKitInformation::toolChain(k) == pToolchain
-                            && SysRootKitInformation::sysRoot(k) == p.sdkPath
                             && QtKitInformation::qtVersion(k) == qt)
                     {
+                        QTC_CHECK(!kitMatched.value(i, true));
+                        // as we generate only two kits per qt (one for device and one for simulator)
+                        // we do not compare the sdk (thus automatically upgrading it in place if a
+                        // new Xcode is used). Change?
                         kitExists = true;
+                        kitAtt = k;
                         if (debugProbe)
                             qDebug() << "found existing kit " << k->displayName() << " for " << p.name
                                      << "," << qt->displayName();
@@ -302,12 +308,13 @@ void IosConfigurations::updateAutomaticKitList()
                         break;
                     }
                 }
-                if (kitExists)
-                    continue;
+                if (kitExists) {
+                    kitAtt->blockNotification();
+                } else {
                     if (debugProbe)
                         qDebug() << "setting up new kit for " << p.name;
-                Kit *newKit = new Kit;
-                newKit->setAutoDetected(true);
+                    kitAtt = new Kit;
+                    kitAtt->setAutoDetected(true);
                     QString baseDisplayName = tr("%1 %2").arg(p.name, qt->displayName());
                     QString displayName = baseDisplayName;
                     for (int iVers = 1; iVers < 100; ++iVers) {
@@ -321,55 +328,45 @@ void IosConfigurations::updateAutomaticKitList()
                         if (unique) break;
                         displayName = baseDisplayName + QLatin1String("-") + QString::number(iVers);
                     }
-                newKit->setDisplayName(displayName);
-                newKit->setIconPath(Utils::FileName::fromString(
+                    kitAtt->setDisplayName(displayName);
+                }
+                kitAtt->setIconPath(Utils::FileName::fromString(
                                         QLatin1String(Constants::IOS_SETTINGS_CATEGORY_ICON)));
-                DeviceTypeKitInformation::setDeviceTypeId(newKit, pDeviceType);
+                DeviceTypeKitInformation::setDeviceTypeId(kitAtt, pDeviceType);