diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-11-30 16:38:22 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-30 17:02:35 +0100 |
| commit | d719eebfdc6cf4d2a97b4273f36e58d321a13a59 (patch) | |
| tree | 6e6092c9cf0660eb08c7c867e3d6c541b0b25d1e /dist | |
| parent | 61c3de01a801241911e2469784e3dad8374d2121 (diff) | |
| parent | de4fd54c7629c164cc2871590b64c6d63c6c18b4 (diff) | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/plugins/coreplugin/editormanager/openeditorsview.cpp
src/plugins/debugger/qml/qmlengine.cpp
src/plugins/debugger/qml/qmlinspectoradapter.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/qtsupport/exampleslistmodel.h
src/plugins/welcome/welcomeplugin.cpp
Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs index f3077e52f9..10286b9474 100644 --- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs +++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs @@ -45,15 +45,16 @@ Component.prototype.beginInstallation = function() registerWindowsFileTypeExtensions = function() { - var headerExtensions = new Array("h", "hh", "hxx", "h++", "hpp", "hpp"); + var headerExtensions = new Array("h", "hh", "hxx", "h++", "hpp"); for (var i = 0; i < headerExtensions.length; ++i) { component.addOperation( "RegisterFileType", headerExtensions[i], "@TargetDir@\\bin\\qtcreator.exe -client '%1'", "C++ Header file", - "", - "@TargetDir@\\bin\\qtcreator.exe,3"); + "text/plain", + "@TargetDir@\\bin\\qtcreator.exe,3", + "ProgId=QtProject.QtCreator." + headerExtensions[i]); } var cppExtensions = new Array("cc", "cxx", "c++", "cp", "cpp"); @@ -63,46 +64,53 @@ registerWindowsFileTypeExtensions = function() cppExtensions[i], "@TargetDir@\\bin\\qtcreator.exe -client '%1'", "C++ Source file", - "", - "@TargetDir@\\bin\\qtcreator.exe,2"); + "text/plain", + "@TargetDir@\\bin\\qtcreator.exe,2", + "ProgId=QtProject.QtCreator." + cppExtensions[i]); } component.addOperation( "RegisterFileType", "c", "@TargetDir@\\bin\\qtcreator.exe -client '%1'", "C Source file", - "", - "@TargetDir@\\bin\\qtcreator.exe,1"); + "text/plain", + "@TargetDir@\\bin\\qtcreator.exe,1", + "ProgId=QtProject.QtCreator.c"); component.addOperation( "RegisterFileType", "ui", "@TargetDir@\\bin\\qtcreator.exe -client '%1'", "Qt UI file", - "", - "@TargetDir@\\bin\\qtcreator.exe,4"); + "text/plain", + "@TargetDir@\\bin\\qtcreator.exe,4", + "ProgId=QtProject.QtCreator.ui"); component.addOperation( "RegisterFileType", "pro", "@TargetDir@\\bin\\qtcreator.exe -client '%1'", "Qt Project file", - "", - "@TargetDir@\\bin\\qtcreator.exe,5"); + "text/plain", + "@TargetDir@\\bin\\qtcreator.exe,5", + "ProgId=QtProject.QtCreator.pro"); component.addOperation( "RegisterFileType", "pri", "@TargetDir@\\bin\\qtcreator.exe -client '%1'", "Qt Project Include file", - "", - "@TargetDir@\\bin\\qtcreator.exe,6"); + "text/plain", + "@TargetDir@\\bin\\qtcreator.exe,6", + "ProgId=QtProject.QtCreator.pri"); component.addOperation( "RegisterFileType", "qs", "@TargetDir@\\bin\\qtcreator.exe -client '%1'", "Qt Script file", - "", - "@TargetDir@\\bin\\qtcreator.exe,0"); + "text/plain", + "@TargetDir@\\bin\\qtcreator.exe,0", + "ProgId=QtProject.QtCreator.qs"); component.addOperation( "RegisterFileType", "qml", "@TargetDir@\\bin\\qtcreator.exe -client '%1'", "Qt Quick Markup language file", - "", - "@TargetDir@\\bin\\qtcreator.exe,0"); + "text/plain", + "@TargetDir@\\bin\\qtcreator.exe,0", + "ProgId=QtProject.QtCreator.qml"); } Component.prototype.createOperations = function() |