Hello community,
here is the log from the commit of package vacuum-im-plugins-usertune for
openSUSE:Factory checked in at 2018-06-08 23:17:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vacuum-im-plugins-usertune (Old)
and /work/SRC/openSUSE:Factory/.vacuum-im-plugins-usertune.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vacuum-im-plugins-usertune"
Fri Jun 8 23:17:34 2018 rev:6 rq:614615 version:1.1.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/vacuum-im-plugins-usertune/vacuum-im-plugins-usertune.changes
2018-01-03 13:39:18.711779885 +0100
+++
/work/SRC/openSUSE:Factory/.vacuum-im-plugins-usertune.new/vacuum-im-plugins-usertune.changes
2018-06-08 23:17:36.711412647 +0200
@@ -1,0 +2,8 @@
+Tue Jun 5 20:47:40 UTC 2018 - [email protected]
+
+- update to 1.1.3
+ * add support for Qt 5.11
+ * tune icon don't show in roster
+ * add field to show stored player name
+
+-------------------------------------------------------------------
Old:
----
vacuum-im-plugins-usertune-1.1.1.tar.xz
New:
----
vacuum-im-plugins-usertune-1.1.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vacuum-im-plugins-usertune.spec ++++++
--- /var/tmp/diff_new_pack.1FXWrQ/_old 2018-06-08 23:17:37.267392565 +0200
+++ /var/tmp/diff_new_pack.1FXWrQ/_new 2018-06-08 23:17:37.271392420 +0200
@@ -1,7 +1,7 @@
#
# spec file for package vacuum-im-plugins-usertune
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,10 +19,10 @@
#
%define app_name vacuum-im
Name: vacuum-im-plugins-usertune
-Version: 1.1.1
+Version: 1.1.3
Release: 0
Summary: Vacuum-IM User Tune Handler plugin
-License: GPL-3.0
+License: GPL-3.0-only
Group: Productivity/Networking/Instant Messenger
Url: http://www.vacuum-im.org/
Source: %{name}-%{version}.tar.xz
++++++ vacuum-im-plugins-usertune-1.1.1.tar.xz ->
vacuum-im-plugins-usertune-1.1.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vacuum-im-plugins-usertune/CMakeLists.txt
new/vacuum-im-plugins-usertune/CMakeLists.txt
--- old/vacuum-im-plugins-usertune/CMakeLists.txt 2016-12-26
21:43:03.083307686 +0100
+++ new/vacuum-im-plugins-usertune/CMakeLists.txt 2018-06-06
18:59:14.397261912 +0200
@@ -19,11 +19,11 @@
include("${CMAKE_SOURCE_DIR}/cmake/plugin.cmake")
find_package(Qt5Xml REQUIRED)
-qt5_use_modules(${PLUGIN_NAME} Xml)
+target_link_libraries(${PLUGIN_NAME} Qt5::Xml)
if (UNIX)
find_package(Qt5DBus REQUIRED)
find_package(Qt5Widgets REQUIRED)
- qt5_use_modules(${PLUGIN_NAME} DBus Widgets)
+ target_link_libraries(${PLUGIN_NAME} Qt5::DBus Qt5::Widgets)
endif (UNIX)
install(DIRECTORY "resources/menuicons" DESTINATION "${INSTALL_RESOURCES}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vacuum-im-plugins-usertune/README
new/vacuum-im-plugins-usertune/README
--- old/vacuum-im-plugins-usertune/README 2017-01-15 21:28:39.387012520
+0100
+++ new/vacuum-im-plugins-usertune/README 2018-06-05 22:41:58.626597049
+0200
@@ -10,10 +10,10 @@
Sergey A Potapov - <[email protected]>
Web Site:
- http://code.google.com/p/vacuum-plugins/
+ https://github.com/Vacuum-IM/usertune
Source:
- http://code.google.com/p/vacuum-im
+ https://github.com/Vacuum-IM/usertune
Jabber conference:
[email protected]
@@ -31,7 +31,7 @@
Unix example
------------
- qmake VACUUM_SDK_PATH="/usr/include/vacuum" CONFIG-=debug
CONFIG-=debug_and_install
+ qmake VACUUM_SDK_PATH="/usr/include/vacuum-im" CONFIG-=debug
CONFIG-=debug_and_install
make
sudo make install
@@ -39,6 +39,12 @@
CHANGELOG
=========
LEGEND: [+]-New feature [*]-Enhancement [-]-Bug fix
+ v1.1.3
+ [-] add support for Qt 5.11
+
+ v1.1.2
+ ------
+ [*] tune icon don't show in roster
v1.1.1
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vacuum-im-plugins-usertune/cmake/CMakeLists.txt.example
new/vacuum-im-plugins-usertune/cmake/CMakeLists.txt.example
--- old/vacuum-im-plugins-usertune/cmake/CMakeLists.txt.example 2016-12-25
12:48:06.691304028 +0100
+++ new/vacuum-im-plugins-usertune/cmake/CMakeLists.txt.example 2018-06-05
22:40:23.402785830 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.2)
project(pluginname)
#set(PLUGIN_NAME pluginname) # defaults to CMAKE_PROJECT_NAME, if not set
@@ -13,12 +13,13 @@
#file(GLOB HEADERS "*.h")
#file(GLOB UIS "**.ui")
-# By default, only QtNetwork and QtXml modules are linked, if you need other
-# modules - set corresponding variables for FindQt4 CMake module:
-# http://www.cmake.org/cmake/help/cmake-2-8-docs.html#module:FindQt4
-#set(QT_USE_QTDBUS ON)
-#set(QT_USE_QTWEBKIT ON)
+include_directories("${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}")
include("${CMAKE_SOURCE_DIR}/cmake/config.cmake")
include("${CMAKE_SOURCE_DIR}/translations/languages.cmake")
include("${CMAKE_SOURCE_DIR}/cmake/plugin.cmake")
+
+find_package(Qt5 COMPONENTS Widgets Xml REQUIRED)
+qt5_use_modules(${PLUGIN_NAME} Widgets Xml)
+
+#install(DIRECTORY "resources/resource_folder" DESTINATION
"${INSTALL_RESOURCES}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vacuum-im-plugins-usertune/cmake/plugin.cmake
new/vacuum-im-plugins-usertune/cmake/plugin.cmake
--- old/vacuum-im-plugins-usertune/cmake/plugin.cmake 2016-12-25
20:10:20.534917875 +0100
+++ new/vacuum-im-plugins-usertune/cmake/plugin.cmake 2018-06-05
22:40:23.402785830 +0200
@@ -4,12 +4,20 @@
include_directories("${VACUUM_SDK_PATH}")
+if(POLICY CMP0020)
+ cmake_policy(SET CMP0020 NEW)
+endif()
+
if (WIN32)
set(CMAKE_SHARED_LIBRARY_PREFIX "")
endif (WIN32)
add_definitions(-DQT_PLUGIN -DQT_SHARED)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
if (LOCALIZED_LANGS)
add_translations(TRANSLATIONS ${PLUGIN_NAME} ${HEADERS} ${SOURCES} ${UIS})
endif(LOCALIZED_LANGS)
@@ -20,6 +28,7 @@
endif (NOT UTILS_LIB)
target_link_libraries(${PLUGIN_NAME} ${UTILS_LIB} ${QT_LIBRARIES} ${ADD_LIBS})
+
if (WIN32)
install(TARGETS ${PLUGIN_NAME}
RUNTIME DESTINATION "${INSTALL_PLUGINS}")
@@ -28,9 +37,6 @@
LIBRARY DESTINATION "${INSTALL_PLUGINS}")
endif (WIN32)
-find_package(Qt5Core REQUIRED)
-qt5_use_modules(${PLUGIN_NAME} Core)
-
# uninstall target
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vacuum-im-plugins-usertune/definitions.h
new/vacuum-im-plugins-usertune/definitions.h
--- old/vacuum-im-plugins-usertune/definitions.h 2016-10-23
16:03:48.584206283 +0200
+++ new/vacuum-im-plugins-usertune/definitions.h 2018-01-03
16:22:10.000000000 +0100
@@ -38,7 +38,7 @@
//Roster Label ID
#define RLID_USERTUNE
AdvancedDelegateItem::makeId(AdvancedDelegateItem::MiddleCenter,\
128,\
-
AdvancedDelegateItem::AlignRightOrderMask | 300)
+
AdvancedDelegateItem::AlignRightOrderMask | 700)
//Roster ToolTip Order
#define RTTO_USERTUNE 910
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vacuum-im-plugins-usertune/usertune.cpp
new/vacuum-im-plugins-usertune/usertune.cpp
--- old/vacuum-im-plugins-usertune/usertune.cpp 2017-03-27 19:26:34.088422796
+0200
+++ new/vacuum-im-plugins-usertune/usertune.cpp 2018-06-05 22:41:14.806684042
+0200
@@ -13,6 +13,7 @@
#include <definitions/rostertooltiporders.h>
#include <utils/advanceditemdelegate.h>
+#include <utils/logger.h>
#include "usertune.h"
#ifdef READ_WRITE_TUNE
@@ -47,22 +48,25 @@
static const QList<int> RosterKinds = QList<int>() << RIK_CONTACT <<
RIK_CONTACTS_ROOT << RIK_STREAM_ROOT;
-UserTuneHandler::UserTuneHandler() :
- FNotifications(nullptr),
- FOptionsManager(nullptr),
- FPEPManager(nullptr),
- FRosterManager(nullptr),
- FRostersModel(nullptr),
- FRostersViewPlugin(nullptr),
- FServiceDiscovery(nullptr),
- FXmppStreamManager(nullptr)
- #ifdef READ_WRITE_TUNE
- ,FMessageWidgets(nullptr),
- FMetaDataFetcher(nullptr),
- FMultiUserChatManager(nullptr)
- #endif
+UserTuneHandler::UserTuneHandler()
{
+ FNotifications = nullptr;
+ FOptionsManager = nullptr;
+ FPEPManager = nullptr;
+ FPresenceManager = nullptr;
+ FRosterManager = nullptr;
+ FRostersModel = nullptr;
+ FRostersViewPlugin = nullptr;
+ FServiceDiscovery = nullptr;
+ FXmppStreamManager = nullptr;
+
+ FUserTuneLabelId = 0;
+
#ifdef READ_WRITE_TUNE
+ FMessageWidgets = nullptr;
+ FMetaDataFetcher = nullptr;
+ FMultiUserChatManager = nullptr;
+
FTimer.setSingleShot(true);
FTimer.setInterval(PEP_SEND_DELAY);
connect(&FTimer, SIGNAL(timeout()), this, SLOT(onSendPep()));
@@ -78,7 +82,7 @@
{
APluginInfo->name = tr("User Tune Handler");
APluginInfo->description = tr("Allows hadle user tunes");
- APluginInfo->version = QLatin1String("1.1.1");
+ APluginInfo->version = QLatin1String("1.1.3");
APluginInfo->author = QLatin1String("Crying Angel");
APluginInfo->homePage = QLatin1String("http://www.vacuum-im.org";);
APluginInfo->dependences.append(PEPMANAGER_UUID);
@@ -114,8 +118,8 @@
}
FXmppStreamManager = qobject_cast<IXmppStreamManager
*>(plugin->instance());
- connect(FXmppStreamManager->instance(), SIGNAL(opened(IXmppStream *)),
this, SLOT(onSetMainLabel(IXmppStream*)));
- connect(FXmppStreamManager->instance(), SIGNAL(closed(IXmppStream *)),
this, SLOT(onUnsetMainLabel(IXmppStream*)));
+ connect(FXmppStreamManager->instance(), SIGNAL(streamOpened(IXmppStream
*)), this, SLOT(onSetMainLabel(IXmppStream*)));
+ connect(FXmppStreamManager->instance(), SIGNAL(streamClosed(IXmppStream
*)), this, SLOT(onUnsetMainLabel(IXmppStream*)));
int streams_size = FXmppStreamManager->xmppStreams().size();
for (int i = 0; i < streams_size; i++) {
@@ -236,7 +240,13 @@
FRostersModel->insertRosterDataHolder(RDHO_USERTUNE, this);
}
- FUserTuneLabelId = 0;
+ if (FRostersViewPlugin) {
+ AdvancedDelegateItem notifyLabel(RLID_USERTUNE);
+ notifyLabel.d->kind = AdvancedDelegateItem::CustomData;
+ notifyLabel.d->data =
IconStorage::staticStorage(RSR_STORAGE_MENUICONS)->getIcon(MNI_USERTUNE_MUSIC);
+
+ FUserTuneLabelId =
FRostersViewPlugin->rostersView()->registerLabel(notifyLabel);
+ }
return true;
}
@@ -270,7 +280,7 @@
QMultiMap<int, IOptionsDialogWidget *>
UserTuneHandler::optionsDialogWidgets(const QString &ANodeId, QWidget *AParent)
{
QMultiMap<int, IOptionsDialogWidget *> widgets;
- if (FOptionsManager && ANodeId == OPN_USERTUNE) {
+ if (FOptionsManager && ANodeId == OPN_USERTUNE) {
#ifdef READ_WRITE_TUNE
widgets.insertMulti(OWO_USERTUNE, new UserTuneOptions(AParent));
#else
@@ -297,18 +307,9 @@
if (ANode.path() == OPV_USERTUNE_SHOW_ROSTER_LABEL) {
FTuneLabelVisible = ANode.value().toBool();
if (FTuneLabelVisible) {
- if (FUserTuneLabelId == 0) {
- AdvancedDelegateItem notifyLabel(RLID_USERTUNE);
- notifyLabel.d->kind =
AdvancedDelegateItem::CustomData;
- notifyLabel.d->data =
IconStorage::staticStorage(RSR_STORAGE_MENUICONS)->getIcon(MNI_USERTUNE_MUSIC);
- FUserTuneLabelId =
FRostersViewPlugin->rostersView()->registerLabel(notifyLabel);
- foreach (const Jid streamJid,
FRostersModel->streams()) {
- onLabelsEnabled(streamJid);
- }
+ foreach (const Jid streamJid, FRostersModel->streams())
{
+ updateDataHolder(streamJid, Jid::null);
}
- } else if (FUserTuneLabelId != 0) {
-
FRostersViewPlugin->rostersView()->removeLabel(FUserTuneLabelId);
- FUserTuneLabelId = 0;
}
} else if (ANode.path() == OPV_USERTUNE_TAG_FORMAT) {
FFormatTag =
Options::node(OPV_USERTUNE_TAG_FORMAT).value().toString();
@@ -653,18 +654,17 @@
QDomElement tune = doc.createElement(QLatin1String("tune"));
root.appendChild(tune);
- Jid streamJid;
IXmppStream *stream = qobject_cast<IXmppStream *>(sender());
if (stream) {
- streamJid = stream->streamJid();
+ Jid streamJid = stream->streamJid();
FPEPManager->publishItem(streamJid, TUNE_PROTOCOL_URL, root);
FContactTune.remove(streamJid);
} else {
int streams_size = FXmppStreamManager->xmppStreams().size();
for (int i = 0; i < streams_size; i++) {
- streamJid =
FXmppStreamManager->xmppStreams().at(i)->streamJid();
+ Jid streamJid =
FXmppStreamManager->xmppStreams().at(i)->streamJid();
FPEPManager->publishItem(streamJid, TUNE_PROTOCOL_URL,
root);
}
@@ -685,19 +685,6 @@
}
}
-void UserTuneHandler::onLabelsEnabled(const Jid &streamJid)
-{
- if (FRostersViewPlugin) {
- IRostersModel *model =
FRostersViewPlugin->rostersView()->rostersModel();
- IRosterIndex *index = model ? model->streamIndex(streamJid) :
nullptr;
- if (index) {
-
FRostersViewPlugin->rostersView()->insertLabel(FUserTuneLabelId, index);
- }
-
- updateDataHolder(streamJid, Jid());
- }
-}
-
void UserTuneHandler::onUnsetMainLabel(IXmppStream *AXmppStream)
{
Jid streamJid = AXmppStream->streamJid();
@@ -801,4 +788,9 @@
void UserTuneHandler::onApplicationQuit()
{
FPEPManager->removeNodeHandler(FHandlerId);
+ if (FUserTuneLabelId != 0 && FRostersViewPlugin)
+ {
+
FRostersViewPlugin->rostersView()->removeLabel(FUserTuneLabelId);
+ FUserTuneLabelId = 0;
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vacuum-im-plugins-usertune/usertune.h
new/vacuum-im-plugins-usertune/usertune.h
--- old/vacuum-im-plugins-usertune/usertune.h 2016-12-26 21:43:03.083307686
+0100
+++ new/vacuum-im-plugins-usertune/usertune.h 2018-01-03 17:41:59.000000000
+0100
@@ -138,7 +138,6 @@
void onApplicationQuit();
protected:
- void onLabelsEnabled(const Jid &streamJid);
void setContactTune(const Jid &streamJid, const Jid &contactJid, const
UserTuneData &song);
//IRosterDataHolder
void updateDataHolder(const Jid &streamJid, const Jid &senderJid);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vacuum-im-plugins-usertune/usertune.pro.user
new/vacuum-im-plugins-usertune/usertune.pro.user
--- old/vacuum-im-plugins-usertune/usertune.pro.user 2017-03-27
19:02:39.785962739 +0200
+++ new/vacuum-im-plugins-usertune/usertune.pro.user 2018-01-03
22:43:07.433409205 +0100
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.2.1, 2017-03-27T20:02:39. -->
+<!-- Written by QtCreator 4.4.0, 2018-01-04T00:43:07. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
- <value type="QByteArray">{fb9d6c1f-329b-4189-9ff1-466f2532e996}</value>
+ <value type="QByteArray">{50d8d641-e32e-42e3-ae77-e998f08c09f2}</value>
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -19,7 +19,7 @@
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
<value type="QString" key="language">Cpp</value>
<valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+ <value type="QByteArray" key="CurrentPreferences">qt2</value>
</valuemap>
</valuemap>
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
@@ -64,22 +64,22 @@
<valuemap type="QVariantMap">
<value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
<value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">{4a85c7bc-cce7-4cd4-9d2f-413b7ab25517}</value>
+ <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">{fca1c92e-f75a-4092-b39f-939801af2a2e}</value>
<value type="int"
key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int"
key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int"
key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap"
key="ProjectExplorer.Target.BuildConfiguration.0">
- <value type="QString"
key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/egd/projects/Vacuum-IM/build-usertune-Debug</value>
+ <value type="QString"
key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/egd/projects/Vacuum-IM/build-usertune-Desktop-Debug</value>
<valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
<value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="QString"
key="QtProjectManager.QMakeBuildStep.QMakeArguments">VACUUM_SDK_PATH=../vacuum-im/src</value>
+ <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+ <value type="QString"
key="QtProjectManager.QMakeBuildStep.QMakeArguments">VACUUM_SDK_PATH=/home/egd/projects/Vacuum-IM/vacuum-im-plugins-dbusnotifications/../vacuum-im/src
VACUUM_LIB_PATH=%{buildDir}/../build-vacuum-Debug/src/utils</value>
<value type="bool"
key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
+ <value type="bool"
key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
<value type="bool"
key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
@@ -92,7 +92,7 @@
<value type="QString">-r</value>
</valuelist>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">-j
6</value>
+ <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
<value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
@@ -129,7 +129,7 @@
<value type="bool"
key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
<valuemap type="QVariantMap"
key="ProjectExplorer.Target.BuildConfiguration.1">
- <value type="QString"
key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/egd/projects/Vacuum-IM/build-usertune-Release</value>
+ <value type="QString"
key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/egd/projects/Vacuum-IM/build-usertune-Desktop-Release</value>
<valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -189,7 +189,7 @@
<value type="bool"
key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
<valuemap type="QVariantMap"
key="ProjectExplorer.Target.BuildConfiguration.2">
- <value type="QString"
key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/egd/projects/Vacuum-IM/build-usertune-Profile</value>
+ <value type="QString"
key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/egd/projects/Vacuum-IM/build-usertune-Desktop-Profile</value>
<valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -248,67 +248,7 @@
<value type="int"
key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="bool"
key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
- <valuemap type="QVariantMap"
key="ProjectExplorer.Target.BuildConfiguration.3">
- <value type="QString"
key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/egd/projects/Vacuum-IM/build-usertune-Debug</value>
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="QString"
key="QtProjectManager.QMakeBuildStep.QMakeArguments">VACUUM_SDK_PATH=../vacuum-im/src</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList"
key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
- <value type="QString">-w</value>
- <value type="QString">-r</value>
- </valuelist>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList"
key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
- <value type="QString">-w</value>
- <value type="QString">-r</value>
- </valuelist>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Очистка</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool"
key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList"
key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Отладка2</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int"
key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
- <value type="bool"
key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.Target.BuildConfigurationCount">4</value>
+ <value type="int"
key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
<valuemap type="QVariantMap"
key="ProjectExplorer.Target.DeployConfiguration.0">
<valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
