Merge remote-tracking branch 'origin/2.7'

share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri

@@ -1,6 +1,6 @@
 
 QT += core gui widgets qml quick network v8
-contains (QT_CONFIG, webkit) {
+!isEmpty(QT.webkit.name) {
     QT += webkit
 }
 

share/qtcreator/snippets/cpp.xml

@@ -71,5 +71,5 @@ case $value$:
 default:
     break;
 }</snippet>
-<snippet group="C++" trigger="Q_PROPERTY" id="cpp_q_property">Q_PROPERTY($name$ READ $name$ WRITE set$name$ NOTIFY $name$Changed);</snippet>
+<snippet group="C++" trigger="Q_PROPERTY" id="cpp_q_property">Q_PROPERTY($type$ $name$ READ $name$ WRITE set$name$ NOTIFY $name$Changed);</snippet>
 </snippets>

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

@@ -39,7 +39,9 @@ leave room for the Qt 4 target page.
         id="QtQuick1ExtensionPlugin" category="G.Libraries"
         featuresRequired="QtSupport.Wizards.FeatureQtQuick,QtSupport.Wizards.FeatureQtQuick.1">
     <icon>lib.png</icon>
-    <description>Creates a C++ plugin that makes it possible to offer extensions that can be loaded dynamically into applications using the QDeclarativeEngine class.</description>
+    <description>Creates a C++ plugin that makes it possible to offer extensions that can be loaded dynamically into applications using the QDeclarativeEngine class.
+
+    Requires &lt;b&gt;Qt 4.7.0&lt;/b&gt; or newer.</description>
     <displayname>Qt Quick 1 Extension Plugin</displayname>
     <displaycategory>Libraries</displaycategory>
     <files>

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

@@ -39,7 +39,9 @@ leave room for the Qt 4 target page.
         id="QtQuick2ExtensionPlugin" category="G.Libraries"
         featuresRequired="QtSupport.Wizards.FeatureQtQuick,QtSupport.Wizards.FeatureQtQuick.2">
     <icon>lib.png</icon>
-    <description>Creates a C++ plugin that makes it possible to offer extensions that can be loaded dynamically into applications using the QQmlEngine class.</description>
+    <description>Creates a C++ plugin that makes it possible to offer extensions that can be loaded dynamically into applications using the QQmlEngine class.
+
+    Requires &lt;b&gt;Qt 5.0&lt;/b&gt; or newer.</description>
     <displayname>Qt Quick 2 Extension Plugin</displayname>
     <displaycategory>Libraries</displaycategory>
     <files>

src/plugins/debugger/debuggerkitinformation.cpp

