Merge branch 'master' of github.com:Sankore/Sankore-3.1

Sankore_3.1.pro

@@ -86,6 +86,7 @@ BUILD_DIR = build
 macx:BUILD_DIR = $$BUILD_DIR/macx
 win32:BUILD_DIR = $$BUILD_DIR/win32
 linux-g++:BUILD_DIR = $$BUILD_DIR/linux
+linux-g++-32:BUILD_DIR = $$BUILD_DIR/linux
 linux-g++-64:BUILD_DIR = $$BUILD_DIR/linux
 
 CONFIG(debug, debug|release):BUILD_DIR = $$BUILD_DIR/debug
@@ -109,7 +110,7 @@ win32 {
    QMAKE_CXXFLAGS_RELEASE += /Od \
        /Zi
    QMAKE_LFLAGS_RELEASE += /DEBUG
-   UB_LIBRARY.path = $$DESTDIR
+   UB_LIBRARY.path = DESTDIR
    UB_I18N.path = $$DESTDIR/i18n
    UB_ETC.path = $$DESTDIR
    UB_THIRDPARTY_INTERACTIVE.path = $$DESTDIR/library
@@ -117,6 +118,7 @@ win32 {
    system(echo "$$VERSION" > $$BUILD_DIR/version)
    system(echo "$$LONG_VERSION" > $$BUILD_DIR/longversion)
    system(echo "$$SVN_VERSION" > $$BUILD_DIR/svnversion)
+
 }
 
 macx {
@@ -323,6 +325,21 @@ linux-g++ {
    system(echo "$$SVN_VERSION" > $$BUILD_DIR/svnversion)
 }
 
+linux-g++-32 {
+   LIBS += -lcrypto
+   QMAKE_CFLAGS += -fopenmp
+   QMAKE_CXXFLAGS += -fopenmp
+   QMAKE_LFLAGS += -fopenmp
+   UB_LIBRARY.path = $$DESTDIR
+   UB_I18N.path = $$DESTDIR/i18n
+   UB_ETC.path = $$DESTDIR
+   UB_THIRDPARTY_INTERACTIVE.path = $$DESTDIR/library
+   system(mkdir -p $$BUILD_DIR)
+   system(echo "$$VERSION" > $$BUILD_DIR/version)
+   system(echo "$$LONG_VERSION" > $$BUILD_DIR/longversion)
+   system(echo "$$SVN_VERSION" > $$BUILD_DIR/svnversion)
+}
+
 linux-g++-64 { 
     LIBS += -lcrypto
     QMAKE_CFLAGS += -fopenmp

src/desktop/desktop.pri

@@ -24,3 +24,4 @@ win32 {
 macx:SOURCES += src/desktop/UBWindowCapture_mac.mm
 
 linux-g++:SOURCES += src/desktop/UBWindowCapture_linux.cpp
+linux-g++-32:SOURCES += src/desktop/UBWindowCapture_linux.cpp

src/domain/UBGraphicsPixmapItem.cpp

@@ -25,7 +25,7 @@
 
 #include "core/memcheck.h"
 
-UBGraphicsPixmapItem::UBGraphicsPixmapItem(QGraphicsItem* parent/*, QString pSource*/)
+UBGraphicsPixmapItem::UBGraphicsPixmapItem(QGraphicsItem* parent)
     : QGraphicsPixmapItem(parent)
 {
     mDelegate = new UBGraphicsItemDelegate(this, 0, true, true);

src/domain/UBGraphicsTextItemDelegate.cpp

@@ -31,7 +31,7 @@
 const int UBGraphicsTextItemDelegate::sMinPixelSize = 8;
 
 UBGraphicsTextItemDelegate::UBGraphicsTextItemDelegate(UBGraphicsTextItem* pDelegated, QObject * parent)
-    : UBGraphicsItemDelegate(pDelegated,0, parent, false)
+    : UBGraphicsItemDelegate(pDelegated,0, parent, true)
     , mLastFontPixelSize(-1)
 {
     // NOOP

src/frameworks/frameworks.pri

@@ -38,4 +38,9 @@ linux-g++ {
 
     SOURCES  += src/frameworks/UBPlatformUtils_linux.cpp \
                 src/frameworks/UBDesktopServices_linux.cpp
-}         
+}         
+linux-g++-32 {
+
+    SOURCES  += src/frameworks/UBPlatformUtils_linux.cpp \
+                src/frameworks/UBDesktopServices_linux.cpp
+}

src/gui/gui.pri

@@ -108,3 +108,8 @@ linux-g++ {
 
     SOURCES  += src/gui/UBKeyboardPalette_linux.cpp
 }
+
+linux-g++-32 {
+
+    SOURCES  += src/gui/UBKeyboardPalette_linux.cpp
+}

src/pdf-merger/pdfMerger.pri

@@ -72,4 +72,9 @@ linux-g++ {
 
    LIBS += -lz
 
-}
+}
+linux-g++-32 {
+
+   LIBS += -lz
+
+}