Commit 58e0c83f authored by Camilo Higuita's avatar Camilo Higuita

Merge branch 'dev-win32-wip' of https://invent.kde.org/kde/vvave into dev-win32-wip

parents 53fdc290 d142b482
......@@ -28,7 +28,7 @@ TagInfo::TagInfo(const QString &url, QObject *parent) : QObject(parent)
if(_file.isReadable())
{
qDebug()<< "is readble";
this->file = new TagLib::FileRef(path.toUtf8());
this->file = new TagLib::FileRef(TagLib::FileName(path.toUtf8()));
}
else
this->file = new TagLib::FileRef();
......
......@@ -6,8 +6,8 @@
#include <QObject>
#if defined Q_OS_WIN32
#include "taglib/tag.h"
#include "taglib/fileref.h"
#include <taglib/tag.h>
#include <taglib/fileref.h>
#elif defined Q_OS_ANDROID
#include "tag.h"
#include "fileref.h"
......
......@@ -31,12 +31,13 @@ linux:unix:!android {
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android_files
include($$PWD/3rdparty/taglib.pri)
}else:win32 {
message("Using Tablib binaries for Windows")
LIBS += -L$$PWD/3rdparty/taglib/lib/ -llibtag.dll
INCLUDEPATH += $$PWD/3rdparty/taglib/include
DEPENDPATH += $$PWD/3rdparty/taglib/include
}
LIBS += -L$$PWD/'../../../../Program Files (x86)/taglib/lib/' -ltag
INCLUDEPATH += $$PWD/'../../../../Program Files (x86)/taglib/include'
DEPENDPATH += $$PWD/'../../../../Program Files (x86)/taglib/include'
}
#DEFAULT COMPONENTS DEFINITIONS
DEFINES *= \
......@@ -123,3 +124,4 @@ INCLUDEPATH += \
$$PWD/services/web/NextCloud
include(install.pri)
Shows how to add an entry to the Windows start menu.
Generate installer with
binarycreator --offline-only -c config/config.xml -p packages installer
C:\Qt\QtIFW2.0.1\bin\binarycreator.exe --offline-only -c config\config.xml -p packages VvaveInstaller.exe
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<Installer>
<Name>Vvave</Name>
<Version>1.0.0</Version>
<Title>Vvave music player</Title>
<Publisher>Maui</Publisher>
<StartMenuDir>Vvave</StartMenuDir>
<TargetDir>@ApplicationsDir@/vvave</TargetDir>
</Installer>
\ No newline at end of file
/**************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the Qt Installer Framework.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
**
** 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 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
**
** $QT_END_LICENSE$
**
**************************************************************************/
function Component()
{
// default constructor
}
Component.prototype.createOperations = function()
{
// call default implementation to actually install README.txt!
component.createOperations();
if (systemInfo.productType === "windows") {
component.addOperation("CreateShortcut", "@TargetDir@/vvave.exe", "@StartMenuDir@/vvave.lnk",
"workingDirectory=@TargetDir@", "iconPath=%SystemRoot%/system32/SHELL32.dll",
"iconId=2");
}
}
<?xml version="1.0" encoding="UTF-8"?>
<Package>
<DisplayName>Vvave</DisplayName>
<Description>Vvave Music Player</Description>
<Version>1.0.0-1</Version>
<ReleaseDate>2019-11-04</ReleaseDate>
<Default>true</Default>
<Script>installscript.qs</Script>
</Package>
<?xml version="1.0" encoding="UTF-8"?>
<Package>
<DisplayName>vvave</DisplayName>
<Description>Vvave music player</Description>
<Version>0.1.0-1</Version>
<ReleaseDate>2019-11-13</ReleaseDate>
<Licenses>
<License name="GPLv3" file="license.txt" />
</Licenses>
<Default>true</Default>
<UserInterfaces>
<UserInterface>page.ui</UserInterface>
</UserInterfaces>
</Package>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment