Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
1a2d5d49
Commit
1a2d5d49
authored
May 19, 2011
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed ThirdParty directory. Moved in a different repository
parent
267a1e8e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
19 deletions
+18
-19
Sankore_3.1.pro
Sankore_3.1.pro
+14
-13
release.vc9.bat
release.vc9.bat
+2
-3
UBBoardPaletteManager.cpp
src/board/UBBoardPaletteManager.cpp
+1
-2
UBLibraryWidget.cpp
src/gui/UBLibraryWidget.cpp
+1
-1
No files found.
Sankore_3.1.pro
View file @
1a2d5d49
TARGET
=
"Sankore 3.1"
TEMPLATE
=
app
THIRD_PARTY_PATH
=../
Sankore
-
ThirdParty
CONFIG
+=
debug_and_release
\
no_include_pwd
...
...
@@ -30,7 +32,7 @@ QT += xmlpatterns
INCLUDEPATH
+=
src
include
(
thirdparty
/
libs
.
pri
)
include
(
$$
THIRD_PARTY_PATH
/
libs
.
pri
)
include
(
src
/
adaptors
/
adaptors
.
pri
)
include
(
src
/
api
/
api
.
pri
)
include
(
src
/
board
/
board
.
pri
)
...
...
@@ -52,12 +54,12 @@ include(src/transition/transition.pri)
DEPENDPATH
+=
src
/
pdf
-
merger
INCLUDEPATH
+=
src
/
pdf
-
merger
include
(
src
/
pdf
-
merger
/
pdfMerger
.
pri
)
DEPENDPATH
+=
thirdparty
/
quazip
/
INCLUDEPATH
+=
thirdparty
/
quazip
/
include
(
thirdparty
/
quazip
/
quazip
.
pri
)
DEPENDPATH
+=
thirdparty
/
trolltech
/
singleapplication
INCLUDEPATH
+=
thirdparty
/
trolltech
/
singleapplication
include
(
thirdparty
/
trolltech
/
singleapplication
/
qtsingleapplication
.
pri
)
DEPENDPATH
+=
$$
THIRD_PARTY_PATH
/
quazip
/
INCLUDEPATH
+=
$$
THIRD_PARTY_PATH
/
quazip
/
include
(
$$
THIRD_PARTY_PATH
/
quazip
/
quazip
.
pri
)
DEPENDPATH
+=
$$
THIRD_PARTY_PATH
/
trolltech
/
singleapplication
INCLUDEPATH
+=
$$
THIRD_PARTY_PATH
/
trolltech
/
singleapplication
include
(
$$
THIRD_PARTY_PATH
/
trolltech
/
singleapplication
/
qtsingleapplication
.
pri
)
FORMS
+=
resources
/
forms
/
mainWindow
.
ui
\
resources
/
forms
/
preferences
.
ui
\
...
...
@@ -109,7 +111,6 @@ win32 {
QMAKE_CXXFLAGS_RELEASE += /Od \
/Zi
QMAKE_LFLAGS_RELEASE += /DEBUG
INCLUDEPATH += thirdparty/microsoft
UB_LIBRARY.path = $$DESTDIR
UB_I18N.path = $$DESTDIR/i18n
UB_ETC.path = $$DESTDIR
...
...
@@ -138,10 +139,10 @@ macx {
VERSION_RC_PATH = "$$BUILD_DIR/version_rc"
# Embed version into executable for breakpad
#
QMAKE_LFLAGS += -sectcreate \
#
__DATA \
#
__version \
#
$$VERSION_RC_PATH
QMAKE_LFLAGS += -sectcreate \
__DATA \
__version \
$$VERSION_RC_PATH
QMAKE_CXXFLAGS_RELEASE += -gdwarf-2 \
-mdynamic-no-pic
...
...
@@ -160,7 +161,7 @@ macx {
UB_LIBRARY.path = "$$RESOURCES_DIR"
UB_FONTS.files = "resources/fonts"
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_MACX_ICNS.files = $$files(resources/macx
/*
.icns)
UB_MACX_ICNS.path = "$$RESOURCES_DIR"
...
...
release.vc9.bat
View file @
1a2d5d49
...
...
@@ -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 INNO_EXE="C:\Program Files\Inno Setup 5\iscc.exe "
set BUILD_DIR=build\win32\release
set SVN_BIN="C:\Program Files\Subversion\bin"
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
...
...
@@ -31,7 +30,7 @@ erase tmp
echo %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
...
...
src/board/UBBoardPaletteManager.cpp
View file @
1a2d5d49
...
...
@@ -647,7 +647,6 @@ void UBBoardPaletteManager::changeStylusPaletteOrientation(QVariant var)
bool
bVertical
=
var
.
toBool
();
bool
bVisible
=
mStylusPalette
->
isVisible
();
UBStylusPalette
*
mOldPalette
;
// Clean the old palette
if
(
NULL
!=
mStylusPalette
)
{
...
...
src/gui/UBLibraryWidget.cpp
View file @
1a2d5d49
...
...
@@ -285,7 +285,7 @@ void UBLibraryWidget::dragMoveEvent(QDragMoveEvent *event)
void
UBLibraryWidget
::
onDropMe
(
const
QMimeData
*
_data
)
{
Q_UNUSED
(
_data
);
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment