casa-mp-base

diff -ur kdelibs-4.13.3-orig/kdeui/widgets/kmainwindow.cpp kdelibs-4.13.3/kdeui/widgets/kmainwindow.cpp

--- kdelibs-4.13.3-orig/kdeui/widgets/kmainwindow.cpp   2014-07-11 15:42:13.000000000 +0900

+++ kdelibs-4.13.3/kdeui/widgets/kmainwindow.cpp    2014-09-20 18:52:54.000000000 +0900

@@ -241,6 +241,8 @@

     q->setAttribute( Qt::WA_DeleteOnClose );

+    q->setUnifiedTitleAndToolBarOnMac(true);

+

     // We handle this functionality (quitting the app) ourselves, with KGlobal::ref/deref.

     // This makes apps stay alive even if they only have a systray icon visible, or

     // a progress widget with "keep open" checked, for instance.

diff -ur kdelibs-4.13.3-orig/kio/kfile/kfiledialog.cpp kdelibs-4.13.3/kio/kfile/kfiledialog.cpp

--- kdelibs-4.13.3-orig/kio/kfile/kfiledialog.cpp   2014-07-11 15:42:13.000000000 +0900

+++ kdelibs-4.13.3/kio/kfile/kfiledialog.cpp    2014-09-20 18:52:54.000000000 +0900

@@ -44,8 +44,8 @@

 #include "krecentdirs.h"

 #include "kservice.h"

-/** File dialogs are native by default on Windows. */

-#if defined(Q_WS_WIN) || defined(Q_WS_MAEMO_5)

+/** File dialogs are native by default on Windows and Mac. */

+#if defined(Q_WS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAC)

 const bool NATIVE_FILEDIALOGS_BY_DEFAULT = true;

 #else

 const bool NATIVE_FILEDIALOGS_BY_DEFAULT = false;

@@ -252,7 +252,7 @@

 KFileDialog::KFileDialog( const KUrl& startDir, const QString& filter,

                           QWidget *parent, QWidget* customWidget)

-#ifdef Q_WS_WIN

+#if (defined Q_WS_WIN || defined Q_WS_MAC )

     : KDialog( parent , Qt::WindowMinMaxButtonsHint),

 #else

     : KDialog( parent ),

@@ -312,8 +312,8 @@

     connect(fileQWidget, SIGNAL(accepted()), SLOT(accept()));

     //connect(fileQWidget, SIGNAL(canceled()), SLOT(slotCancel()));

-    if (customWidget)

-     d->w->setCustomWidget(QString(), customWidget);

+    if (customWidget){}

+     //d->w->setCustomWidget(QString(), customWidget);

 }

@@ -961,7 +961,7 @@

     return d->w;

 }

-#ifdef Q_WS_WIN

+#if (defined Q_WS_WIN || defined Q_WS_MAC)

 int KFileDialog::exec()

 {

     if (!d->native || !KFileDialogPrivate::Native::s_allowNative) {

@@ -1051,7 +1051,7 @@

     return res;

 }

-#endif // Q_WS_WIN

+#endif // Q_WS_WIN || Q_WS_MAC

 #ifdef Q_WS_WIN