Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
8ba9408a
Commit
8ba9408a
authored
Jun 28, 2019
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'qt5.13' into 'master'
Qt5.13 See merge request
!340
parents
e93e3dda
9fc91fe0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
31 deletions
+33
-31
.gitlab-ci.yml
.gitlab-ci.yml
+24
-24
CI/ci-linux-config.sh
CI/ci-linux-config.sh
+5
-3
CMakeLists.txt
CMakeLists.txt
+3
-3
OpenFlipper
OpenFlipper
+1
-1
No files found.
.gitlab-ci.yml
View file @
8ba9408a
...
...
@@ -112,12 +112,12 @@ gcc-c++11-Qt5.11.2-nopython:
-
artifacts
gcc-c++11-Qt5.
9
.0
:
gcc-c++11-Qt5.
13
.0
:
stage
:
Build
variables
:
COMPILER
:
"
gcc"
LANGUAGE
:
"
C++11"
QTVERSION
:
"
QT5.
9
.0"
QTVERSION
:
"
QT5.
13
.0"
GIT_SUBMODULE_STRATEGY
:
recursive
script
:
"
CI/ci-linux-build.sh"
tags
:
...
...
@@ -128,31 +128,31 @@ gcc-c++11-Qt5.9.0:
paths
:
-
artifacts
test-gcc-c++11-Qt5.
9
.0
:
test-gcc-c++11-Qt5.
13
.0
:
stage
:
Test
variables
:
COMPILER
:
"
gcc"
LANGUAGE
:
"
C++11"
QTVERSION
:
"
QT5.
9
.0"
QTVERSION
:
"
QT5.
13
.0"
GIT_STRATEGY
:
none
script
:
"
artifacts/CI/ci-linux-test.sh"
tags
:
-
Linux
-
stretch
dependencies
:
-
gcc-c++11-Qt5.
9
.0
-
gcc-c++11-Qt5.
13
.0
artifacts
:
paths
:
-
build-Release-gcc-cpp11-qt5.
9
.0/Testing/Temporary/LastTest.log
-
build-Release-gcc-cpp11-qt5.
13
.0/Testing/Temporary/LastTest.log
debug-gcc-c++11-Qt5.
9
.0
:
debug-gcc-c++11-Qt5.
13
.0
:
stage
:
Build
variables
:
COMPILER
:
"
gcc"
LANGUAGE
:
"
C++11"
QTVERSION
:
"
QT5.
9
.0"
QTVERSION
:
"
QT5.
13
.0"
BUILDTYPE
:
"
Debug"
GIT_SUBMODULE_STRATEGY
:
recursive
script
:
"
CI/ci-linux-build.sh"
...
...
@@ -164,12 +164,12 @@ debug-gcc-c++11-Qt5.9.0:
paths
:
-
artifacts
debug-test-gcc-c++11-Qt5.
9
.0
:
debug-test-gcc-c++11-Qt5.
13
.0
:
stage
:
Test
variables
:
COMPILER
:
"
gcc"
LANGUAGE
:
"
C++11"
QTVERSION
:
"
QT5.
9
.0"
QTVERSION
:
"
QT5.
13
.0"
BUILDTYPE
:
"
Debug"
GIT_STRATEGY
:
none
script
:
"
artifacts/CI/ci-linux-test.sh"
...
...
@@ -177,10 +177,10 @@ debug-test-gcc-c++11-Qt5.9.0:
-
Linux
-
stretch
dependencies
:
-
debug-gcc-c++11-Qt5.
9
.0
-
debug-gcc-c++11-Qt5.
13
.0
artifacts
:
paths
:
-
build-Debug-gcc-cpp11-qt5.
9
.0/Testing/Temporary/LastTest.log
-
build-Debug-gcc-cpp11-qt5.
13
.0/Testing/Temporary/LastTest.log
gcc-c++11-Qt5.11.2
:
...
...
@@ -271,12 +271,12 @@ clang-c++11-Qt5.11.2:
paths
:
-
artifacts
clang-c++11-Qt5.
9
.0
:
clang-c++11-Qt5.
13
.0
:
stage
:
Build
variables
:
COMPILER
:
"
clang"
LANGUAGE
:
"
C++11"
QTVERSION
:
"
QT5.
9
.0"
QTVERSION
:
"
QT5.
13
.0"
GIT_SUBMODULE_STRATEGY
:
recursive
script
:
"
CI/ci-linux-build.sh"
tags
:
...
...
@@ -288,12 +288,12 @@ clang-c++11-Qt5.9.0:
paths
:
-
artifacts
debug-clang-c++11-Qt5.
9
.0
:
debug-clang-c++11-Qt5.
13
.0
:
stage
:
Build
variables
:
COMPILER
:
"
clang"
LANGUAGE
:
"
C++11"
QTVERSION
:
"
QT5.
9
.0"
QTVERSION
:
"
QT5.
13
.0"
BUILDTYPE
:
"
Debug"
GIT_SUBMODULE_STRATEGY
:
recursive
script
:
"
CI/ci-linux-build.sh"
...
...
@@ -324,12 +324,12 @@ test-clang-c++11-Qt5.11.2:
paths
:
-
build-Release-clang-cpp11-qt5/Testing/Temporary/LastTest.log
test-clang-c++11-Qt5.
9
.0
:
test-clang-c++11-Qt5.
13
.0
:
stage
:
Test
variables
:
COMPILER
:
"
clang"
LANGUAGE
:
"
C++11"
QTVERSION
:
"
QT5.
9
.0"
QTVERSION
:
"
QT5.
13
.0"
GIT_STRATEGY
:
none
script
:
"
artifacts/CI/ci-linux-test.sh"
tags
:
...
...
@@ -337,17 +337,17 @@ test-clang-c++11-Qt5.9.0:
-
stretch
-
MultiThreads
dependencies
:
-
clang-c++11-Qt5.
9
.0
-
clang-c++11-Qt5.
13
.0
artifacts
:
paths
:
-
build-Release-clang-cpp11-qt5.
9
.0/Testing/Temporary/LastTest.log
-
build-Release-clang-cpp11-qt5.
13
.0/Testing/Temporary/LastTest.log
debug-test-clang-c++11-Qt5.
9
.0
:
debug-test-clang-c++11-Qt5.
13
.0
:
stage
:
Test
variables
:
COMPILER
:
"
clang"
LANGUAGE
:
"
C++11"
QTVERSION
:
"
QT5.
9
.0"
QTVERSION
:
"
QT5.
13
.0"
BUILDTYPE
:
"
Debug"
GIT_STRATEGY
:
none
script
:
"
artifacts/CI/ci-linux-test.sh"
...
...
@@ -356,10 +356,10 @@ debug-test-clang-c++11-Qt5.9.0:
-
stretch
-
MultiThreads
dependencies
:
-
debug-clang-c++11-Qt5.
9
.0
-
debug-clang-c++11-Qt5.
13
.0
artifacts
:
paths
:
-
build-Debug-clang-cpp11-qt5.
9
.0/Testing/Temporary/LastTest.log
-
build-Debug-clang-cpp11-qt5.
13
.0/Testing/Temporary/LastTest.log
cppcheck
:
stage
:
Build
...
...
CI/ci-linux-config.sh
View file @
8ba9408a
...
...
@@ -48,9 +48,11 @@ elif [ "$LANGUAGE" == "C++11" ]; then
BUILDPATH
=
"
$BUILDPATH
-cpp11"
fi
if
[
"
$QTVERSION
"
==
"QT5.12.2"
]
;
then
if
[
"
$QTVERSION
"
==
"QT5.13.0"
]
;
then
echo
"Using QT5.13.0"
;
BUILDPATH
=
"
$BUILDPATH
-qt5.13.0"
OPTIONS
=
"
$OPTIONS
-DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.4-qt5.13.0/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.4-qt5.13.0/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.4-qt5.13.0/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.13.0/gcc_64"
elif
[
"
$QTVERSION
"
==
"QT5.12.2"
]
;
then
echo
"Using QT5.12.2"
;
BUILDPATH
=
"
$BUILDPATH
-qt5.12.2"
OPTIONS
=
"
$OPTIONS
-DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.4-qt5.12.2/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.4-qt5.12.2/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.4-qt5.12.2/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.12.2/gcc_64"
...
...
CMakeLists.txt
View file @
8ba9408a
...
...
@@ -21,9 +21,9 @@ set( CMAKE_CXX_STANDARD 11 )
# ACG Environment default settings
# This is ugly but currently we need to work around the default installed on debian
if
(
EXISTS /ACG/acgdev/gcc-x86_64/qt-5.1
2.2
/5.1
2.2
/gcc_64
)
if
(
EXISTS /ACG/acgdev/gcc-x86_64/qt-5.1
3.0
/5.1
3.0
/gcc_64
)
# Default to this install path for QT%_INSTALL_DIR
set
(
QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.1
2.2
/5.1
2.2
/gcc_64/ CACHE PATH
"Qt5 install path set for ACG environment using QT 5.1
2.2
"
)
set
(
QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.1
3.0
/5.1
3.0
/gcc_64/ CACHE PATH
"Qt5 install path set for ACG environment using QT 5.1
3.0
"
)
endif
()
if
(
WIN32
)
...
...
@@ -128,7 +128,7 @@ if ( WIN32 )
endif
()
endif
()
set
(
OF_MAX_QT_VERSION
"5.1
2.2
"
)
set
(
OF_MAX_QT_VERSION
"5.1
3.0
"
)
if
(
${
Qt5Core_VERSION_STRING
}
STRGREATER
${
OF_MAX_QT_VERSION
}
)
message
(
WARNING
"Detected QT Version higher than
${
OF_MAX_QT_VERSION
}
!
\n
"
"OpenFlipper has not been tested with this QT Version."
)
...
...
OpenFlipper
@
a6232f27
Compare
31a7484c
...
a6232f27
Subproject commit
31a7484cd896f46941becc0852aa7c5e4f324bc6
Subproject commit
a6232f27fc7c5c442799fc8f8781a380d00021c8
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