mirror of
https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git
synced 2025-01-12 16:20:25 +08:00
Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System
This commit is contained in:
commit
490e853435
@ -66,7 +66,7 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
if(BUILD_STATIC)
|
if(BUILD_STATIC)
|
||||||
add_library(qtadvanceddocking STATIC ${ads_SRCS})
|
add_library(qtadvanceddocking STATIC ${ads_SRCS})
|
||||||
set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_STATIC)
|
target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC)
|
||||||
else()
|
else()
|
||||||
add_library(qtadvanceddocking SHARED ${ads_SRCS})
|
add_library(qtadvanceddocking SHARED ${ads_SRCS})
|
||||||
set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_SHARED_EXPORT)
|
set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_SHARED_EXPORT)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
from .ads import ads
|
from .ads import ads
|
||||||
from ._version import *
|
from .._version import *
|
||||||
|
|
||||||
import inspect
|
import inspect
|
||||||
|
|
||||||
@ -7,4 +7,4 @@ for name, member in inspect.getmembers(ads):
|
|||||||
if not name.startswith('_'):
|
if not name.startswith('_'):
|
||||||
globals()[name] = member
|
globals()[name] = member
|
||||||
|
|
||||||
del ads
|
del ads
|
||||||
|
@ -525,8 +525,8 @@ void CDockAreaTabBar::closeTab(int Index)
|
|||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
emit tabCloseRequested(Index);
|
|
||||||
Tab->hide();
|
Tab->hide();
|
||||||
|
emit tabCloseRequested(Index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user