diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro index f7207c5b9af28d566cfe554dd3d28cad57aea56e..205ab9e6bd30b65ae89c2978ebfb04157664f43e 100644 --- a/share/qtcreator/static.pro +++ b/share/qtcreator/static.pro @@ -52,11 +52,11 @@ defineReplace(stripSrcResourceDir) { } DATA_FILES_SRC = \ externaltools/lrelease.xml \ - externaltools/lupdate.xml -unix:DATA_FILES_SRC += externaltools/sort.xml + externaltools/lupdate.xml \ + externaltools/sort.xml linux-*:DATA_FILES_SRC += externaltools/vi.xml macx:DATA_FILES_SRC += externaltools/vi_mac.xml -win32:DATA_FILES_SRC += externaltools/notepad_win.xml externaltools/sort_win.xml +win32:DATA_FILES_SRC += externaltools/notepad_win.xml win32:DATA_FILES_SRC ~= s|\\\\|/|g for(file, DATA_FILES_SRC):DATA_FILES += $$IDE_SOURCE_TREE/src/share/qtcreator/$$file macx:OTHER_FILES += $$DATA_FILES diff --git a/src/share/qtcreator/externaltools/sort_win.xml b/src/share/qtcreator/externaltools/sort_win.xml deleted file mode 100644 index 0b3bd2cf7f4e60263576c948fe264cac97e15dda..0000000000000000000000000000000000000000 --- a/src/share/qtcreator/externaltools/sort_win.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** Commercial Usage -** -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. -** -**************************************************************************/ ---> -<externaltool id="sort"> - <description>Sorts the selected text</description> - <description xml:lang="de">Sortiert den ausgewählten Text</description> - <displayname>Sort Selection</displayname> - <displayname xml:lang="de">Auswahl Sortieren</displayname> - <category>Text</category> - <category xml:lang="de">Text</category> - <executable output="replaceselection" error="showinpane"> - <path>cmd</path> - <arguments>/c sort</arguments> - <input>%{CurrentDocument:Selection}</input> - </executable> -</externaltool>