Commit a06faa19 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Merge branch '5.3'

parents 5851acad 7f636275
......@@ -17,7 +17,7 @@ docker run -t -i --name kdevelopappimagecreator <image id>
3) Copy the script and patches into the docker container
docker cp kdevelopappimagecreator:/
for p in *.patch ; do docker cp $p kdevelop5.3appimagecreator:/ ; done
for p in *.patch ; do docker cp $p kdevelopappimagecreator:/ ; done
4) Run the script in the interactive shell of the container
......@@ -489,13 +489,16 @@ fi
# Get appimagetool
mkdir -p $SRC/appimagetool
pushd $SRC/appimagetool
wget -c -O appimagetool
chmod +x ./appimagetool
./appimagetool --appimage-extract # no fuse on this docker instance...
export PATH=$PWD/squashfs-root/usr/bin:$PATH
if [ ! -d $APPIMAGETOOL_DIR ]; then
wget -c -O appimagetool
chmod +x ./appimagetool
./appimagetool --appimage-extract # no fuse on this docker instance...
export PATH=$APPIMAGETOOL_DIR/squashfs-root/usr/bin:$PATH # add path to extracted appimage binary
mkdir -p /out
......@@ -144,6 +144,13 @@ void IdealController::addView(Qt::DockWidgetArea area, View* view)
void IdealController::dockLocationChanged(Qt::DockWidgetArea area)
// Seems since Qt 5.13 the signal QDockWidget::dockLocationChanged is emitted also when the dock changes
// to be floating, with area = Qt::NoDockWidgetArea. The current code is not designed for this,
// so just ignore the signal in that case for now
if (area == Qt::NoDockWidgetArea) {
auto *dock = qobject_cast<IdealDockWidget*>(sender());
View *view = dock->view();
QAction* action = m_view_to_action.value(view);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment