From c4c74d84dc4dacc63f1841ef27559149a56041de Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Thu, 22 Dec 2011 20:29:54 -0500 Subject: [PATCH] Show search widget on qt 4.8 --- src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h | 1 + src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp | 2 +- src/libtomahawk/thirdparty/Qocoa/qsearchfield_mac.mm | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h b/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h index d86f9ad27..1b6963d11 100644 --- a/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h +++ b/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h @@ -45,6 +45,7 @@ static inline void zeroLayout(void *cocoaView, QWidget *parent) { QVBoxLayout *layout = new QVBoxLayout(parent); layout->setMargin(0); + parent->setAttribute(Qt::WA_NativeWindow); layout->addWidget(new QMacCocoaViewContainer(cocoaView, parent)); } diff --git a/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp b/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp index a1da7af8c..7772755e8 100644 --- a/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp +++ b/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include #include "playlist/topbar/searchlineedit.h" -#include "utils/tomahawkutilsgui.h" +#include "utils/tomahawkutils.h" class DLLEXPORT QSearchFieldPrivate { diff --git a/src/libtomahawk/thirdparty/Qocoa/qsearchfield_mac.mm b/src/libtomahawk/thirdparty/Qocoa/qsearchfield_mac.mm index 5f60cf1e8..120a8c291 100644 --- a/src/libtomahawk/thirdparty/Qocoa/qsearchfield_mac.mm +++ b/src/libtomahawk/thirdparty/Qocoa/qsearchfield_mac.mm @@ -25,8 +25,6 @@ THE SOFTWARE. #include "qocoa_mac.h" -#include "qsearchfield.h" - #import "Foundation/NSAutoreleasePool.h" #import "Foundation/NSNotification.h" #import "AppKit/NSSearchField.h"