Merge commit 'bd8b23d4bad4191367e7c5eb3297769a2477afec' (origin/2.1)

Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

doc/qtcreator.qdoc

@@ -67,7 +67,7 @@
            \list
                \o \l{Building and Running an Example Application}
                \o \l{Creating a Qt C++ Application}
-               \o \l{Creating a Mobile Application with Qt SDK}
+               \o \l{Creating a Mobile Application with Nokia Qt SDK}
                \o \l{Creating a Qt Quick Application}
            \endlist
        \o \l{Managing Projects}
@@ -328,7 +328,7 @@
     desktop environment (Windows, Linux, and Mac OS) and mobile devices (Symbian, Maemo,
     and MeeGo). Build settings allow you to quickly switch between build targets.
 
-    When you build an application for a mobile device target with a device
+    When you run an application for a mobile device target with a device
     connected to the development PC, Qt Creator generates an installation package,
     installs in on the device, and executes it.
 
@@ -474,13 +474,10 @@
 
          \omit  ## Are the Xcode tools still needed separately? \endomit
 
-    \section1 Build Environment
+    \section1 Compiling Qt Creator from Source
 
-    To build Qt Creator itself from the source, you need:
+    To build Qt Creator itself from the source, see the requirements and
-    \list
+    instructions in the readme file that is located in the source repository.
-        \o Qt 4.7 or later
-        \o On Windows, MinGW 4.4 or Microsoft Visual Studio 2008
-    \endlist
 
     \section1 Supported Mobile Device Platforms
     You can develop applications for the following mobile device
@@ -2635,7 +2632,7 @@
     \section3 Troubleshooting MinGW Compilation Errors
 
     If error messages displayed in the \gui {Compile Output} pane contain
-    paths where slashes are missing (for example, C:QtSDK),
+    paths where slashes are missing (for example, C:NokiaQtSDK),
     check your PATH variable. At the command line, enter the following commands:
 
     \code
@@ -3042,7 +3039,7 @@
     In the details of the run configuration for the \gui{Symbian Device} target,
     select the device to run your application on.
 
-    When you build the application for the \gui{Symbian Device} target, Qt
+    When you run the application for the \gui{Symbian Device} target, Qt
     Creator automatically generates a Symbian installation system (SIS) file
     in the project folder. You can deliver the installation file to users for
     installation on Symbian devices.
@@ -3308,7 +3305,7 @@
 
     \section3 Creating SIS Installation Packages
 
-    When you build the application for the \gui{Symbian Device} target, Qt
+    When you run the application for the \gui{Symbian Device} target, Qt
     Creator automatically generates a Symbian installation system (SIS) file
     in the project folder. You can deliver the installation file to users for
     installation on Symbian devices.
@@ -3594,7 +3591,7 @@
     \list
         \o \l{Building and Running an Example Application}
         \o \l{Creating a Qt C++ Application}
-        \o \l{Creating a Mobile Application with Qt SDK}
+        \o \l{Creating a Mobile Application with Nokia Qt SDK}
         \o \l{Creating a Qt Quick Application}
     \endlist
 
@@ -3607,7 +3604,7 @@
     \page creator-mobile-example.html
     \nextpage creator-qml-application.html
 
-    \title Creating a Mobile Application with Qt SDK
+    \title Creating a Mobile Application with Nokia Qt SDK
 
     \note To complete this tutorial, you must install \QSDK.
     The installation program installs and configures the necessary tool chains
@@ -3905,13 +3902,13 @@
 
     \note To complete this tutorial, you must have Qt 4.7 or later installed.
 
