Removed ThirdParty directory. Moved in a different repository

preferencesAboutTextFull
Claudio Valerio 14 years ago
parent 267a1e8eb0
commit 1a2d5d499e
  1. 27
      Sankore_3.1.pro
  2. 5
      release.vc9.bat
  3. 3
      src/board/UBBoardPaletteManager.cpp
  4. 2
      src/gui/UBLibraryWidget.cpp

@ -1,6 +1,8 @@
TARGET = "Sankore 3.1" TARGET = "Sankore 3.1"
TEMPLATE = app TEMPLATE = app
THIRD_PARTY_PATH=../Sankore-ThirdParty
CONFIG += debug_and_release \ CONFIG += debug_and_release \
no_include_pwd no_include_pwd
@ -30,7 +32,7 @@ QT += xmlpatterns
INCLUDEPATH += src INCLUDEPATH += src
include(thirdparty/libs.pri) include($$THIRD_PARTY_PATH/libs.pri)
include(src/adaptors/adaptors.pri) include(src/adaptors/adaptors.pri)
include(src/api/api.pri) include(src/api/api.pri)
include(src/board/board.pri) include(src/board/board.pri)
@ -52,12 +54,12 @@ include(src/transition/transition.pri)
DEPENDPATH += src/pdf-merger DEPENDPATH += src/pdf-merger
INCLUDEPATH += src/pdf-merger INCLUDEPATH += src/pdf-merger
include(src/pdf-merger/pdfMerger.pri) include(src/pdf-merger/pdfMerger.pri)
DEPENDPATH += thirdparty/quazip/ DEPENDPATH += $$THIRD_PARTY_PATH/quazip/
INCLUDEPATH += thirdparty/quazip/ INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
include(thirdparty/quazip/quazip.pri) include($$THIRD_PARTY_PATH/quazip/quazip.pri)
DEPENDPATH += thirdparty/trolltech/singleapplication DEPENDPATH += $$THIRD_PARTY_PATH/trolltech/singleapplication
INCLUDEPATH += thirdparty/trolltech/singleapplication INCLUDEPATH += $$THIRD_PARTY_PATH/trolltech/singleapplication
include(thirdparty/trolltech/singleapplication/qtsingleapplication.pri) include($$THIRD_PARTY_PATH/trolltech/singleapplication/qtsingleapplication.pri)
FORMS += resources/forms/mainWindow.ui \ FORMS += resources/forms/mainWindow.ui \
resources/forms/preferences.ui \ resources/forms/preferences.ui \
@ -109,7 +111,6 @@ win32 {
QMAKE_CXXFLAGS_RELEASE += /Od \ QMAKE_CXXFLAGS_RELEASE += /Od \
/Zi /Zi
QMAKE_LFLAGS_RELEASE += /DEBUG QMAKE_LFLAGS_RELEASE += /DEBUG
INCLUDEPATH += thirdparty/microsoft
UB_LIBRARY.path = $$DESTDIR UB_LIBRARY.path = $$DESTDIR
UB_I18N.path = $$DESTDIR/i18n UB_I18N.path = $$DESTDIR/i18n
UB_ETC.path = $$DESTDIR UB_ETC.path = $$DESTDIR
@ -138,10 +139,10 @@ macx {
VERSION_RC_PATH = "$$BUILD_DIR/version_rc" VERSION_RC_PATH = "$$BUILD_DIR/version_rc"
# Embed version into executable for breakpad # Embed version into executable for breakpad
# QMAKE_LFLAGS += -sectcreate \ QMAKE_LFLAGS += -sectcreate \
# __DATA \ __DATA \
# __version \ __version \
# $$VERSION_RC_PATH $$VERSION_RC_PATH
QMAKE_CXXFLAGS_RELEASE += -gdwarf-2 \ QMAKE_CXXFLAGS_RELEASE += -gdwarf-2 \
-mdynamic-no-pic -mdynamic-no-pic
@ -160,7 +161,7 @@ macx {
UB_LIBRARY.path = "$$RESOURCES_DIR" UB_LIBRARY.path = "$$RESOURCES_DIR"
UB_FONTS.files = "resources/fonts" UB_FONTS.files = "resources/fonts"
UB_FONTS.path = "$$RESOURCES_DIR" UB_FONTS.path = "$$RESOURCES_DIR"
UB_THIRDPARTY_INTERACTIVE.files = $$files(thirdparty/interactive/*) UB_THIRDPARTY_INTERACTIVE.files = $$files($$THIRD_PARTY_PATH/interactive/*)
UB_THIRDPARTY_INTERACTIVE.path = "$$RESOURCES_DIR/library/interactive" UB_THIRDPARTY_INTERACTIVE.path = "$$RESOURCES_DIR/library/interactive"
UB_MACX_ICNS.files = $$files(resources/macx/*.icns) UB_MACX_ICNS.files = $$files(resources/macx/*.icns)
UB_MACX_ICNS.path = "$$RESOURCES_DIR" UB_MACX_ICNS.path = "$$RESOURCES_DIR"

@ -5,10 +5,9 @@ set VS_BIN="C:\Program Files\Microsoft Visual Studio 9.0\VC\bin"
set WIN_SDK_BIN="C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin" set WIN_SDK_BIN="C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin"
set INNO_EXE="C:\Program Files\Inno Setup 5\iscc.exe " set INNO_EXE="C:\Program Files\Inno Setup 5\iscc.exe "
set BUILD_DIR=build\win32\release set BUILD_DIR=build\win32\release
set SVN_BIN="C:\Program Files\Subversion\bin"
set UB_DATA_DIR="D:\" set UB_DATA_DIR="D:\"
set PATH=%QT_BIN%;%PATH%;%WIN_SDK_BIN%;%SVN_BIN% set PATH=%QT_BIN%;%PATH%;%WIN_SDK_BIN%
call %VS_BIN%\vcvars32.bat call %VS_BIN%\vcvars32.bat
@ -31,7 +30,7 @@ erase tmp
echo %VERSION% echo %VERSION%
echo %LAST_TAG_VERSION% echo %LAST_TAG_VERSION%
if not %VERSION%==%LAST_TAG_VERSION% GOTO EXIT_WITH_ERROR if not v%VERSION%==%LAST_TAG_VERSION% GOTO EXIT_WITH_ERROR
nmake release-install nmake release-install

@ -647,8 +647,7 @@ void UBBoardPaletteManager::changeStylusPaletteOrientation(QVariant var)
bool bVertical = var.toBool(); bool bVertical = var.toBool();
bool bVisible = mStylusPalette->isVisible(); bool bVisible = mStylusPalette->isVisible();
UBStylusPalette* mOldPalette; // Clean the old palette
// Clean the old palette
if(NULL != mStylusPalette) if(NULL != mStylusPalette)
{ {
// TODO : check why this line creates a crash in the application. // TODO : check why this line creates a crash in the application.

@ -285,7 +285,7 @@ void UBLibraryWidget::dragMoveEvent(QDragMoveEvent *event)
void UBLibraryWidget::onDropMe(const QMimeData *_data) void UBLibraryWidget::onDropMe(const QMimeData *_data)
{ {
Q_UNUSED(_data);
} }
/** /**

Loading…
Cancel
Save