From 5378d90ba7dfc18cab3cf320d6df1dceadc2c3a3 Mon Sep 17 00:00:00 2001 From: Tibo Clausen Date: Wed, 9 Oct 2019 11:39:32 +0100 Subject: [PATCH 1/4] Fix cmake when compiling to a static lib --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a9f919..eb153c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,10 +64,10 @@ else() endif() if(BUILD_STATIC) add_library(qtadvanceddocking STATIC ${ads_SRCS}) - set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_STATIC) + target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC) else() add_library(qtadvanceddocking SHARED ${ads_SRCS}) - set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_SHARED_EXPORT) + target_compile_definitions(qtadvanceddocking PUBLIC ADS_SHARED_EXPORT) endif() install(FILES ${ads_INSTALL_INCLUDE} DESTINATION include From 136d6d966cd945fc180b0ec3e0a32fca9fea03e7 Mon Sep 17 00:00:00 2001 From: Tibo Clausen Date: Tue, 22 Oct 2019 13:40:52 +0100 Subject: [PATCH 2/4] Partially reverse previous change --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb153c4..8b8de00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ if(BUILD_STATIC) target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC) else() add_library(qtadvanceddocking SHARED ${ads_SRCS}) - target_compile_definitions(qtadvanceddocking PUBLIC ADS_SHARED_EXPORT) + set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_SHARED_EXPORT) endif() install(FILES ${ads_INSTALL_INCLUDE} DESTINATION include From 2a5135915982d5f489510a8a7f814cc358763eb8 Mon Sep 17 00:00:00 2001 From: Tibo Clausen Date: Thu, 14 Nov 2019 13:59:03 +0000 Subject: [PATCH 3/4] Hide tab before emitting event --- src/DockAreaTabBar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DockAreaTabBar.cpp b/src/DockAreaTabBar.cpp index 4b71614..9e48fa8 100644 --- a/src/DockAreaTabBar.cpp +++ b/src/DockAreaTabBar.cpp @@ -525,8 +525,8 @@ void CDockAreaTabBar::closeTab(int Index) { return; } - emit tabCloseRequested(Index); Tab->hide(); + emit tabCloseRequested(Index); } From 46fb18fc58295ae9e0e97f9664ed7b82244c4c90 Mon Sep 17 00:00:00 2001 From: Denis Demidov Date: Mon, 18 Nov 2019 12:54:28 +0300 Subject: [PATCH 4/4] Fix import in QtAds.__init__.py --- PyQtAds/QtAds/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyQtAds/QtAds/__init__.py b/PyQtAds/QtAds/__init__.py index 59b7929..bc8b1ea 100644 --- a/PyQtAds/QtAds/__init__.py +++ b/PyQtAds/QtAds/__init__.py @@ -1,5 +1,5 @@ from .ads import ads -from ._version import * +from .._version import * import inspect @@ -7,4 +7,4 @@ for name, member in inspect.getmembers(ads): if not name.startswith('_'): globals()[name] = member -del ads \ No newline at end of file +del ads