Commit d3c979dc authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/2.7'

parents 5c36c594 bcbd1eeb
QT += core gui widgets qml quick network v8 QT += core gui widgets qml quick network v8
contains (QT_CONFIG, webkit) { !isEmpty(QT.webkit.name) {
QT += webkit QT += webkit
} }
......
...@@ -71,5 +71,5 @@ case $value$: ...@@ -71,5 +71,5 @@ case $value$:
default: default:
break; break;
}</snippet> }</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> </snippets>
...@@ -39,7 +39,9 @@ leave room for the Qt 4 target page. ...@@ -39,7 +39,9 @@ leave room for the Qt 4 target page.
id="QtQuick1ExtensionPlugin" category="G.Libraries" id="QtQuick1ExtensionPlugin" category="G.Libraries"
featuresRequired="QtSupport.Wizards.FeatureQtQuick,QtSupport.Wizards.FeatureQtQuick.1"> featuresRequired="QtSupport.Wizards.FeatureQtQuick,QtSupport.Wizards.FeatureQtQuick.1">
<icon>lib.png</icon> <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> <displayname>Qt Quick 1 Extension Plugin</displayname>
<displaycategory>Libraries</displaycategory> <displaycategory>Libraries</displaycategory>
<files> <files>
......
...@@ -39,7 +39,9 @@ leave room for the Qt 4 target page. ...@@ -39,7 +39,9 @@ leave room for the Qt 4 target page.
id="QtQuick2ExtensionPlugin" category="G.Libraries" id="QtQuick2ExtensionPlugin" category="G.Libraries"
featuresRequired="QtSupport.Wizards.FeatureQtQuick,QtSupport.Wizards.FeatureQtQuick.2"> featuresRequired="QtSupport.Wizards.FeatureQtQuick,QtSupport.Wizards.FeatureQtQuick.2">
<icon>lib.png</icon> <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> <displayname>Qt Quick 2 Extension Plugin</displayname>
<displaycategory>Libraries</displaycategory> <displaycategory>Libraries</displaycategory>
<files> <files>
......
...@@ -295,6 +295,8 @@ static const char binaryKeyC[] = "Binary"; ...@@ -295,6 +295,8 @@ static const char binaryKeyC[] = "Binary";
DebuggerKitInformation::DebuggerItem DebuggerKitInformation::variantToItem(const QVariant &v) DebuggerKitInformation::DebuggerItem DebuggerKitInformation::variantToItem(const QVariant &v)
{ {
DebuggerItem result; DebuggerItem result;
if (v.isNull())
return result;
if (v.type() == QVariant::String) { // Convert legacy config items, remove later. if (v.type() == QVariant::String) { // Convert legacy config items, remove later.
const QString binary = v.toString(); const QString binary = v.toString();
result.binary = Utils::FileName::fromString(binary); result.binary = Utils::FileName::fromString(binary);
......
...@@ -64,7 +64,7 @@ linux-* { ...@@ -64,7 +64,7 @@ linux-* {
include(../../qtcreator.pri) include(../../qtcreator.pri)
contains(QT_CONFIG, declarative) { contains(QT_CONFIG, declarative)|!isEmpty(QT.declarative.name) {
SUBDIRS += \ SUBDIRS += \
plugin_qmlprojectmanager \ plugin_qmlprojectmanager \
plugin_qmlprofiler plugin_qmlprofiler
......
...@@ -78,6 +78,7 @@ void FormEditorScene::setupScene() ...@@ -78,6 +78,7 @@ void FormEditorScene::setupScene()
m_formLayerItem = new LayerItem(this); m_formLayerItem = new LayerItem(this);
m_manipulatorLayerItem = new LayerItem(this); m_manipulatorLayerItem = new LayerItem(this);
m_manipulatorLayerItem->setZValue(1.0); m_manipulatorLayerItem->setZValue(1.0);
m_manipulatorLayerItem->setFlag(QGraphicsItem::ItemClipsChildrenToShape, false);
m_formLayerItem->setZValue(0.0); m_formLayerItem->setZValue(0.0);
m_formLayerItem->setFlag(QGraphicsItem::ItemClipsChildrenToShape, false); m_formLayerItem->setFlag(QGraphicsItem::ItemClipsChildrenToShape, false);
} }
......
...@@ -178,11 +178,15 @@ void FormEditorView::modelAboutToBeDetached(Model *model) ...@@ -178,11 +178,15 @@ void FormEditorView::modelAboutToBeDetached(Model *model)
m_moveTool->clear(); m_moveTool->clear();
m_resizeTool->clear(); m_resizeTool->clear();
m_dragTool->clear(); m_dragTool->clear();
foreach (AbstractCustomTool *customTool, m_customToolList)
customTool->clear();
m_scene->clearFormEditorItems(); m_scene->clearFormEditorItems();
m_formEditorWidget->updateActions(); m_formEditorWidget->updateActions();
m_formEditorWidget->resetView(); m_formEditorWidget->resetView();
scene()->resetScene(); scene()->resetScene();
m_currentTool = m_selectionTool;
QmlModelView::modelAboutToBeDetached(model); QmlModelView::modelAboutToBeDetached(model);
} }
......
...@@ -10,7 +10,7 @@ QT += network ...@@ -10,7 +10,7 @@ QT += network
QT += script QT += script
QT += xml QT += xml
contains(QT_CONFIG, webkit) { contains(QT_CONFIG, webkit)|!isEmpty(QT.webkit.name) {
QT += webkit QT += webkit
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
QT += webkitwidgets QT += webkitwidgets
......
...@@ -11,7 +11,10 @@ On Linux/Mac this is ~/QtSDK, and on Windows this is C:\QtSDK. ...@@ -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. 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. 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). 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. 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: This folder must contain the following:
...@@ -20,7 +23,7 @@ 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' * 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 * 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 * cmake
* wget or curl * wget or curl
Normally it should be okay to just install them as usual and add their executables' path(s) to the PATH variable. Normally it should be okay to just install them as usual and add their executables' path(s) to the PATH variable.
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProfiles> <!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> <qtcreator>
<data> <data>
<variable>Profile.0</variable> <variable>Profile.0</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value> <value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <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="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="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
<value type="QString" key="PE.Profile.SysRoot"></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="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <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.Id">{4d9ea3ed-a7f0-4b0e-885f-da3b82931988}</value>
<value type="QString" key="PE.Profile.Name">Desktop 474 GCC</value> <value type="QString" key="PE.Profile.Name">Desktop 474 GCC</value>
<value type="bool" key="PE.Profile.SDK">false</value>
</valuemap> </valuemap>
</data> </data>
<data> <data>
...@@ -25,8 +27,9 @@ ...@@ -25,8 +27,9 @@
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value> <value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <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="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="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
<value type="QString" key="PE.Profile.SysRoot"></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="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
...@@ -36,6 +39,7 @@ ...@@ -36,6 +39,7 @@
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <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.Id">{68d379f6-357c-42a6-83c6-7743840db4ea}</value>
<value type="QString" key="PE.Profile.Name">Qt Simulator</value> <value type="QString" key="PE.Profile.Name">Qt Simulator</value>
<value type="bool" key="PE.Profile.SDK">false</value>
</valuemap> </valuemap>
</data> </data>
<data> <data>
...@@ -43,6 +47,7 @@ ...@@ -43,6 +47,7 @@
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value> <value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <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="Debugger.Information">/usr/bin/gdb</value>
<value type="QString" key="PE.Profile.Device">{68a75dff-5ec6-40cb-884f-8f383ed2ebb2}</value> <value type="QString" key="PE.Profile.Device">{68a75dff-5ec6-40cb-884f-8f383ed2ebb2}</value>
<value type="QByteArray" key="PE.Profile.DeviceType">Maemo5OsType</value> <value type="QByteArray" key="PE.Profile.DeviceType">Maemo5OsType</value>
...@@ -54,6 +59,7 @@ ...@@ -54,6 +59,7 @@
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <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.Id">{f559999e-8f5d-4246-9321-ea9d1c444c85}</value>
<value type="QString" key="PE.Profile.Name">Fremantle</value> <value type="QString" key="PE.Profile.Name">Fremantle</value>
<value type="bool" key="PE.Profile.SDK">false</value>
</valuemap> </valuemap>
</data> </data>
<data> <data>
...@@ -61,6 +67,7 @@ ...@@ -61,6 +67,7 @@
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value> <value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value>
<valuemap type="QVariantMap" key="Debugger.Information"> <valuemap type="QVariantMap" key="Debugger.Information">
<value type="QString" key="Binary">/usr/bin/gdb</value> <value type="QString" key="Binary">/usr/bin/gdb</value>
<value type="int" key="EngineType">1</value> <value type="int" key="EngineType">1</value>
...@@ -75,6 +82,7 @@ ...@@ -75,6 +82,7 @@
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <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.Id">{744799ff-3430-41e1-ad7d-d76c50c1c621}</value>
<value type="QString" key="PE.Profile.Name">Harmattan</value> <value type="QString" key="PE.Profile.Name">Harmattan</value>
<value type="bool" key="PE.Profile.SDK">false</value>
</valuemap> </valuemap>
</data> </data>
<data> <data>
...@@ -82,6 +90,7 @@ ...@@ -82,6 +90,7 @@
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value> <value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value>
<valuemap type="QVariantMap" key="Debugger.Information"> <valuemap type="QVariantMap" key="Debugger.Information">
<value type="QString" key="Binary">/usr/bin/gdb</value> <value type="QString" key="Binary">/usr/bin/gdb</value>
<value type="int" key="EngineType">1</value> <value type="int" key="EngineType">1</value>
...@@ -96,11 +105,32 @@ ...@@ -96,11 +105,32 @@
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <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.Id">{f16848fc-b615-43b5-b0cc-16a9f57fb573}</value>
<value type="QString" key="PE.Profile.Name">Embedded Linux</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> </valuemap>
</data> </data>
<data> <data>
<variable>Profile.Count</variable> <variable>Profile.Count</variable>
<value type="int">5</value> <value type="int">6</value>
</data> </data>
<data> <data>
<variable>Profile.Default</variable> <variable>Profile.Default</variable>
......
...@@ -52,6 +52,16 @@ ...@@ -52,6 +52,16 @@
<value type="bool" key="isAutodetected">false</value> <value type="bool" key="isAutodetected">false</value>
</valuemap> </valuemap>
</data> </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> <data>
<variable>Version</variable> <variable>Version</variable>
<value type="int">1</value> <value type="int">1</value>
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis"> <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
<value type="QString">x86-linux-generic-elf-64bit</value> <value type="QString">x86-linux-generic-elf-64bit</value>
<value type="QString">x86-linux-generic-elf-32bit</value> <value type="QString">x86-linux-generic-elf-32bit</value>
<value type="QString">x86-macos-generic-mach_o-64bit</value>
</valuelist> </valuelist>
<value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value> <value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">SET_BY_SQUISH</value>
<value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value> <value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProfiles> <!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> <qtcreator>
<data> <data>
<variable>Profile.0</variable> <variable>Profile.0</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value> <value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <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="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="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
<value type="QString" key="PE.Profile.SysRoot"></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> <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value>
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <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.Id">{897290fe-c35a-4e5e-b5e2-d8e448e2aed1}</value>
<value type="QString" key="PE.Profile.Name">Desktop 474 GCC</value> <value type="QString" key="PE.Profile.Name">Desktop 474 GCC</value>
<value type="bool" key="PE.Profile.SDK">false</value>
</valuemap> </valuemap>
</data> </data>
<data> <data>
...@@ -25,8 +27,9 @@ ...@@ -25,8 +27,9 @@
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value> <value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <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="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="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
<value type="QString" key="PE.Profile.SysRoot"></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> <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value>
...@@ -36,6 +39,7 @@ ...@@ -36,6 +39,7 @@
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <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.Id">{0ce9f69f-0f60-4b04-8691-c328ee5bfe14}</value>
<value type="QString" key="PE.Profile.Name">Qt Simulator</value> <value type="QString" key="PE.Profile.Name">Qt Simulator</value>
<value type="bool" key="PE.Profile.SDK">false</value>
</valuemap> </valuemap>
</data> </data>
<data> <data>
...@@ -43,6 +47,7 @@ ...@@ -43,6 +47,7 @@
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value> <value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <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="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="QString" key="PE.Profile.Device">{0d112162-56a5-40cb-a911-e0545489da5c}</value>
<value type="QByteArray" key="PE.Profile.DeviceType">Maemo5OsType</value> <value type="QByteArray" key="PE.Profile.DeviceType">Maemo5OsType</value>
...@@ -54,6 +59,7 @@ ...@@ -54,6 +59,7 @@
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <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.Id">{618722a5-c008-4869-9404-07f755973496}</value>
<value type="QString" key="PE.Profile.Name">Fremantle</value> <value type="QString" key="PE.Profile.Name">Fremantle</value>
<value type="bool" key="PE.Profile.SDK">false</value>
</valuemap> </valuemap>
</data> </data>
<data> <data>
...@@ -61,6 +67,7 @@ ...@@ -61,6 +67,7 @@
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value> <value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value>
<valuemap type="QVariantMap" key="Debugger.Information"> <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="QString" key="Binary">C:\QtSDK\pythongdb\python_2.7based\gdb-arm-none-linux-gnueabi.exe</value>
<value type="int" key="EngineType">1</value> <value type="int" key="EngineType">1</value>
...@@ -75,6 +82,7 @@ ...@@ -75,6 +82,7 @@
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <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.Id">{3800d54f-6c86-4cd1-88a9-7456bbef6dce}</value>
<value type="QString" key="PE.Profile.Name">Harmattan</value> <value type="QString" key="PE.Profile.Name">Harmattan</value>
<value type="bool" key="PE.Profile.SDK">false</value>
</valuemap> </valuemap>
</data> </data>
<data> <data>
...@@ -82,11 +90,12 @@ ...@@ -82,11 +90,12 @@
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value> <value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value>
<valuemap type="QVariantMap" key="Debugger.Information"> <valuemap type="QVariantMap" key="Debugger.Information">
<value type="QString" key="Binary">C:\Program Files\Debugging Tools for Windows (x64)\cdb.exe</value> <value type="QString" key="Binary">C:\Program Files\Debugging Tools for Windows (x64)\cdb.exe</value>
<value type="int" key="EngineType">4</value> <value type="int" key="EngineType">4</value>
</valuemap> </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="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
<value type="QString" key="PE.Profile.SysRoot"></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> <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Msvc:{b86e54dd-debd-409c-b4d7-1a5c710eaa37}</value>
...@@ -96,11 +105,35 @@ ...@@ -96,11 +105,35 @@
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <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.Id">{9b35bbe6-25a7-4cce-ba07-487c795f5265}</value>
<value type="QString" key="PE.Profile.Name">Desktop 474 MSVC2008</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> </valuemap>
</data> </data>
<data> <data>
<variable>Profile.Count</variable> <variable>Profile.Count</variable>
<value type="int">5</value> <value type="int">6</value>
</data> </data>
<data> <data>
<variable>Profile.Default</variable> <variable>Profile.Default</variable>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorQtVersions> <!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> <qtcreator>
<data> <data>
<variable>QtVersion.0</variable> <variable>QtVersion.0</variable>
...@@ -22,26 +22,6 @@ ...@@ -22,26 +22,6 @@
<value type="bool" key="isAutodetected">false</value> <value type="bool" key="isAutodetected">false</value>
</valuemap> </valuemap>
</data> </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> <data>
<variable>QtVersion.2</variable> <variable>QtVersion.2</variable>