Changeset 10149 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Jul 3, 2008 11:59:35 AM (17 years ago)

Author:

vboxsync

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

32678

Message:

FE/Qt4-Win: fixes for building without the Qt3Support library

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxSelectorWnd.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (2 diffs)
• src/VBoxFBDDRAW.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (2 diffs)
• src/VBoxProblemReporter.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxSelectorWnd.h

@@ -43 +43 @@
 class QListView;
 class QEvent;
-class QUuid;
 
 class VBoxSelectorWnd: public QIWithRetranslateUI2<QMainWindow>

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp

@@ -2572 +2572 @@
             if (ch)
                 processed = processHotKey (QKeySequence (Qt::UNICODE_ACCEL +
-                                                QChar (ch).upper().unicode()),
+                                                QChar (ch).toUpper().unicode()),
                                            mMainWnd->menuBar()->actions());
         }
@@ -3089 +3089 @@
         viewport()->setCursor (QCursor (Qt::BlankCursor));
         /* move the mouse to the center of the visible area */
-        QCursor::setPos (mapToGlobal (visibleRect().center()));
+        QCursor::setPos (mapToGlobal (visibleRegion().boundingRect().center()));
         mLastPos = QCursor::pos();
 #elif defined (Q_WS_MAC)

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxFBDDRAW.cpp

@@ -281 +281 @@
     getWindowPosition();
 
-    mView->setBackgroundMode (Qt::NoBackground);
+//#warning: port me
+//    mView->setBackgroundMode (Qt::NoBackground);
 }
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

@@ -3407 +3407 @@
             else
             {
-                workDir = fi.dirPath (true);
+                workDir = fi.absolutePath();
                 initSel = fi.fileName();
             }
@@ -3453 +3453 @@
                 PostMessage (msg.hwnd, msg.message, 0, msg.lParam);
 
-            result = result.isEmpty() ? result : QFileInfo (result).absFilePath();
+            result = result.isEmpty() ? result : QFileInfo (result).absoluteFilePath();
 
             QApplication::postEvent (mTarget, new GetOpenFileNameEvent (result));

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxProblemReporter.cpp

@@ -2146 +2146 @@
     QString fullHelpFilePath = qApp->applicationDirPath() + "/VirtualBox.chm";
 
-    HtmlHelp (GetDesktopWindow(), fullHelpFilePath.ucs2(),
+    HtmlHelp (GetDesktopWindow(), fullHelpFilePath.utf16(),
               HH_DISPLAY_TOPIC, NULL);
 #elif defined (Q_WS_X11)