-    This tutorial uses basic elements and illustrates basic concepts of the
+    This tutorial uses basic elements and illustrates basic concepts of
-    \l {http://doc.qt.nokia.com/4.7/qtquick.html}{QML declarative language}.
+    \l {http://doc.qt.nokia.com/4.7/qtquick.html}{Qt Quick}.
 
     This tutorial describes how to use the Qt Creator to implement the
     \l{http://doc.qt.nokia.com/4.7-snapshot/declarative-animation-states.html}
-    {states and transitions example application}. The example application displays a user
+    {states and transitions example application}. The example application displays a
-    icon that moves between three rectangles on the page when you click them.
+    Qt logo that moves between three rectangles on the page when you click them.
 
     \image qmldesigner-tutorial.png "States and transitions example"
 
@@ -3935,13 +3932,13 @@
 
     \section1 Creating the Main View
 
-    The main view of the application displays a user icon in the top left corner of the
+    The main view of the application displays a Qt logo in the top left corner of the
     screen and two empty rectangles.
 
-    To use the user.png image in your application, you must copy it to the project
+    To use the states.png image in your application, you must copy it to the project
-    directory from the \c {\qt\examples\declarative\animation\states} directory in the
+    directory from the examples directory in the
     Qt installation directory. For example:
-    \c {C:\Qt\2010.05\qt\examples\declarative\animation\states}. The image appears
+    \c {C:\NokiaQtSDK\Examples\4.7\declarative\animation\states}. The image appears
     in the \gui Resources pane. You can also use any other image or a QML element, instead.
 
     \list 1
@@ -3964,19 +3961,27 @@
             \o In the \gui Id field, enter \e page, to be able to reference the rectangle
             from other places.
 
-            \o In the \gui Size field, set \gui W to 640 and \gui H to 480.
-
             \o In the \gui Colors tab, \gui Rectangle field, set the color to #343434.
 
         \endlist
 
-        \o Drag and drop user.png from \gui Resources to the canvas.
+        \o In the \gui Library view, \gui Resources tab, select states.png and
+        drag and drop it to the canvas.
 
-        \o In the \gui Id field, enter \e userIcon.
+        \image qmldesigner-tutorial-user-icon.png "Image properties"
 
-        \image qmldesigner-tutorial-user-icon.png "User icon properties"
+        \list a
 
-        \o Drag and drop a \gui Rectangle element to the canvas, and edit its properties.
+            \o In the \gui Id field, enter \e icon.
+
+            \o In the \gui Position field, set \gui X to 10 and \gui Y to 20.
+
+        \endlist
+
+
+
+        \o In the \gui Library view, \gui Items tab, select \gui Rectangle,
+         drag and drop it to the canvas, and edit its properties.
 
         \image qmldesigner-tutorial-topleftrect.png "Rectangle properties"
 
@@ -3996,6 +4001,11 @@
             \o In the \gui Rectangle tab, \gui Border field, set the border width to
             1.
 
+            \note If the \gui Border field does not appear after you set the border
+            color, try setting the border color to solid by clicking the
+            \inlineimage qmldesigner-solid-color-button.png
+            button.
+
             \o In the \gui Radius field, select 6 to create rounded corners for the
             rectangle.
 
@@ -4004,12 +4014,16 @@
 
             \image qmldesigner-tutorial-topleftrect-layout.png "Layout tab"
 
-            \o In the \gui Margin field for the top anchor, select 20.
+            \o In the \gui Margin field, select 20 for the top anchor and 10 for
+            the left anchor.
 
         \endlist
 
-        \o Drag and drop a \gui {Mouse Area} element on top of the rectangle,
+        \o In the \gui Navigator pane, drag and drop the \gui {Mouse Area} element from
-        and edit its properties:
+        \e page to \e topLeftRect to make it apply only to the rectangle and not to the whole
+        page.
+
+        \o Edit \gui {Mouse Area} properties:
 
         \list a
 
@@ -4017,13 +4031,12 @@
             \inlineimage qmldesigner-anchor-fill-screen.png
             button to anchor the mouse area to the rectangle.
 
-            \o In the code editor, add a pointer to a clicked expression to the mouse
+            \o In the code editor, edit the pointer to the clicked expression in the mouse
             area element, as illustrated by the following code snippet:
 
             \code
 
             MouseArea {
-                id: mouse_area1
                 anchors.fill: parent
                 onClicked: page.state = ''
             }
@@ -4035,23 +4048,8 @@
 
         \endlist
 
-    \o To make sure that the user icon appears within the rectangle even if the screen
+    \o In the \gui Navigator pane, copy topLeftRect (by pressing \key {Ctrl+C}) and
-    size changes, you can anchor the icon to the x and y coordinates of the rectangle:
+    paste it to the canvas twice
-
-        \list a
-
-        \o In the \gui Navigator, select userIcon.
-
-        \o In the \gui Geometry tab, \gui {Position X} field, open the menu and select
-        \gui {Set Expression}.
-
-        \o Enter the following expression: \c {topLeftRect.x}
-
-        \o In the \gui Y field, set the following expression: \c {topLeftRect.y}
-
-        \endlist
-
-    \o Copy topLeftRect (by pressing \key {Ctrl+C}) and paste it to the canvas twice
     (by pressing \key {Ctrl+V}). Qt Creator renames the new instances of the element
     topLeftRect1 and topLeftRect2.
 
@@ -4064,7 +4062,10 @@
             \o In \gui {Layout}, select the right and vertical center anchor buttons to
             anchor the rectangle to the middle right margin of the screen.
 
-            \o In the code editor, modify the pointer to the clicked expression in the
+            \o In the \gui Margin field, select 10 for the right anchor and 0 for
+            the vertical center anchor.
+
+            \o In the code editor,add a pointer to a clicked expression to the
             mouse area element. The following expression sets the state to \e State1:
 
             \c {onClicked: page.state = 'State1'}
@@ -4082,7 +4083,10 @@
             \o In \gui {Layout}, select the bottom and left anchor buttons to
             anchor the rectangle to the bottom left margin of the screen.
 
-            \o In the code editor, modify the pointer to a clicked expression in the
+            \o In the \gui Margin field, select 20 for the bottom anchor and 10 for
+            the left anchor.
+
+            \o In the code editor, add a pointer to a clicked expression to the
             mouse area element. The following expression sets the state to \e State2:
 
             \c {onClicked: page.state = 'State2'}
@@ -4091,13 +4095,15 @@
 
         \endlist
 
+    \o Press \key {Ctrl+S} to save the changes.
+
     \o Press \key {Ctrl+R} to run the application in the QML Viewer.
 
     \endlist
 
     \image qmldesigner-tutorial.png "States and transitions example"
 
-    You should see the user icon in the top left rectangle, and two additional
+    You should see the Qt logo in the top left rectangle, and two additional
     rectangles in the center right and bottom left of the screen.
 
     You can now create additional states to add views to the application.
@@ -4111,31 +4117,31 @@
 
         \o Click the empty slot in the \gui States pane to create State1.
 
-        \o Drag and drop the user icon on top of middleRightRect.
+        \o Drag and drop the Qt logo on top of middleRightRect.
 
         \image qmldesigner-tutorial-state1.png "State 1"
 
         \o Click the empty slot in the \gui States pane to create State2.
 
-        \o Drag and drop the user icon on top of bottomLeftRect.
+        \o Drag and drop the Qt logo on top of bottomLeftRect.
 
     \o Press \key {Ctrl+R} to run the application in the QML Viewer.
 
     \endlist
 
-    Click the rectangles to move the user icon from one rectangle to another.
+    Click the rectangles to move the Qt logo from one rectangle to another.
 
     \section1 Adding Animation to the View
 
-    Add transitions to define how the properties change when the user icon moves
+    Add transitions to define how the properties change when the Qt logo moves
-    between states. The transitions apply animations to the user icon. For example,
+    between states. The transitions apply animations to the Qt logo. For example,
-    the user icon bounces back when it moves to the middleRightRect and eases into
+    the Qt logo bounces back when it moves to the middleRightRect and eases into
     bottomLeftRect. Add the transitions in the code editor.
 
     \list 1
 
         \o In the code editor, add the following code to specify that when moving to
-        State1, the x and y coordinates of the user icon change linearly over a duration
+        State1, the x and y coordinates of the Qt logo change linearly over a duration
         of 1 second:
 
         \code
@@ -4156,9 +4162,9 @@
 
         \list a
 
-            \o Select NumberAnimation and click
+            \o Click \gui NumberAnimation in the code editor to display the
             \inlineimage qml-toolbar-indicator.png
-            to open the toolbar:
+            icon, and then click the icon to open the toolbar:
 
             \image qmldesigner-tutorial-quick-toolbar.png "Qt Quick toolbar for animation"
 
@@ -4169,7 +4175,7 @@
         \endlist
 
         \o Add the following code to specify that when moving to State2, the x and y
-        coordinates of the user icon change over a duration of 2 seconds,
+        coordinates of the Qt logo change over a duration of 2 seconds,
         and an InOutQuad easing function is used:
 
         \code
@@ -4186,7 +4192,7 @@
         \endcode
 
         \o Add the following code to specify that for any other state changes, the x
-        and y coordinates of the user icon change linearly over a duration of 200
+        and y coordinates of the Qt logo change linearly over a duration of 200
         milliseconds:
 
         \code
@@ -4197,6 +4203,7 @@
                 duration: 200
             }
         }
+        ]
 
         \endcode
 
