vlc | branch: master | Felix Paul Kühne <[email protected]> | Sat Dec 4 15:25:57 2010 +0100| [0bb330fd28ec0ccfdc54718bb709149610d0f532] | committer: Felix Paul Kühne
qt4: fixed search field compilation for Mac and s/Carbon/Cocoa Note that Carbon code isn't supported in 64bit applications... > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0bb330fd28ec0ccfdc54718bb709149610d0f532 --- modules/gui/qt4/util/searchlineedit.hpp | 3 +-- modules/gui/qt4/util/searchlineedit_mac.mm | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/gui/qt4/util/searchlineedit.hpp b/modules/gui/qt4/util/searchlineedit.hpp index 436996b..6b98017 100644 --- a/modules/gui/qt4/util/searchlineedit.hpp +++ b/modules/gui/qt4/util/searchlineedit.hpp @@ -27,10 +27,9 @@ #ifndef _SEARCHLINEEDIT_H_ #define _SEARCHLINEEDIT_H_ +#import "../qt4.hpp" #include <QLineEdit> -#include <qt4.hpp> - #if HAS_QT47 class ClickLineEdit : public QLineEdit { diff --git a/modules/gui/qt4/util/searchlineedit_mac.mm b/modules/gui/qt4/util/searchlineedit_mac.mm index cb4feb6..890c80a 100644 --- a/modules/gui/qt4/util/searchlineedit_mac.mm +++ b/modules/gui/qt4/util/searchlineedit_mac.mm @@ -29,11 +29,11 @@ ** ****************************************************************************/ -#include "util/searchlineedit.hpp" +#include "searchlineedit.hpp" #ifdef Q_WS_MAC -#include <Carbon/Carbon.h> +#include <Cocoa/Cocoa.h> //![0] SearchLineEdit::SearchLineEdit(QWidget *parent) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
