Commit 59d9a344 authored by David Faure's avatar David Faure

Compilation fixes on Mac OS X

svn path=/trunk/koffice/; revision=542307
parent 0dfcfdac
......@@ -18,8 +18,8 @@
#include <kdebug.h>
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
......
......@@ -59,7 +59,6 @@
**********************************************************************/
#include <QCursor>
//Added by qt3to4:
#include <QWheelEvent>
#include <QPaintEvent>
#include <QKeyEvent>
......@@ -68,6 +67,7 @@
#include <QTabletEvent>
#include <QDragEnterEvent>
#include <QMouseEvent>
#include <QApplication>
#include "kis_canvas.h"
#include "kis_cursor.h"
......@@ -85,7 +85,6 @@
#ifdef Q_WS_X11
#include <qdesktopwidget.h>
#include <QApplication>
#include <QX11Info>
#include <X11/keysym.h>
......
......@@ -95,8 +95,8 @@ KisOpenGLImageContext::KisOpenGLImageContext(KisImageSP image, KisProfile *monit
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
m_imageTextureTileWidth = qMin(PREFERRED_IMAGE_TEXTURE_WIDTH, max_texture_size);
m_imageTextureTileHeight = qMin(PREFERRED_IMAGE_TEXTURE_HEIGHT, max_texture_size);
m_imageTextureTileWidth = qMin((GLint)PREFERRED_IMAGE_TEXTURE_WIDTH, max_texture_size);
m_imageTextureTileHeight = qMin((GLint)PREFERRED_IMAGE_TEXTURE_HEIGHT, max_texture_size);
createImageTextureTiles();
......
......@@ -1743,7 +1743,7 @@ void KisView::saveLayerAsImage()
QStringList listMimeFilter = KoFilterManager::mimeFilter("application/x-krita", KoFilterManager::Export);
QString mimelist = listMimeFilter.join(" ");
KFileDialog fd (QString(), mimelist, this);
KFileDialog fd (QString::null, mimelist, this);
fd.setObjectName("Export Layer");
fd.setCaption(i18n("Export Layer"));
fd.setMimeFilter(listMimeFilter);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment