Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 23:49:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modifications to get it compiling under MacOSX.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2345 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-02-16 23:08:48 +00:00
parent 56e9536336
commit f2f23e7ece
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
retroshare-gui/src/RetroShare.pro
View File

@ -1,4 +1,4 @@
CONFIG += qt gui uic qrc resources uitools newsettings CONFIG += qt gui uic qrc resources newsettings
QT += network xml script opengl QT += network xml script opengl
TEMPLATE = app TEMPLATE = app
@ -94,10 +94,13 @@ macx {
# ENABLE THIS OPTION FOR Univeral Binary BUILD. # ENABLE THIS OPTION FOR Univeral Binary BUILD.
# CONFIG += ppc x86 # CONFIG += ppc x86
LIBS += -Wl,-search_paths_first CONFIG += version_detail_bash_script
LIBS += -L"../../../../lib" -lretroshare -lssl -lcrypto -lminiupnpc -lz LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += -lgpgme LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error
LIBS += -lQtUiTools LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
INCLUDEPATH += .
} }
############################## Common stuff ###################################### ############################## Common stuff ######################################

11
retroshare-gui/src/gui/toaster/QtToaster.cpp
View File

@ -26,10 +26,6 @@
#include <QtGui/QtGui> #include <QtGui/QtGui>
#ifdef OS_MACOSX
#include <MacWindows.h>
#endif
static const unsigned TIME_TO_SHOW = 20; static const unsigned TIME_TO_SHOW = 20;
QtToaster::QtToaster(QWidget * toaster, QFrame * toasterWindowFrame) QtToaster::QtToaster(QWidget * toaster, QFrame * toasterWindowFrame)
@ -41,14 +37,7 @@ QtToaster::QtToaster(QWidget * toaster, QFrame * toasterWindowFrame)
_toaster = toaster; _toaster = toaster;
_toaster->setParent(_toaster->parentWidget(), Qt::ToolTip | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint); _toaster->setParent(_toaster->parentWidget(), Qt::ToolTip | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
#ifdef OS_MACOSX
// Make sure the other windows of the application are not raised when the
// toaster appears
WId wid = _toaster->winId();
SetWindowGroup((WindowRef)wid, NULL);
#else
_toaster->setWindowFlags(_toaster->windowFlags() | Qt::ToolTip); _toaster->setWindowFlags(_toaster->windowFlags() | Qt::ToolTip);
#endif
WidgetBackgroundImage::setBackgroundImage(toasterWindowFrame, ":images/toaster/toaster-backrs4.png", WidgetBackgroundImage::AdjustSize); WidgetBackgroundImage::setBackgroundImage(toasterWindowFrame, ":images/toaster/toaster-backrs4.png", WidgetBackgroundImage::AdjustSize);