Changeset 76622 in vbox

Timestamp:

Jan 3, 2019 3:41:31 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

127926

Message:

FE/Qt: Fixed creating VM shortcuts when using VBOX_GUI_WITH_SHARED_LIBRARY (VirtualBoxVM).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/platform

Files:

• UIDesktopServices.h (modified) (1 diff)
• win/UIDesktopServices_win.cpp (modified) (1 diff)
• x11/UIDesktopServices_x11.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/UIDesktopServices.h ¶

@@ -25 +25 @@
 #include <QUuid>
 
+#ifdef VBOX_GUI_WITH_SHARED_LIBRARY
+/** Name of the executable (image) used to start VMs. */
+# define VBOX_GUI_VMRUNNER_IMAGE "VirtualBoxVM"
+#endif
+
 /* Qt forward declarations */
 class QString;

trunk/src/VBox/Frontends/VirtualBox/src/platform/win/UIDesktopServices_win.cpp ¶

@@ -32 +32 @@
     IShellLink *pShl = NULL;
     IPersistFile *pPPF = NULL;
-    QString strVBox = QDir::toNativeSeparators(QCoreApplication::applicationFilePath());
+#ifdef VBOX_GUI_WITH_SHARED_LIBRARY
+    QString strVBox = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + "/" + VBOX_GUI_VMRUNNER_IMAGE);
+
+#else
+    QString strVBox = QDir::toNativeSeparatorsgg (QCoreApplication::applicationFilePath());
+#endif
     QFileInfo fi(strVBox);
     QString strVBoxDir = QDir::toNativeSeparators(fi.absolutePath());

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/UIDesktopServices_x11.cpp ¶

@@ -33 +33 @@
     if (link.open(QFile::WriteOnly | QFile::Truncate))
     {
+#ifdef VBOX_GUI_WITH_SHARED_LIBRARY
+        QString strVBox = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + "/" + VBOX_GUI_VMRUNNER_IMAGE);
+#else
+        QString strVBox = QDir::toNativeSeparators(QCoreApplication::applicationFilePath());
+#endif
         QTextStream out(&link);
         out.setCodec("UTF-8");
@@ -42 +47 @@
             << "Comment=Starts the VirtualBox machine " << strName << endl
             << "Type=Application" << endl
-            << "Exec=" << QCoreApplication::applicationFilePath() << " --comment \"" << strName << "\" --startvm \"" << uUuid.toString() << "\"" << endl
+            << "Exec=" << strVBox << " --comment \"" << strName << "\" --startvm \"" << uUuid.toString() << "\"" << endl
             << "Icon=virtualbox-vbox.png" << endl;
         /* This would be a real file link entry, but then we could also simply