Merge remote branch 'origin/2.1'

doc/qtcreator.qdoc

@@ -502,44 +502,53 @@
     To build Qt Creator itself from the source, see the requirements and
     instructions in the readme file that is located in the source repository.
 
-    \section1 Supported Mobile Device Platforms
-    You can develop applications for the following mobile device
-    platforms:
+    \section1 Supported Platforms
+
+    You can develop applications for the following platforms:
 
     \list
 
-    \o Symbian
+        \o Desktop
+
+        \o Qt Simulator
 
-    \o Maemo and Maemo Application Development and Debugging Environment (MADDE)
+        \o Maemo 5
+
+        \o Symbian
 
     \endlist
 
-    The following table summarizes operating system support for building
+    The following table summarizes operating system support for developing
     applications for mobile device platforms.
 
     \table
         \header
-            \o {1,3} Operating system
-            \o {3,1} Platform
+            \o {1,4} Operating system
+            \o {4,1} Platform
         \header
             \o Desktop
-            \o Symbian
+            \o Qt Simulator
             \o Maemo
+            \o Symbian
+
         \row
             \o Windows
             \o Yes
             \o Yes
             \o Yes
+            \o Yes
         \row
             \o Linux
             \o Yes
-            \o No
             \o Yes
+            \o Yes
+            \o Yes (by using Remote Compiler for building)
         \row
             \o Mac OS X
             \o Yes
-            \o No
             \o Yes
+            \o Yes
+            \o Yes (by using Remote Compiler for building)
     \endtable
 */
 
@@ -6261,8 +6270,10 @@
             and .ui files
         \o  Class and method definitions in your project or anywhere referenced
             from your project
+        \o  Class and method definitions in the current document
         \o  Help topics, including Qt documentation
         \o  Specific line in the document displayed in your editor
+
     \endlist
 
     To use a specific locator filter, type the assigned prefix followed by
@@ -6305,6 +6316,10 @@
             \o  Go to a symbol definition.
             \o  \tt{\bold{: \e{Symbol name}}}
             \o  \image qtcreator-locator-symbols.png
+        \row
+            \o  Go to a symbol definition in the current file.
+            \o  \tt{\bold{. \e{Symbol name}}}
+            \o  \image qtcreator-locator-method-list.png
         \row
             \o  Go to a help topic.
             \o  \tt{\bold{? \e{Help topic}}}

share/qtcreator/templates/shared/deployment.pri

@@ -19,8 +19,8 @@ for(deploymentfolder, DEPLOYMENTFOLDERS) {
 MAINPROFILEPWD = $$PWD
 
 symbian {
-    ICON = $${TARGET}.svg
-    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+    isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
+    isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
     contains(DEFINES, ORIENTATIONLOCK):LIBS += -lavkon -leikcore -lcone
     contains(DEFINES, NETWORKACCESS):TARGET.CAPABILITY += NetworkServices
 } else:win32 {

src/app/main.cpp

@@ -254,7 +254,7 @@ int main(int argc, char **argv)
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
     QUrl proxyUrl(QString::fromLatin1(qgetenv("http_proxy")));
     if (proxyUrl.isValid()) {
-        QNetworkProxy proxy(QNetworkProxy::HttpCachingProxy, proxyUrl.host(),
+        QNetworkProxy proxy(QNetworkProxy::HttpProxy, proxyUrl.host(),
                             proxyUrl.port(), proxyUrl.userName(), proxyUrl.password());
         QNetworkProxy::setApplicationProxy(proxy);
     }

src/plugins/projectexplorer/customwizard/customwizardparameters.cpp

@@ -664,6 +664,7 @@ CustomWizardParameters::ParseResult
             case ParseWithinFields:  // Leaving a field element
                 fields.push_back(field);
                 field.clear();
+                comboEntryCount = 0;
                 break;
             case ParseWithinComboEntries:
                 comboEntryCount++;

src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp

@@ -69,7 +69,7 @@ const QString AbstractMobileApp::ProFileComment(QLatin1String("#"));
 const QString AbstractMobileApp::DeploymentPriFileName(QLatin1String("deployment.pri"));
 const QString AbstractMobileApp::FileChecksum(QLatin1String("checksum"));
 const QString AbstractMobileApp::FileStubVersion(QLatin1String("version"));
-const int AbstractMobileApp::StubVersion = 2;
+const int AbstractMobileApp::StubVersion = 3;
 
 AbstractMobileApp::AbstractMobileApp()
     : m_orientation(ScreenOrientationAuto), m_networkEnabled(false)

src/shared/proparser/profileparser.cpp

@@ -422,7 +422,7 @@ bool ProFileParser::read(ProFile *pro, const QString &in)
             } while (c == ' ' || c == '\t');
             forever {
                 if (c == '$') {
-                    if (*cur == '$') { // may be EOF, EOL, WS or '#' if past end
+                    if (*cur == '$') { // may be EOF, EOL, WS, '#' or '\\' if past end
                         cur++;
                         if (putSpace) {
                             putSpace = false;
@@ -541,7 +541,7 @@ bool ProFileParser::read(ProFile *pro, const QString &in)
                         xprPtr = ptr;
                         goto nextChr;
                     }
-                } else if (c == '\\') {
+                } else if (c == '\\' && cur != end) {
                     static const char symbols[] = "[]{}()$\\'\"";
                     ushort c2 = *cur;
                     if (!(c2 & 0xff00) && strchr(symbols, c2)) {