diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-22 15:53:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-22 15:53:49 (GMT) |
| commit | db14623485396fd69839e519184b794775b65b01 (patch) | |
| tree | c57e705daf03ee117180bd08b958d41491052bb3 | |
| parent | 98824c2ebe97f61bf294b0be07ac164aed470fbf (diff) | |
| parent | 2b5291639cd67e1a251c2fcc3e4d449ac74db1ab (diff) | |
| download | Qt-db14623485396fd69839e519184b794775b65b01.zip Qt-db14623485396fd69839e519184b794775b65b01.tar.gz Qt-db14623485396fd69839e519184b794775b65b01.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove accidentially committed .qmlproject.user file, ignore this filetype
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | examples/declarative/positioners/positioners.qmlproject.user | 41 |
2 files changed, 1 insertions, 41 deletions
@@ -51,6 +51,7 @@ Makefile* *.prl *.app *.pro.user +*.qmlproject.user *.gcov bin/Qt*.dll bin/assistant* diff --git a/examples/declarative/positioners/positioners.qmlproject.user b/examples/declarative/positioners/positioners.qmlproject.user deleted file mode 100644 index 593479d..0000000 --- a/examples/declarative/positioners/positioners.qmlproject.user +++ /dev/null @@ -1,41 +0,0 @@ -<!DOCTYPE QtCreatorProject> -<qtcreator> - <data> - <variable>ProjectExplorer.Project.ActiveTarget</variable> - <value type="int">0</value> - </data> - <data> - <variable>ProjectExplorer.Project.EditorSettings</variable> - <valuemap type="QVariantMap"> - <value key="EditorConfiguration.Codec" type="QByteArray">UTF-8</value> - </valuemap> - </data> - <data> - <variable>ProjectExplorer.Project.Target.0</variable> - <valuemap type="QVariantMap"> - <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">QML Runtime</value> - <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QmlProjectManager.QmlTarget</value> - <value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">-1</value> - <value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value> - <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">0</value> - <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap"> - <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">QML Runtime</value> - <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QmlProjectManager.QmlRunConfiguration</value> - <value key="QmlProjectManager.QmlRunConfiguration.DebugServerAddress" type="QString">127.0.0.1</value> - <value key="QmlProjectManager.QmlRunConfiguration.DebugServerPort" type="int">3768</value> - <value key="QmlProjectManager.QmlRunConfiguration.MainScript" type="QString">positioners.qml</value> - <value key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewer" type="QString"></value> - <value key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments" type="QString"></value> - </valuemap> - <value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value> - </valuemap> - </data> - <data> - <variable>ProjectExplorer.Project.TargetCount</variable> - <value type="int">1</value> - </data> - <data> - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> - <value type="int">4</value> - </data> -</qtcreator> |