@@ -295,6 +295,8 @@ static const char binaryKeyC[] = "Binary";
 DebuggerKitInformation::DebuggerItem DebuggerKitInformation::variantToItem(const QVariant &v)
 {
     DebuggerItem result;
+    if (v.isNull())
+        return result;
     if (v.type() == QVariant::String) { // Convert legacy config items, remove later.
         const QString binary = v.toString();
         result.binary = Utils::FileName::fromString(binary);

src/plugins/plugins.pro

@@ -64,7 +64,7 @@ linux-* {
 
 include(../../qtcreator.pri)
 
-contains(QT_CONFIG, declarative) {
+contains(QT_CONFIG, declarative)|!isEmpty(QT.declarative.name) {
     SUBDIRS += \
             plugin_qmlprojectmanager \
             plugin_qmlprofiler

src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp

@@ -78,6 +78,7 @@ void FormEditorScene::setupScene()
     m_formLayerItem = new LayerItem(this);
     m_manipulatorLayerItem = new LayerItem(this);
     m_manipulatorLayerItem->setZValue(1.0);
+    m_manipulatorLayerItem->setFlag(QGraphicsItem::ItemClipsChildrenToShape, false);
     m_formLayerItem->setZValue(0.0);
     m_formLayerItem->setFlag(QGraphicsItem::ItemClipsChildrenToShape, false);
 }

src/plugins/qmldesigner/components/formeditor/formeditorview.cpp

@@ -178,11 +178,15 @@ void FormEditorView::modelAboutToBeDetached(Model *model)
     m_moveTool->clear();
     m_resizeTool->clear();
     m_dragTool->clear();
+    foreach (AbstractCustomTool *customTool, m_customToolList)
+        customTool->clear();
     m_scene->clearFormEditorItems();
     m_formEditorWidget->updateActions();
     m_formEditorWidget->resetView();
     scene()->resetScene();
 
+    m_currentTool = m_selectionTool;
+
     QmlModelView::modelAboutToBeDetached(model);
 }
 

tests/manual/debugger/simple/simple_test_app.pro

@@ -10,7 +10,7 @@ QT += network
 QT += script
 QT += xml
 
-contains(QT_CONFIG, webkit) {
+contains(QT_CONFIG, webkit)|!isEmpty(QT.webkit.name) {
     QT += webkit
     greaterThan(QT_MAJOR_VERSION, 4) {
         QT += webkitwidgets

tests/system/README

@@ -11,7 +11,10 @@ On Linux/Mac this is ~/QtSDK, and on Windows this is C:\QtSDK.
 After installing the QtSDK you should use the package manager of the QtSDK (SDKMaintenanceTool) to add some more packages.
 You'll need at least Desktop Qt versions 4.7.4, 4.8.0, Harmattan stuff (except QEmu), Maemo Toolchain, Qt Examples, Simulator, Documentation files.
 
-Third - you'll have to provide some additional repositories (and for the hooking into subprocesses even some more Squish bundles, see below).
+Third - some of the test suites/test cases expect Qt 5.0.1 installed in its default location.
+On Linux/Mac this is ~/Qt5.0.1, and on Windows this is C:\Qt\5.0.1.
+
+Fourth - you'll have to provide some additional repositories (and for the hooking into subprocesses even some more Squish bundles, see below).
 These additional repositories are located inside ~/QtSDK/src or C:\QtSDK\src (depending on the OS you're on).
 You can also just provide them inside a different folder and specify the folder with the environment variable SYSTEST_SRCPATH.
 This folder must contain the following:
@@ -20,7 +23,7 @@ This folder must contain the following:
  * a speedcrunch repository (or source copy) inside 'creator-test-data' named 'speedcrunch'
  * additional Squish versions for hooking into subprocesses inside different folders inside 'creator-test-data' following the information below
 
-Fourth - you'll have to make sure that some needed tools are available (no matter on which OS you're on).
+Fifth - you'll have to make sure that some needed tools are available (no matter on which OS you're on).
  * cmake
  * wget or curl
 Normally it should be okay to just install them as usual and add their executables' path(s) to the PATH variable.

tests/system/settings/unix/QtProject/qtcreator/profiles.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProfiles>
-<!-- Written by Qt Creator 2.5.83, 2012-09-26T12:18:04. -->
+<!-- Written by QtCreator 2.7.1, 2013-03-26T13:04:29. -->
 <qtcreator>
  <data>
   <variable>Profile.0</variable>
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <value type="QString" key="Debugger.Information">/usr/bin/gdb</value>
-    <value type="QByteArray" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <value type="QString" key="PE.Profile.SysRoot"></value>
     <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
@@ -18,6 +19,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{4d9ea3ed-a7f0-4b0e-885f-da3b82931988}</value>
    <value type="QString" key="PE.Profile.Name">Desktop 474 GCC</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -25,8 +27,9 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <value type="QString" key="Debugger.Information">/usr/bin/gdb</value>
-    <value type="QByteArray" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <value type="QString" key="PE.Profile.SysRoot"></value>
     <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
@@ -36,6 +39,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{68d379f6-357c-42a6-83c6-7743840db4ea}</value>
    <value type="QString" key="PE.Profile.Name">Qt Simulator</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -43,6 +47,7 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <value type="QString" key="Debugger.Information">/usr/bin/gdb</value>
     <value type="QString" key="PE.Profile.Device">{68a75dff-5ec6-40cb-884f-8f383ed2ebb2}</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Maemo5OsType</value>
@@ -54,6 +59,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{f559999e-8f5d-4246-9321-ea9d1c444c85}</value>
    <value type="QString" key="PE.Profile.Name">Fremantle</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -61,6 +67,7 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <valuemap type="QVariantMap" key="Debugger.Information">
      <value type="QString" key="Binary">/usr/bin/gdb</value>
      <value type="int" key="EngineType">1</value>
@@ -75,6 +82,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{744799ff-3430-41e1-ad7d-d76c50c1c621}</value>
    <value type="QString" key="PE.Profile.Name">Harmattan</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -82,6 +90,7 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <valuemap type="QVariantMap" key="Debugger.Information">
      <value type="QString" key="Binary">/usr/bin/gdb</value>
      <value type="int" key="EngineType">1</value>
@@ -96,11 +105,32 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{f16848fc-b615-43b5-b0cc-16a9f57fb573}</value>
    <value type="QString" key="PE.Profile.Name">Embedded Linux</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>Profile.5</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="PE.Profile.AutoDetected">false</value>
+   <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
+    <value type="QString" key="Debugger.Information">/usr/bin/gdb</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
+    <value type="QString" key="PE.Profile.SysRoot"></value>
+    <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
+    <value type="QString" key="QtPM4.mkSpecInformation"></value>
+    <value type="int" key="QtSupport.QtInformation">7</value>
+   </valuemap>
+   <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
+   <value type="QString" key="PE.Profile.Id">{9c58fcfd-9e49-4a08-971f-a677dc9ce185}</value>
+   <value type="QString" key="PE.Profile.Name">Desktop 501 default</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
   <variable>Profile.Count</variable>
-  <value type="int">5</value>
+  <value type="int">6</value>
  </data>
  <data>
   <variable>Profile.Default</variable>

tests/system/settings/unix/QtProject/qtcreator/qtversion.xml

@@ -52,6 +52,16 @@
    <value type="bool" key="isAutodetected">false</value>
   </valuemap>
  </data>
+ <data>
+  <variable>QtVersion.5</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">7</value>
+   <value type="QString" key="Name">Desktop Qt 5.0.1 (SQUISH_DEFAULT_COMPILER)</value>
+   <value type="QString" key="QMakePath">~/Qt5.0.1/5.0.1/SQUISH_DEFAULT_COMPILER/bin/qmake</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
  <data>
   <variable>Version</variable>
   <value type="int">1</value>

tests/system/settings/unix/QtProject/qtcreator/toolchains.xml

@@ -9,6 +9,7 @@
    <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
     <value type="QString">x86-linux-generic-elf-64bit</value>
     <value type="QString">x86-linux-generic-elf-32bit</value>
+    <value type="QString">x86-macos-generic-mach_o-64bit</value>
    </valuelist>
    <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value>
    <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>

tests/system/settings/windows/QtProject/qtcreator/profiles.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProfiles>
-<!-- Written by Qt Creator 2.5.83, 2012-09-25T18:19:53. -->
+<!-- Written by QtCreator 2.7.1, 2013-03-22T16:13:19. -->
 <qtcreator>
  <data>
   <variable>Profile.0</variable>
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <value type="QString" key="Debugger.Information">C:/QtSDK/pythongdb/python_2.7based/gdb-i686-pc-mingw32.exe</value>
-    <value type="QByteArray" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <value type="QString" key="PE.Profile.SysRoot"></value>
     <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value>
@@ -18,6 +19,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{897290fe-c35a-4e5e-b5e2-d8e448e2aed1}</value>
    <value type="QString" key="PE.Profile.Name">Desktop 474 GCC</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -25,8 +27,9 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <value type="QString" key="Debugger.Information">C:/QtSDK/pythongdb/python_2.7based/gdb-i686-pc-mingw32.exe</value>
-    <value type="QByteArray" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <value type="QString" key="PE.Profile.SysRoot"></value>
     <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value>
@@ -36,6 +39,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{0ce9f69f-0f60-4b04-8691-c328ee5bfe14}</value>
    <value type="QString" key="PE.Profile.Name">Qt Simulator</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -43,6 +47,7 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <value type="QString" key="Debugger.Information">C:/QtSDK/pythongdb/python_2.7based/gdb-arm-none-linux-gnueabi.exe</value>
     <value type="QString" key="PE.Profile.Device">{0d112162-56a5-40cb-a911-e0545489da5c}</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Maemo5OsType</value>
@@ -54,6 +59,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{618722a5-c008-4869-9404-07f755973496}</value>
    <value type="QString" key="PE.Profile.Name">Fremantle</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -61,6 +67,7 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <valuemap type="QVariantMap" key="Debugger.Information">
      <value type="QString" key="Binary">C:\QtSDK\pythongdb\python_2.7based\gdb-arm-none-linux-gnueabi.exe</value>
      <value type="int" key="EngineType">1</value>
@@ -75,6 +82,7 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{3800d54f-6c86-4cd1-88a9-7456bbef6dce}</value>
    <value type="QString" key="PE.Profile.Name">Harmattan</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
@@ -82,11 +90,12 @@
   <valuemap type="QVariantMap">
    <value type="bool" key="PE.Profile.AutoDetected">false</value>
    <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
     <valuemap type="QVariantMap" key="Debugger.Information">
      <value type="QString" key="Binary">C:\Program Files\Debugging Tools for Windows (x64)\cdb.exe</value>
      <value type="int" key="EngineType">4</value>
     </valuemap>
-    <value type="QByteArray" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
     <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
     <value type="QString" key="PE.Profile.SysRoot"></value>
     <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Msvc:{b86e54dd-debd-409c-b4d7-1a5c710eaa37}</value>
@@ -96,11 +105,35 @@
    <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
    <value type="QString" key="PE.Profile.Id">{9b35bbe6-25a7-4cce-ba07-487c795f5265}</value>
    <value type="QString" key="PE.Profile.Name">Desktop 474 MSVC2008</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>Profile.5</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="PE.Profile.AutoDetected">false</value>
+   <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
+    <valuemap type="QVariantMap" key="Debugger.Information">
+     <value type="QString" key="Binary">C:\Program Files\Debugging Tools for Windows (x64)\cdb.exe</value>
+     <value type="int" key="EngineType">4</value>
+    </valuemap>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
+    <value type="QString" key="PE.Profile.SysRoot"></value>
+    <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value>
+    <value type="QString" key="QtPM4.mkSpecInformation"></value>
+    <value type="int" key="QtSupport.QtInformation">18</value>
+   </valuemap>
+   <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
+   <value type="QString" key="PE.Profile.Id">{175f6238-a585-4e62-b2d3-d15e90296bb6}</value>
+   <value type="QString" key="PE.Profile.Name">Desktop 501 default</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
   </valuemap>
  </data>
  <data>
   <variable>Profile.Count</variable>
-  <value type="int">5</value>
+  <value type="int">6</value>
  </data>
  <data>
   <variable>Profile.Default</variable>

tests/system/settings/windows/QtProject/qtcreator/qtversion.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorQtVersions>
-<!-- Written by Qt Creator 2.5.81, 2012-06-28T17:40:43. -->
+<!-- Written by QtCreator 2.7.1, 2013-03-22T16:13:19. -->
 <qtcreator>
  <data>
   <variable>QtVersion.0</variable>
@@ -22,26 +22,6 @@
    <value type="bool" key="isAutodetected">false</value>
   </valuemap>
  </data>
- <data>
-  <variable>QtVersion.10</variable>
-  <valuemap type="QVariantMap">
-   <value type="int" key="Id">15</value>
-   <value type="QString" key="Name">Harmattan Target (Qt SDK)</value>
-   <value type="QString" key="QMakePath">c:/qtsdk/madde/targets/harmattan_10.2011.34-1/bin/qmake.exe</value>
-   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
-   <value type="bool" key="isAutodetected">false</value>
-  </valuemap>
- </data>
- <data>
-  <variable>QtVersion.11</variable>
-  <valuemap type="QVariantMap">
-   <value type="int" key="Id">16</value>
-   <value type="QString" key="Name">Qt for Fremantle PR1.3 Devices (Qt SDK)</value>
-   <value type="QString" key="QMakePath">c:/qtsdk/maemo/4.6.2/targets/fremantle-pr13/bin/qmake.exe</value>
-   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
-   <value type="bool" key="isAutodetected">false</value>
-  </valuemap>
- </data>
  <data>
   <variable>QtVersion.2</variable>
   <valuemap type="QVariantMap">
@@ -92,6 +72,36 @@
    <value type="bool" key="isAutodetected">false</value>
   </valuemap>
  </data>
+ <data>
+  <variable>QtVersion.7</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">15</value>
+   <value type="QString" key="Name">Harmattan Target (Qt SDK)</value>
+   <value type="QString" key="QMakePath">c:/qtsdk/madde/targets/harmattan_10.2011.34-1/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>QtVersion.8</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">16</value>
+   <value type="QString" key="Name">Qt for Fremantle PR1.3 Devices (Qt SDK)</value>
+   <value type="QString" key="QMakePath">c:/qtsdk/maemo/4.6.2/targets/fremantle-pr13/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>QtVersion.9</variable>
+  <valuemap type="QVariantMap">
+   <value type="int" key="Id">18</value>
+   <value type="QString" key="Name">Desktop Qt 5.0.1 (msvc2010)</value>
+   <value type="QString" key="QMakePath">C:/Qt/5.0.1/5.0.1/msvc2010/bin/qmake.exe</value>
+   <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
+   <value type="bool" key="isAutodetected">false</value>
+  </valuemap>
+ </data>
  <data>
   <variable>Version</variable>
   <value type="int">1</value>

tests/system/settings/windows/QtProject/qtcreator/toolchains.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorToolChains>
-<!-- Written by Qt Creator 2.5.83, 2012-09-25T18:19:53. -->
+<!-- Written by QtCreator 2.7.1, 2013-03-22T16:13:19. -->
 <qtcreator>
  <data>
   <variable>ToolChain.0</variable>
@@ -43,6 +43,17 @@
  </data>
  <data>
   <variable>ToolChain.3</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2010-pe-32bit</value>
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">c:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/vcvarsall.bat</value>
+   <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBatArg">x86</value>
+   <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">true</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.DisplayName">Microsoft Visual C++ Compiler 10.0 (x86)</value>
+   <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ToolChain.4</variable>
   <valuemap type="QVariantMap">
    <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2008-pe-32bit</value>
    <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat</value>
@@ -53,7 +64,7 @@
  </data>
  <data>
   <variable>ToolChain.Count</variable>
-  <value type="int">4</value>
+  <value type="int">5</value>
  </data>
  <data>
   <variable>Version</variable>

tests/system/shared/classes.py

@@ -12,6 +12,7 @@ class QtQuickConstants:
         HARMATTAN = 8
         EMBEDDED_LINUX = 16
         DESKTOP_474_MSVC2008 = 32
+        DESKTOP_501_DEFAULT = 64
 
     @staticmethod
     def desktopTargetClasses():
@@ -45,6 +46,8 @@ class QtQuickConstants:
             return "Embedded Linux"
         elif target==QtQuickConstants.Targets.DESKTOP_474_MSVC2008:
             return "Desktop 474 MSVC2008"
+        elif target==QtQuickConstants.Targets.DESKTOP_501_DEFAULT:
+            return "Desktop 501 default"
         else:
             return None
 

tests/system/shared/hook_utils.py

@@ -160,6 +160,9 @@ def __getMkspecFromQMakeConf__(qmakeConf):
     return os.path.basename(mkspec)
 
 def __getMkspecFromQmake__(qmakeCall):
+    if getOutputFromCmdline("%s -query QT_VERSION" % qmakeCall).strip().startswith("5."):
+        return getOutputFromCmdline("%s -query QMAKE_XSPEC" % qmakeCall).strip()
+    else:
         QmakeConfPath = getOutputFromCmdline("%s -query QMAKE_MKSPECS" % qmakeCall).strip()
         for tmpPath in QmakeConfPath.split(os.pathsep):
             tmpPath = tmpPath + os.sep + "default" + os.sep +"qmake.conf"

tests/system/shared/project.py

@@ -273,7 +273,7 @@ def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP_474_GCC, availabl
         available = availableTargets
     else:
         # following targets depend on the build environment - added for further/later tests
-        available = [QtQuickConstants.Targets.DESKTOP_474_GCC,
+        available = [QtQuickConstants.Targets.DESKTOP_474_GCC, QtQuickConstants.Targets.DESKTOP_501_DEFAULT,
                      QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.EMBEDDED_LINUX,
                      QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN]
         if platform.system() in ('Windows', 'Microsoft'):
@@ -466,6 +466,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
         result = []
         if 'Desktop' in supports:
             result.append(QtQuickConstants.Targets.DESKTOP_474_GCC)
+            result.append(QtQuickConstants.Targets.DESKTOP_501_DEFAULT)
             if platform.system() in ("Linux", "Darwin"):
                 result.append(QtQuickConstants.Targets.EMBEDDED_LINUX)
             elif platform.system() in ('Windows', 'Microsoft'):
@@ -478,8 +479,9 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
             result.append(QtQuickConstants.Targets.SIMULATOR)
     elif 'Platform independent' in text:
         # MAEMO5 and HARMATTAN could be wrong here - depends on having Madde plugin enabled or not
-        result = [QtQuickConstants.Targets.DESKTOP_474_GCC, QtQuickConstants.Targets.MAEMO5,
+        result = [QtQuickConstants.Targets.DESKTOP_474_GCC, QtQuickConstants.Targets.DESKTOP_501_DEFAULT,
-                  QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN]
+                  QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.SIMULATOR,
+                  QtQuickConstants.Targets.HARMATTAN]
         if platform.system() in ('Windows', 'Microsoft'):
             result.append(QtQuickConstants.Targets.DESKTOP_474_MSVC2008)
     else:

tests/system/shared/project_explorer.py

@@ -194,7 +194,7 @@ def __selectTreeItemOnBuildAndRun__(treeViewOrWidget, itemText, isRegex=False):
                 or itemText == dumpedItem):
                 found = True
                 item = ".".join([str(section.data().toString()),
-                                 dumpedItem.replace(".", "\\.")])
+                                 dumpedItem.replace(".", "\\.").replace("_", "\\_")])
                 clickItem(treeViewOrWidget, item, 5, 5, 0, Qt.LeftButton)
                 break
         if found:

tests/system/shared/qtcreator.py

@@ -112,23 +112,45 @@ def __removeTestingDir__():
     waitFor('os.path.getmtime(devicesXML) > lastMTime', 5000)
     waitFor('__removeIt__(testingDir)', 2000)
 
-def substituteTildeWithinToolchains(settingsDir):
+def __substitute__(fileName, search, replace):
-    toolchains = os.path.join(settingsDir, "QtProject", 'qtcreator', 'toolchains.xml')
+    origFileName = fileName + "_orig"
-    origToolchains = toolchains + "_orig"
+    os.rename(fileName, origFileName)
-    home = os.path.expanduser("~")
+    origFile = open(origFileName, "r")
-    os.rename(toolchains, origToolchains)
+    modifiedFile = open(fileName, "w")
-    origFile = open(origToolchains, "r")
-    modifiedFile = open(toolchains, "w")
     for line in origFile:
-        if "~" in line:
+        modifiedFile.write(line.replace(search, replace))
-            line = line.replace("~", home)
-        modifiedFile.write(line)
     origFile.close()
     modifiedFile.close()
-    os.remove(origToolchains)
+    os.remove(origFileName)
+
+def substituteTildeWithinToolchains(settingsDir):
+    toolchains = os.path.join(settingsDir, "QtProject", 'qtcreator', 'toolchains.xml')
+    home = os.path.expanduser("~")
+    __substitute__(toolchains, "~", home)
     test.log("Substituted all tildes with '%s' inside toolchains.xml..." % home)
 
+def substituteDefaultCompiler(settingsDir):
+    compiler = None
+    if platform.system() == 'Darwin':
+        compiler = "clang_64"
+    elif platform.system() == 'Linux':
+        if __is64BitOS__():
+            compiler = "gcc_64"
+        else:
+            compiler = "gcc"
+    else:
+        test.warning("Called substituteDefaultCompiler() on wrong platform.",
+                     "This is a script error.")
+    if compiler:
+        qtversion = os.path.join(settingsDir, "QtProject", 'qtcreator', 'qtversion.xml')
+        __substitute__(qtversion, "SQUISH_DEFAULT_COMPILER", compiler)
+        test.log("Injected default compiler '%s' to qtversion.xml..." % compiler)
+
 def __guessABI__(supportedABIs, use64Bit):
+    if platform.system() == 'Linux':
+        supportedABIs = filter(lambda x: 'linux' in x, supportedABIs)
+    elif platform.system() == 'Darwin':
+        supportedABIs = filter(lambda x: 'macos' in x, supportedABIs)
     if use64Bit:
         searchFor = "64bit"
     else:
@@ -144,8 +166,6 @@ def __guessABI__(supportedABIs, use64Bit):
     return ''
 
 def __is64BitOS__():
-    if platform.system() == 'Darwin':
-        return sys.maxsize > (2 ** 32)
     if platform.system() in ('Microsoft', 'Windows'):
         machine = os.getenv("PROCESSOR_ARCHITEW6432", os.getenv("PROCESSOR_ARCHITECTURE"))
     else:
@@ -216,6 +236,7 @@ def copySettingsToTmpDir(destination=None, omitFiles=[]):
                 shutil.copy(os.path.join(r, ff), currentPath)
     if platform.system() in ('Linux', 'Darwin'):
         substituteTildeWithinToolchains(tmpSettingsDir)
+        substituteDefaultCompiler(tmpSettingsDir)
     substituteUnchosenTargetABIs(tmpSettingsDir)
     SettingsPath = ' -settingspath "%s"' % tmpSettingsDir
 

tests/system/shared/utils.py

@@ -196,6 +196,11 @@ def cleanUpUserFiles(pathsToProFiles=None):
     return doneWithoutErrors
 
 def invokeMenuItem(menu, item, subItem = None):
+    if platform.system() == "Darwin":
+        try:
+            waitForObject(":Qt Creator.QtCreator.MenuBar_QMenuBar", 2000)
+        except:
+            nativeMouseClick(waitForObject(":Qt Creator_Core::Internal::MainWindow", 1000), 20, 20, 0, Qt.LeftButton)
     menuObject = waitForObjectItem(":Qt Creator.QtCreator.MenuBar_QMenuBar", menu)
     waitFor("menuObject.visible", 1000)
     activateItem(menuObject)
@@ -455,9 +460,9 @@ def iterateQtVersions(keepOptionsOpen=False, alreadyOnOptionsDialog=False,
     treeWidget = waitForObject(":QtSupport__Internal__QtVersionManager.qtdirList_QTreeWidget")
     root = treeWidget.invisibleRootItem()
     for rootChild in dumpChildren(root):
-        rootChildText = str(rootChild.text(0)).replace(".", "\\.")
+        rootChildText = str(rootChild.text(0)).replace(".", "\\.").replace("_", "\\_")
         for subChild in dumpChildren(rootChild):
-            subChildText = str(subChild.text(0)).replace(".", "\\.")
+            subChildText = str(subChild.text(0)).replace(".", "\\.").replace("_", "\\_")
             clickItem(treeWidget, ".".join([rootChildText,subChildText]), 5, 5, 0, Qt.LeftButton)
             currentText = str(waitForObject(":QtSupport__Internal__QtVersionManager.QLabel").text)
             matches = pattern.match(currentText)

tests/system/suite_editors/tst_basic_cpp_support/test.py

@@ -38,6 +38,9 @@ def main():
 #    - Press F2 or select from the menu: Tools / C++ / Follow Symbol under Cursor
 #    Creator will show you the declaration of the variable.
 
+    if platform.system() == "Darwin":
+        JIRA.performWorkaroundIfStillOpen(6918, JIRA.Bug.CREATOR, cppwindow)
+
     type(cppwindow, "<Ctrl+F>")
     type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), "    xi")
     type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), "<Return>")

tests/system/suite_editors/tst_revert_changes/test.py

@@ -62,6 +62,8 @@ def __modifyProFile__():
 # re-order some stuff inside header
 def __modifyHeader__():
     global cppEditorStr, homeShortCut, endShortCut
+    if platform.system() == "Darwin":
+        JIRA.performWorkaroundIfStillOpen(6918, JIRA.Bug.CREATOR, waitForObject(cppEditorStr, 1000))
     if placeCursorToLine(cppEditorStr, "class.+", True):
         type(cppEditorStr, homeShortCut)
         markText(cppEditorStr, "Down", 5)

tests/system/suite_qtquick/tst_qtquick_creation3/test.py

@@ -10,9 +10,9 @@ def main():
     test.log("Running project")
     # TODO replace this quickfix with a proper identification of kits
     # changes to createNewQtQuickUI(...) after fixing QTCREATORBUG-8704 will probably handle this
-    kitCount = 1
-    if platform.system() in ('Windows', 'Microsoft'):
     kitCount = 2
+    if platform.system() in ('Windows', 'Microsoft'):
+        kitCount = 3
     qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(kitCount, workingDir, projectName, 11223)
     if qmlViewer!=None:
         qmlViewerPath = os.path.dirname(qmlViewer)