Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
3be8b918
Commit
3be8b918
authored
Mar 13, 2018
by
DonLakeFlyer
Browse files
Merge branch 'Stable_V3.3' of
https://github.com/mavlink/qgroundcontrol
into StableMerge
parents
2a4261eb
7cb92cfc
Changes
3
Show whitespace changes
Inline
Side-by-side
.appveyor.yml
View file @
3be8b918
...
...
@@ -15,7 +15,7 @@ environment:
install
:
-
git submodule update --init --recursive
-
call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
-
set PATH=C:\Qt\Tools\QtCreator\bin;C:\Qt\5.9.
3
\msvc2015\bin;%PATH%
-
set PATH=C:\Qt\Tools\QtCreator\bin;C:\Qt\5.9.
4
\msvc2015\bin;%PATH%
-
mkdir %LOCALAPPDATA%\QtProject && copy test\qtlogging.ini %LOCALAPPDATA%\QtProject\
-
ps
:
|
Write-Host "Installing GStreamer..." -ForegroundColor Cyan
...
...
@@ -35,7 +35,7 @@ install:
Write-Host "Installed" -ForegroundColor Green
build_script
:
-
mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.9.
3
\msvc2015\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro
-
mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.9.
4
\msvc2015\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro
-
cd %SHADOW_BUILD_DIR% && jom
-
if "%CONFIG%" EQU "installer" ( copy %SHADOW_BUILD_DIR%\release\QGroundControl-installer.exe %APPVEYOR_BUILD_FOLDER%\QGroundControl-installer.exe )
# Generate the source server information to embed in the PDB
...
...
src/QmlControls/QGCButton.qml
View file @
3be8b918
...
...
@@ -6,6 +6,8 @@ import QGroundControl.Palette 1.0
import
QGroundControl
.
ScreenTools
1.0
Button
{
activeFocusOnPress
:
true
property
bool
primary
:
false
///< primary button for a group of buttons
property
real
pointSize
:
ScreenTools
.
defaultFontPointSize
///< Point size for button text
...
...
src/QmlControls/QGCCheckBox.qml
View file @
3be8b918
...
...
@@ -6,6 +6,8 @@ import QGroundControl.Palette 1.0
import
QGroundControl
.
ScreenTools
1.0
CheckBox
{
activeFocusOnPress
:
true
property
var
__qgcPal
:
QGCPalette
{
colorGroupEnabled
:
enabled
}
style
:
CheckBoxStyle
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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