@@ -6173,7 +6180,7 @@
     \c{PATH} environment variable to include the bin folders of \c mingw and
     Qt Creator in the SDK.
 
-    For instance, if you have the Qt Creator SDK installed in your C drive,
+    For instance, if you have the Qt SDK installed in your C drive,
     use the following command to set the environment variables in
     the command line prompt:
     \code
@@ -6273,7 +6280,12 @@
 
     \c {DEFINES += QMLJSDEBUGGER}.
 
-    Then you must rebuild the project.
+    Then you must rebuild the project in debug mode. Select a debug configuration for
+    the target in the \gui {Target selector}.
+
+    \image qtcreator-target-selector-debug.png "Target selector"
+
+    You can create debug configurations for project targets in the \gui Projects mode.
 
     To enable QML debugging for  both types of projects, select \gui Projects, and
     then select the \gui QML check box in the run settings.
@@ -8416,7 +8428,7 @@
         you installed \QSDK, Qt Creator, and MADDE.
 
         \o If error messages displayed in the \gui {Compile Output} pane contain
-        paths where slashes are missing (for example, C:QtSDK),
+        paths where slashes are missing (for example, C:NokiaQtSDK),
         check your PATH variable. For more information, see
         \l{Troubleshooting MinGW Compilation Errors}.
 

