Source: actionaz
Version: Please consider removing qtmobility from build dependencies
Severity: wishlist
Tags: patch
Hi! We just received a bug in qtmobility to drop gstreamer 0.1 support.
For qtmobility this means we either need to drop the multimedia part
of it or simply remove qtmobility from the archive, as it currently has 3
users.
Dropping the multimedia part would affect you directly, so we have two
choices:
1) The best one would be to port actionaz to Qt5, solving all problems
and extending the lifetime of the app.
2) Removing the features qtmobility provides to actionaz. I'm attaching a
rough patch for that, which has not been tested at all.
Kinds regards, Lisandro.
-- System Information:
Debian Release: 8.0
APT prefers stable
APT policy: (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff --git a/actions/actionpacksystem/actionpacksystem.h b/actions/actionpacksystem/actionpacksystem.h
index 2e42120..c2708fa 100644
--- a/actions/actionpacksystem/actionpacksystem.h
+++ b/actions/actionpacksystem/actionpacksystem.h
@@ -29,7 +29,6 @@
#include "actions/systemdefinition.h"
#include "actions/openurldefinition.h"
#include "actions/detachedcommanddefinition.h"
-#include "actions/playsounddefinition.h"
#include "actions/findimagedefinition.h"
#include "code/system.h"
@@ -61,7 +60,6 @@ public:
addActionDefinition(new Actions::SystemDefinition(this));
addActionDefinition(new Actions::OpenURLDefinition(this));
addActionDefinition(new Actions::DetachedCommandDefinition(this));
- addActionDefinition(new Actions::PlaySoundDefinition(this));
addActionDefinition(new Actions::FindImageDefinition(this));
}
@@ -72,7 +70,6 @@ public:
void codeInit(QScriptEngine *scriptEngine) const
{
addCodeClass<Code::System>("System", scriptEngine);
- addCodeClass<Code::MediaPlaylist>("MediaPlaylist", scriptEngine);
addCodeClass<Code::Notify>("Notify", scriptEngine);
addCodeClass<Code::Process>("Process", scriptEngine);
addCodeStaticMethod(&Code::Process::list, "Process", "list", scriptEngine);
diff --git a/actions/actionpacksystem/actions/actions.pri b/actions/actionpacksystem/actions/actions.pri
index a16543e..ae4177c 100644
--- a/actions/actionpacksystem/actions/actions.pri
+++ b/actions/actionpacksystem/actions/actions.pri
@@ -12,14 +12,11 @@ HEADERS += actions/commanddefinition.h \
actions/openurldefinition.h \
actions/detachedcommanddefinition.h \
actions/detachedcommandinstance.h \
- actions/playsounddefinition.h \
- actions/playsoundinstance.h \
actions/findimagedefinition.h \
actions/findimageinstance.h
SOURCES += actions/killprocessinstance.cpp \
actions/notifyinstance.cpp \
actions/systeminstance.cpp \
actions/pixelcolorinstance.cpp \
- actions/playsoundinstance.cpp \
actions/findimageinstance.cpp \
actions/findimagedefinition.cpp
diff --git a/actions/actionpacksystem/code/code.pri b/actions/actionpacksystem/code/code.pri
index 64b0ef6..d84ead6 100644
--- a/actions/actionpacksystem/code/code.pri
+++ b/actions/actionpacksystem/code/code.pri
@@ -1,12 +1,7 @@
HEADERS += code/system.h \
- code/mediaplaylist.h \
code/notify.h \
code/process.h
SOURCES += code/system.cpp \
- code/mediaplaylist.cpp \
code/notify.cpp \
code/process.cpp
win32:LIBS += -ladvapi32
-CONFIG += mobility
-MOBILITY += systeminfo \
- multimedia
diff --git a/actions/actionpacksystem/code/system.cpp b/actions/actionpacksystem/code/system.cpp
index 467aec9..d3232d2 100644
--- a/actions/actionpacksystem/code/system.cpp
+++ b/actions/actionpacksystem/code/system.cpp
@@ -22,11 +22,11 @@
#include "code/rect.h"
#include "../systemsession.h"
-#include <QSystemInfo>
+//#include <QSystemInfo>
#include <QDesktopServices>
-#include <QSystemStorageInfo>
-#include <QSystemDisplayInfo>
-#include <QSystemDeviceInfo>
+//#include <QSystemStorageInfo>
+//#include <QSystemDisplayInfo>
+//#include <QSystemDeviceInfo>
#include <QDesktopWidget>
#include <QApplication>
#include <QUrl>
@@ -39,7 +39,7 @@
#include <LMCons.h>
#endif
-QTM_USE_NAMESPACE
+//QTM_USE_NAMESPACE
namespace Code
{
@@ -50,11 +50,7 @@ namespace Code
System::System()
: CodeClass(),
- mSystemSession(new SystemSession),
- mSystemInfo(new QSystemInfo(this)),
- mSystemStorageInfo(new QSystemStorageInfo(this)),
- mSystemDisplayInfo(new QSystemDisplayInfo(this)),
- mSystemDeviceInfo(new QSystemDeviceInfo(this))
+ mSystemSession(new SystemSession)
{
}
@@ -146,74 +142,89 @@ namespace Code
QString System::version() const
{
- return mSystemInfo->version(QSystemInfo::Os);
+ // return mSystemInfo->version(QSystemInfo::Os);
+ return QString();
}
QString System::countryCode() const
{
- return mSystemInfo->currentCountryCode();
+ //return mSystemInfo->currentCountryCode();
+ return QString();
}
QString System::language() const
{
- return mSystemInfo->currentLanguage();
+ return QString();
+ //return mSystemInfo->currentLanguage();
}
QStringList System::logicalDrives() const
{
- return QSystemStorageInfo::logicalDrives();
+ return QStringList();
+// return QSystemStorageInfo::logicalDrives();
}
qlonglong System::availableDiskSpace(const QString &drive) const
{
- return mSystemStorageInfo->availableDiskSpace(drive);
+ return 0;
+// return mSystemStorageInfo->availableDiskSpace(drive);
}
qlonglong System::totalDiskSpace(const QString &drive) const
{
- return mSystemStorageInfo->totalDiskSpace(drive);
+ return 0;
+ // return mSystemStorageInfo->totalDiskSpace(drive);
}
System::DriveType System::driveType(const QString &drive) const
{
- return static_cast<DriveType>(mSystemStorageInfo->typeForDrive(drive));
+ Q_UNUSED(drive);
+ return System::DriveType(0);
+// return static_cast<DriveType>(mSystemStorageInfo->typeForDrive(drive));
}
int System::colorDepth(int screenId) const
{
- int screen = (screenId == -1 ? QApplication::desktop()->primaryScreen() : screenId);
- return mSystemDisplayInfo->colorDepth(screen);
+// int screen = (screenId == -1 ? QApplication::desktop()->primaryScreen() : screenId);
+// return mSystemDisplayInfo->colorDepth(screen);
+ return 0;
}
int System::displayBrightness(int screenId) const
{
- int screen = (screenId == -1 ? QApplication::desktop()->primaryScreen() : screenId);
- return mSystemDisplayInfo->displayBrightness(screen);
+ //int screen = (screenId == -1 ? QApplication::desktop()->primaryScreen() : screenId);
+ //return mSystemDisplayInfo->displayBrightness(screen);
+ return 0;
}
int System::batteryLevel() const
{
- return mSystemDeviceInfo->batteryLevel();
+// return mSystemDeviceInfo->batteryLevel();
+ return 0;
}
System::PowerState System::powerState() const
{
- return static_cast<System::PowerState>(mSystemDeviceInfo->currentPowerState());
+ return System::PowerState(0);
+ //return static_cast<System::PowerState>(mSystemDeviceInfo->currentPowerState());
}
QString System::manufacturer() const
{
- return mSystemDeviceInfo->manufacturer();
+ return QString();
+// return mSystemDeviceInfo->manufacturer();
}
QString System::model() const
{
- return mSystemDeviceInfo->model();
+ return QString();
+ //return mSystemDeviceInfo->model();
}
QString System::productName() const
{
- return mSystemDeviceInfo->productName();
+ return QString();
+// return mSystemDeviceInfo->productName();
}
QScriptValue System::logout(bool force) const
diff --git a/actions/actionpacksystem/code/system.h b/actions/actionpacksystem/code/system.h
index 4b71586..a9351bf 100644
--- a/actions/actionpacksystem/code/system.h
+++ b/actions/actionpacksystem/code/system.h
@@ -27,14 +27,20 @@
#include <QScriptValue>
#include <QScriptEngine>
#include <QStringList>
+#if 0
#include <qmobilityglobal.h>
QTM_BEGIN_NAMESPACE
+#else
+#define QTM_PREPEND_NAMESPACE(x) void
+#endif
class QSystemInfo;
class QSystemStorageInfo;
class QSystemDisplayInfo;
class QSystemDeviceInfo;
+#if 0
QTM_END_NAMESPACE
+#endif
class SystemSession;
diff --git a/debian/changelog b/debian/changelog
index a9924e6..c8c2e58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+actionaz (3.8.0-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * mobility--
+
+ -- Sune Vuorela <[email protected]> Wed, 20 May 2015 19:05:40 +0200
+
actionaz (3.8.0-1) unstable; urgency=medium
* New upstream release
diff --git a/gui/gui.pro b/gui/gui.pro
index 67cba1d..848e52a 100644
--- a/gui/gui.pro
+++ b/gui/gui.pro
@@ -4,11 +4,9 @@ QT += xml \
network \
script \
scripttools
-CONFIG += mobility
contains(DEFINES, ACT_PROFILE) {
CONFIG += console
}
-MOBILITY += systeminfo
TARGET = actionaz
VERSION = $$ACTIONAZ_VERSION
DESTDIR = ..
@@ -59,6 +57,8 @@ HEADERS += mainwindow.h \
resourcesizeitem.h \
resourcenamedelegate.h
!contains(DEFINES, ACT_NO_UPDATER) {
+ CONFIG += mobility
+ MOBILITY += systeminfo
SOURCES += changelogdialog.cpp
HEADERS += changelogdialog.h
}
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 160c533..fe0b7ab 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -44,6 +44,7 @@
#ifndef ACT_NO_UPDATER
#include "changelogdialog.h"
#include "updater.h"
+#include <QSystemInfo>
#endif
#include "sevenziparchivewrite.h"
#include "actionpack.h"
@@ -74,14 +75,15 @@
#include <QProcess>
#include <QTemporaryFile>
#include <QListWidget>
-#include <QSystemInfo>
#include <QScriptValueIterator>
#ifdef Q_WS_X11
#include <QX11Info>
#endif
+#ifndef ACT_NO_UPDATER
QTM_USE_NAMESPACE
+#endif
MainWindow::MainWindow(QxtCommandOptions *commandOptions, ProgressSplashScreen *splashScreen, const QString &startScript, const QString &usedLocale)
: QMainWindow(0),
