[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-baseapps/frameworks] lib/konq/src: QT_WA is not available on Qt5. We also only use the Unicode 
From:       Albert Astals Cid <aacid () kde ! org>
Date:       2015-02-12 22:53:37
Message-ID: E1YM2dd-0007Bu-96 () scm ! kde ! org
[Download RAW message or body]

Git commit e77ec3bdae562700f5cabfa49f802b1d806cf71c by Albert Astals Cid, on behalf of Andrius da Costa Ribas.
Committed on 12/02/2015 at 22:53.
Pushed by aacid into branch 'frameworks'.

QT_WA is not available on Qt5. We also only use the Unicode version, anyways.

REVIEW: 121081
Acked by dfaure

M  +1    -2    lib/konq/src/konq_copytomenu.cpp

http://commits.kde.org/kde-baseapps/e77ec3bdae562700f5cabfa49f802b1d806cf71c

diff --git a/lib/konq/src/konq_copytomenu.cpp b/lib/konq/src/konq_copytomenu.cpp
index 71119b6..e286149 100644
--- a/lib/konq/src/konq_copytomenu.cpp
+++ b/lib/konq/src/konq_copytomenu.cpp
@@ -124,8 +124,7 @@ void KonqCopyToMainMenu::slotAboutToShow()
     foreach ( const QFileInfo& info, QDir::drives() ) {
         uint type = DRIVE_UNKNOWN;
         QString driveIcon = "drive-harddisk";
-        QT_WA({ type = GetDriveTypeW((wchar_t *)info.absoluteFilePath().utf16()); },
-              { type = GetDriveTypeA(info.absoluteFilePath().toLocal8Bit()); });
+        type = GetDriveTypeW((wchar_t *)info.absoluteFilePath().utf16());
         switch (type) {
             case DRIVE_REMOVABLE:
                 driveIcon = "drive-removable-media";
[prev in list] [next in list] [prev in thread] [next in thread]