doc/qtcreator.qdocconf

@@ -89,7 +89,7 @@ macro.QL                = "\\e{Qt Linguist}"
 macro.QC		= "\\e{Qt Creator}"
 macro.QMLD		= "\\e{Qt Quick Designer}"
 macro.QQV               = "\\e{Qt QML Viewer}"
-macro.QSDK              = "\\e{Qt SDK}"
+macro.QSDK              = "\\e{Nokia Qt SDK}"
 macro.param             = "\\e"
 macro.raisedaster.HTML  = "<sup>*</sup>"
 macro.reg.HTML          = "<sup>&reg;</sup>"

doc/symbiandev.qdoc

@@ -66,7 +66,6 @@
          delivered with the \QSDK
          \o \e {Qt Mobility APIs} installed on the device, if you use them in
          applications
-         \o \QQV to run Qt Quick applications on Symbian^3 devices.
     \endlist
 
     \if defined(qcmanual)
@@ -87,32 +86,26 @@
         or PC Suite, all the necessary drivers are installed automatically.
         This takes approximately one minute.
 
-        \o Choose \gui {Start > Qt SDK > Symbian > Install Qt 4.7.1 to Symbian^1
+        \o Choose \gui {Start > Qt SDK > Symbian > Install Qt to Symbian
-        Device} or \gui {Install Qt 4.7.1 to Symbian^3 Device}, depending on the
+        Device}. Follow the instructions on the screen to install Qt
-        device type. Follow the instructions on the screen to install Qt
         libraries to the device.
 
-        \o Choose \gui {Start > Qt SDK > Symbian > Install QtMobility 1.1.0 to
+        \o Choose \gui {Start > Qt SDK > Symbian > Install QtMobility to
-        Symbian^1 Device} or \gui {Install QtMobility 1.1.0 to Symbian^3 Device}
+        Symbian 1 Device}
         and follow the instructions on the screen to install Qt
         mobility libraries to the device.
 
         \o Choose \gui {Start > Qt SDK > Symbian > Install TRK (Debug Agent)
-        to Symbian^1 Device} or \gui {Install TRK (Debug Agent) to Symbian^3
+        to Symbian Device} and follow the instructions on the screen to install the TRK
-        Device} and follow the instructions on the screen to install the TRK
         debugging application to the device.
 
