Index: Vago/trunk/Vago/Vago.pro
===================================================================
--- Vago/trunk/Vago/Vago.pro	(revision 998)
+++ Vago/trunk/Vago/Vago.pro	(revision 999)
@@ -5,8 +5,7 @@
 #-------------------------------------------------
 
-QT       += core gui
+QT       += widgets
 QT       += network #network communication
 QT       += script #for json parse
-QT       += widgets
 
 INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
Index: Vago/trunk/Vago/libs/unzip.h
===================================================================
--- Vago/trunk/Vago/libs/unzip.h	(revision 998)
+++ Vago/trunk/Vago/libs/unzip.h	(revision 999)
@@ -35,5 +35,5 @@
 #include <QtCore/QtGlobal>
 
-#include <QtZlib/zlib.h>
+#include <zlib.h>
 
 class QDir;
Index: Vago/trunk/Vago/libs/zip.h
===================================================================
--- Vago/trunk/Vago/libs/zip.h	(revision 998)
+++ Vago/trunk/Vago/libs/zip.h	(revision 999)
@@ -34,5 +34,5 @@
 #include <QtCore/QtGlobal>
 
-#include <QtZlib/zlib.h>
+#include <zlib.h>
 
 class QIODevice;
Index: Vago/trunk/Vago/main.cpp
===================================================================
--- Vago/trunk/Vago/main.cpp	(revision 998)
+++ Vago/trunk/Vago/main.cpp	(revision 999)
@@ -3,5 +3,5 @@
 #ifdef USING_VM_TABLET_WARNING_FIX
 #include <qapplication.h>
-void myMessageOutput(QtMsgType type, const char *msg);
+void myMessageOutput(QtMsgType type, const QMessageLogContext &, const QString & str);
 #endif
 
@@ -13,5 +13,5 @@
 
 #ifdef USING_VM_TABLET_WARNING_FIX
-    qInstallMsgHandler(myMessageOutput);
+    qInstallMessageHandler(myMessageOutput);
 #endif
 
@@ -25,9 +25,12 @@
 
 #ifdef USING_VM_TABLET_WARNING_FIX
-void myMessageOutput(QtMsgType type, const char *msg)
+void myMessageOutput(QtMsgType type, const QMessageLogContext &, const QString & str)
 {
+
+    const char * msg = str.toStdString().c_str();
+
     switch (type) {
     case QtWarningMsg:
-        if(QString(msg)=="QCocoaView handleTabletEvent: This tablet device is unknown (received no proximity event for it). Discarding event."){ // ignore this message
+        if(QString(msg)=="QNSView handleTabletEvent: This tablet device is unknown (received no proximity event for it). Discarding event."){ // ignore this message
             return;
         }
Index: Vago/trunk/Vago/mainwindow.cpp
===================================================================
--- Vago/trunk/Vago/mainwindow.cpp	(revision 998)
+++ Vago/trunk/Vago/mainwindow.cpp	(revision 999)
@@ -79,6 +79,6 @@
     }
 #ifdef Q_OS_MAC
-    if(!this->vagoSettings->contains("UseYesButtonClear")){
-        this->vagoSettings->setValue("UseYesButtonClear", false);
+    if(!this->vagoSettings->contains("useYesAsDefaultWhenRemovingItems")){
+        this->vagoSettings->setValue("useYesAsDefaultWhenRemovingItems", false);
         iniChanged=true;
     }
@@ -97,5 +97,5 @@
     this->startedWindowHeight=this->vagoSettings->value("WindowHeight").toInt();
 #ifdef Q_OS_MAC
-    this->useYesAsDefaultInClearButton=this->vagoSettings->value("UseYesButtonClear").toBool();
+    this->useYesAsDefaultWhenRemovingItems=this->vagoSettings->value("useYesAsDefaultWhenRemovingItems").toBool();
 #endif
 
@@ -1070,5 +1070,5 @@
 
 #ifdef Q_OS_MAC
-    if(this->useYesAsDefaultInClearButton){
+    if(this->useYesAsDefaultWhenRemovingItems){
         defaultButton = QMessageBox::Yes;
     }
@@ -1089,4 +1089,7 @@
 
 void MainWindow::clearTableContents(DropTableWidget *myTable){
+
+    QMessageBox::StandardButton defaultButton = QMessageBox::NoButton; // default button for clear asking question, only customizable in mac os
+
     if(myTable->rowCount()==0){
         Util::showPopUp("Nothing to clear.");
@@ -1094,5 +1097,14 @@
     }
 
-    if(Util::showQuestionPopUp(this,"Are you sure you want to clear the content?")){
+#ifdef Q_OS_MAC
+    if(this->useYesAsDefaultWhenRemovingItems){
+        defaultButton = QMessageBox::Yes;
+    }
+    else{
+        defaultButton = QMessageBox::No;
+    }
+#endif
+
+    if(Util::showQuestionPopUp(this,"Are you sure you want to clear the content?",defaultButton)){
         myTable->clearContents();
         myTable->setRowCount(0);
Index: Vago/trunk/Vago/mainwindow.h
===================================================================
--- Vago/trunk/Vago/mainwindow.h	(revision 998)
+++ Vago/trunk/Vago/mainwindow.h	(revision 999)
@@ -192,5 +192,5 @@
     int startedWindowHeight;
 #ifdef Q_OS_MAC
-    bool useYesAsDefaultInClearButton;
+    bool useYesAsDefaultWhenRemovingItems;
 #endif
     QLabel *itemsLoaded;
Index: Vago/trunk/Vago/preferences.cpp
===================================================================
--- Vago/trunk/Vago/preferences.cpp	(revision 998)
+++ Vago/trunk/Vago/preferences.cpp	(revision 999)
@@ -18,7 +18,10 @@
     ui->cbSeparate->setChecked(this->vagoSettings->value("SeparateInWorkspace").toBool());
     ui->cbVagoExit->setChecked(this->vagoSettings->value("ConfirmExit").toBool());
+#ifdef Q_OS_MAC
+    ui->cbUseYesAsDefaultWhenRemovingItems->setChecked(this->vagoSettings->value("useYesAsDefaultWhenRemovingItems").toBool());
+#endif
 
 #ifdef Q_OS_WIN
-    ui->cbClearButtonYes->hide(); // don't display this mac os only option in windows
+    ui->cbUseYesAsDefaultWhenRemovingItems->hide(); // don't display this mac os only option in windows
 #endif
 
@@ -66,5 +69,5 @@
     this->vagoSettings->setValue("ConfirmExit",ui->cbVagoExit->isChecked());
 #ifdef Q_OS_MAC
-    this->vagoSettings->setValue("UseYesButtonClear",ui->cbClearButtonYes->isChecked());
+    this->vagoSettings->setValue("useYesAsDefaultWhenRemovingItems",ui->cbUseYesAsDefaultWhenRemovingItems->isChecked());
 #endif
 
Index: Vago/trunk/Vago/preferences.ui
===================================================================
--- Vago/trunk/Vago/preferences.ui	(revision 998)
+++ Vago/trunk/Vago/preferences.ui	(revision 999)
@@ -8,5 +8,5 @@
     <y>0</y>
     <width>493</width>
-    <height>258</height>
+    <height>291</height>
    </rect>
   </property>
@@ -140,7 +140,7 @@
       </item>
       <item>
-       <widget class="QCheckBox" name="cbClearButtonYes">
+       <widget class="QCheckBox" name="cbUseYesAsDefaultWhenRemovingItems">
         <property name="text">
-         <string>Use Yes button as default for Clear items</string>
+         <string>Use Yes button as default when removing items</string>
         </property>
        </widget>