-        \o Choose \gui {Start > Qt SDK > Symbian > Install QML Viewer
-        to Symbian^3 Device} and follow the instructions on the screen to
-        install \QQV to the device.
-
         \note To check the Symbian platform version of your device, see
         \l{http://www.forum.nokia.com/devices}{Device Details}.
 
     \endlist
 
     \note If errors occur during the installation, copy the .sis files from
-    \c {<QtSDK_install_path>\Symbian\sis} to the device using USB storage
+    \c {<NokiaQtSDK_install_path>\Symbian\sis} to the device using USB storage
     mode. Then install them from the file manager on the device.
 
     \if defined(qcmanual)

scripts/createSrcAndDocPackage.sh

@@ -4,12 +4,12 @@
 if [[ $# != 2 ]]; then
     cat <<USAGE
 usage:
-  $0 <branch> <version>
+  $0 <refspec> <version>
 
-  Creates tar and zip source package from origin/<branch> and documentation-zip from current checkout.
+  Creates tar and zip source package from <refspec> and documentation-zip from current checkout.
   Files and directories are named after <version>.
   example:
-    $0 2.0.0 2.0.0-rc1
+    $0 origin/2.0.0 2.0.0-rc1
 USAGE
     exit 1
 fi
@@ -18,9 +18,9 @@ BRANCH=$1
 VERSION=$2
 cd `dirname $0`/..
 echo "Creating tar archive..."
-git archive --format=tar --prefix=qt-creator-${VERSION}-src/ origin/${BRANCH} | gzip > qt-creator-${VERSION}-src.tar.gz || exit 1
+git archive --format=tar --prefix=qt-creator-${VERSION}-src/ ${BRANCH} | gzip > qt-creator-${VERSION}-src.tar.gz || exit 1
 echo "Creating zip archive..."
-git archive --format=zip --prefix=qt-creator-${VERSION}-src/ origin/${BRANCH} > qt-creator-${VERSION}-src.zip || exit 1
+git archive --format=zip --prefix=qt-creator-${VERSION}-src/ ${BRANCH} > qt-creator-${VERSION}-src.zip || exit 1
 echo "Creating documentation..."
 rm -r doc/html
 qmake -r && make docs_online || exit 1

share/qtcreator/translations/qtcreator_ru.ts

@@ -141,7 +141,7 @@ Decimal signed value (big endian): %4</source>
     </message>
     <message>
         <source>SpringFollow</source>
-        <translation type="unfinished">Упругое изменение</translation>
+        <translation>Упругое изменение</translation>
     </message>
     <message>
         <source>Settings</source>
@@ -1610,7 +1610,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
     <message>
         <source>When Triggered</source>
-        <translation type="unfinished">При срабатывании</translation>
+        <translation>По необходимости</translation>
     </message>
     <message>
         <source>Always</source>
@@ -15864,9 +15864,9 @@ Remote stderr was: &apos;%1&apos;</source>
         <source>Your project name contains characters not allowed in Debian packages.
 They must only use lower-case letters, numbers, &apos;-&apos;, &apos;+&apos; and &apos;.&apos;.
 We will try to work around that, but you may experience problems.</source>
-        <translation type="unfinished">Название проекта содержит недопустимые для пакетов Debian символы.
+        <translation>Название проекта содержит недопустимые для пакетов Debian символы.
 Допустимы только буквы в нижнем регистре, числа, &quot;-&quot;, &quot;+&quot; и &quot;.&quot;.
-Будет предпринята попытка обойти это, но, возможно, имеется недостаток опыта.</translation>
+Будет предпринята попытка обойти это, но возможны проблемы.</translation>
     </message>
 </context>
 <context>
@@ -16310,19 +16310,19 @@ stderr was: %1</source>
     </message>
     <message>
         <source>Mounting host directories...</source>
-        <translation type="unfinished">Монтирование каталогов узла...</translation>
+        <translation>Монтирование каталогов компьютера...</translation>
     </message>
     <message>
         <source>Unmounting left-over host directory mounts...</source>
-        <translation type="unfinished">Отмонтирование оставшихся каталогов узла...</translation>
+        <translation>Отмонтирование оставшихся каталогов компьютера...</translation>
     </message>
     <message>
         <source>Potentially unmounting left-over host directory mounts...</source>
-        <translation type="unfinished">Потенциальное отмонтирование оставшихся каталогов узла...</translation>
+        <translation>Потенциальное отмонтирование оставшихся каталогов компьютера...</translation>
     </message>
     <message>
         <source>Unmounting host directories...</source>
-        <translation type="unfinished">Отмонтирование каталогов узла...</translation>
+        <translation>Отмонтирование каталогов компьютера...</translation>
     </message>
     <message>
         <source>Cannot run: No remote executable set.</source>
@@ -18603,7 +18603,7 @@ Server list was %2.</source>
     </message>
     <message>
         <source>Wrap Mode</source>
-        <translation type="unfinished">Режим переноса</translation>
+        <translation>Режим переноса</translation>
     </message>
     <message>
         <source></source>
@@ -18611,11 +18611,11 @@ Server list was %2.</source>
     </message>
     <message>
         <source>Aliasing</source>
-        <translation type="unfinished">Ступенчатость</translation>
+        <translation>Сглаживание</translation>
     </message>
     <message>
         <source>Smooth</source>
-        <translation type="unfinished">Гладкий</translation>
+        <translation>Использовать</translation>
     </message>
     <message>
         <source>Alignment</source>

src/plugins/coreplugin/ssh/sshkeygenerator.cpp

@@ -67,7 +67,7 @@ bool SshKeyGenerator::generateKeys(KeyType type, PrivateKeyFormat format,
         if (m_type == Rsa)
             key = KeyPtr(new RSA_PrivateKey(rng, keySize));
         else
-            key = KeyPtr(new DSA_PrivateKey(rng, DL_Group(rng, DL_Group::Strong,
+            key = KeyPtr(new DSA_PrivateKey(rng, DL_Group(rng, DL_Group::DSA_Kosherizer,
                 keySize)));
         return m_format == Pkcs8
             ? generatePkcs8Keys(key) : generateOpenSslKeys(key);

src/plugins/debugger/qml/qmlengine.cpp

@@ -471,8 +471,14 @@ void QmlEngine::attemptBreakpointSynchronization()
     JSAgentBreakpoints breakpoints;
     foreach (BreakpointId id, handler->engineBreakpointIds(this)) {
         QString processedFilename = handler->fileName(id);
+#ifdef Q_OS_MACX
+        // Qt Quick Applications by default copy the qml directory to buildDir()/X.app/Contents/Resources
+        const QString applicationBundleDir
+                = QFileInfo(startParameters().executable).absolutePath() + "/../..";
+        processedFilename = mangleFilenamePaths(handler->fileName(id), startParameters().projectDir, applicationBundleDir + "/Contents/Resources");
+#endif
         if (isShadowBuildProject())
-            processedFilename = toShadowBuildFilename(handler->fileName(id));
+            processedFilename = toShadowBuildFilename(processedFilename);
         JSAgentBreakpointData bp;
         bp.fileName = processedFilename.toUtf8();
         bp.lineNumber = handler->lineNumber(id);
@@ -822,7 +828,7 @@ QString QmlEngine::mangleFilenamePaths(const QString &filename,
 
     if (oldBaseDir.exists() && newBaseDir.exists() && fileInfo.exists()) {
         if (fileInfo.absoluteFilePath().startsWith(oldBaseDir.canonicalPath())) {
-            QString fileRelativePath = fileInfo.canonicalFilePath().mid(oldBasePath.length());
+            QString fileRelativePath = fileInfo.canonicalFilePath().mid(oldBaseDir.canonicalPath().length());
             QFileInfo projectFile(newBaseDir.canonicalPath() + QLatin1Char('/') + fileRelativePath);
 
             if (projectFile.exists())
@@ -837,7 +843,14 @@ QString QmlEngine::fromShadowBuildFilename(const QString &filename) const
     QString newFilename = filename;
     QString importPath = qmlImportPath();
 
-    newFilename = mangleFilenamePaths(filename, startParameters().projectBuildDir, startParameters().projectDir);
+#ifdef Q_OS_MACX
+    // Qt Quick Applications by default copy the qml directory to buildDir()/X.app/Contents/Resources
+    const QString applicationBundleDir
+                = QFileInfo(startParameters().executable).absolutePath() + "/../..";
+    newFilename = mangleFilenamePaths(newFilename, applicationBundleDir + "/Contents/Resources", startParameters().projectDir);
+#endif
+    newFilename = mangleFilenamePaths(newFilename, startParameters().projectBuildDir, startParameters().projectDir);
+
     if (newFilename == filename && !importPath.isEmpty()) {
         newFilename = mangleFilenamePaths(filename, startParameters().projectBuildDir, importPath);
     }