Skip to content

Commit 1078387

Browse files
yozkayozka
authored
Merge branch 'master' into feature
2 parents c33dddb + 2570a88 commit 1078387

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+922
-285
lines changed

‎.cproject

Lines changed: 53 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,15 @@
7171
</storageModule>
7272
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
7373
<storageModule moduleId="refreshScope"/>
74+
<storageModule moduleId="scannerConfiguration">
75+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
76+
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795;cdt.managedbuild.toolchain.gnu.mingw.base.1119687795.1949777584;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.1947822681;cdt.managedbuild.tool.gnu.cpp.compiler.input.1318830536">
77+
<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
78+
</scannerConfigBuildInfo>
79+
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795;cdt.managedbuild.toolchain.gnu.mingw.base.1119687795.1949777584;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.389117097;cdt.managedbuild.tool.gnu.c.compiler.input.1568363924">
80+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
81+
</scannerConfigBuildInfo>
82+
</storageModule>
7483
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
7584
<buildTargets>
7685
<target name="Build all" path=" build" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
@@ -83,6 +92,7 @@
8392
</target>
8493
<target name="Clean" path=" build" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
8594
<buildCommand>make</buildCommand>
95+
<buildArguments/>
8696
<buildTarget>clean</buildTarget>
8797
<stopOnError>false</stopOnError>
8898
<useDefaultCommand>true</useDefaultCommand>
@@ -99,7 +109,6 @@
99109
<target name="qmake" path=" build" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
100110
<buildCommand>qmake</buildCommand>
101111
<buildArguments>-recursive ../ads.pro</buildArguments>
102-
<buildTarget/>
103112
<stopOnError>true</stopOnError>
104113
<useDefaultCommand>false</useDefaultCommand>
105114
<runAllBuilders>false</runAllBuilders>
@@ -122,7 +131,6 @@
122131
</target>
123132
<target name="Clean" path=" build/src" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
124133
<buildCommand>make</buildCommand>
125-
<buildArguments/>
126134
<buildTarget>clean</buildTarget>
127135
<stopOnError>false</stopOnError>
128136
<useDefaultCommand>true</useDefaultCommand>
@@ -139,7 +147,6 @@
139147
<target name="qmake" path=" build/src" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
140148
<buildCommand>qmake</buildCommand>
141149
<buildArguments>-recursive ../../src/src.pro</buildArguments>
142-
<buildTarget/>
143150
<stopOnError>true</stopOnError>
144151
<useDefaultCommand>false</useDefaultCommand>
145152
<runAllBuilders>false</runAllBuilders>
@@ -152,6 +159,46 @@
152159
<useDefaultCommand>false</useDefaultCommand>
153160
<runAllBuilders>false</runAllBuilders>
154161
</target>
162+
<target name="Build all" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
163+
<buildCommand>mingw32-make</buildCommand>
164+
<buildArguments>-j</buildArguments>
165+
<buildTarget>all</buildTarget>
166+
<stopOnError>false</stopOnError>
167+
<useDefaultCommand>false</useDefaultCommand>
168+
<runAllBuilders>false</runAllBuilders>
169+
</target>
170+
<target name="Clean" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
171+
<buildCommand>make</buildCommand>
172+
<buildArguments/>
173+
<buildTarget>clean</buildTarget>
174+
<stopOnError>false</stopOnError>
175+
<useDefaultCommand>true</useDefaultCommand>
176+
<runAllBuilders>false</runAllBuilders>
177+
</target>
178+
<target name="Debug Build" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
179+
<buildCommand>mingw32-make</buildCommand>
180+
<buildArguments>-j6</buildArguments>
181+
<buildTarget>debug</buildTarget>
182+
<stopOnError>false</stopOnError>
183+
<useDefaultCommand>false</useDefaultCommand>
184+
<runAllBuilders>false</runAllBuilders>
185+
</target>
186+
<target name="qmake" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
187+
<buildCommand>qmake</buildCommand>
188+
<buildArguments>-recursive ../../example/example.pro</buildArguments>
189+
<buildTarget/>
190+
<stopOnError>true</stopOnError>
191+
<useDefaultCommand>false</useDefaultCommand>
192+
<runAllBuilders>false</runAllBuilders>
193+
</target>
194+
<target name="Release Build" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
195+
<buildCommand>mingw32-make</buildCommand>
196+
<buildArguments>-j4</buildArguments>
197+
<buildTarget>release</buildTarget>
198+
<stopOnError>false</stopOnError>
199+
<useDefaultCommand>false</useDefaultCommand>
200+
<runAllBuilders>false</runAllBuilders>
201+
</target>
155202
<target name="Build all" path=" build/demo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
156203
<buildCommand>mingw32-make</buildCommand>
157204
<buildArguments>-j</buildArguments>
@@ -162,7 +209,6 @@
162209
</target>
163210
<target name="Clean" path=" build/demo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
164211
<buildCommand>make</buildCommand>
165-
<buildArguments/>
166212
<buildTarget>clean</buildTarget>
167213
<stopOnError>false</stopOnError>
168214
<useDefaultCommand>true</useDefaultCommand>
@@ -179,7 +225,6 @@
179225
<target name="qmake" path=" build/demo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
180226
<buildCommand>qmake</buildCommand>
181227
<buildArguments>-recursive ../../demo/demo.pro</buildArguments>
182-
<buildTarget/>
183228
<stopOnError>true</stopOnError>
184229
<useDefaultCommand>false</useDefaultCommand>
185230
<runAllBuilders>false</runAllBuilders>
@@ -202,6 +247,7 @@
202247
</target>
203248
<target name="Clean" path=" build/AdvancedDockingSystemDemo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
204249
<buildCommand>make</buildCommand>
250+
<buildArguments/>
205251
<buildTarget>clean</buildTarget>
206252
<stopOnError>false</stopOnError>
207253
<useDefaultCommand>true</useDefaultCommand>
@@ -240,6 +286,7 @@
240286
</target>
241287
<target name="Clean" path=" build/AdvancedDockingSystemDemo_v2" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
242288
<buildCommand>make</buildCommand>
289+
<buildArguments/>
243290
<buildTarget>clean</buildTarget>
244291
<stopOnError>false</stopOnError>
245292
<useDefaultCommand>true</useDefaultCommand>
@@ -278,6 +325,7 @@
278325
</target>
279326
<target name="Clean" path=" build/AdvancedDockingSystem" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
280327
<buildCommand>make</buildCommand>
328+
<buildArguments/>
281329
<buildTarget>clean</buildTarget>
282330
<stopOnError>false</stopOnError>
283331
<useDefaultCommand>true</useDefaultCommand>
@@ -294,7 +342,6 @@
294342
<target name="qmake" path=" build/AdvancedDockingSystem" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
295343
<buildCommand>qmake</buildCommand>
296344
<buildArguments>-recursive ../../AdvancedDockingSystem/src.pro</buildArguments>
297-
<buildTarget/>
298345
<stopOnError>true</stopOnError>
299346
<useDefaultCommand>false</useDefaultCommand>
300347
<runAllBuilders>false</runAllBuilders>
@@ -309,13 +356,4 @@
309356
</target>
310357
</buildTargets>
311358
</storageModule>
312-
<storageModule moduleId="scannerConfiguration">
313-
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
314-
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795;cdt.managedbuild.toolchain.gnu.mingw.base.1119687795.1949777584;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.1947822681;cdt.managedbuild.tool.gnu.cpp.compiler.input.1318830536">
315-
<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
316-
</scannerConfigBuildInfo>
317-
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795;cdt.managedbuild.toolchain.gnu.mingw.base.1119687795.1949777584;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.389117097;cdt.managedbuild.tool.gnu.c.compiler.input.1568363924">
318-
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
319-
</scannerConfigBuildInfo>
320-
</storageModule>
321359
</cproject>

‎.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
11
*.pro.user
22
/ build
3+
*.o
4+
*.dylib
5+
*.app
6+
qrc_*
7+
moc_*
8+
ui_*
9+
Makefile
10+

‎CMakeLists.txt

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
cmake_minimum_required(VERSION 3.3)
2+
set(ads_VERSION "2.3.2")
3+
set(CMAKE_CXX_STANDARD 11)
4+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
5+
set(CMAKE_CXX_EXTENSIONS OFF)
6+
set(CMAKE_AUTOMOC ON)
7+
set(CMAKE_AUTORCC ON)
8+
project(QtAdvancedDockingSystem VERSION ${ads_VERSION})
9+
option(BUILD_STATIC "Build the static library" OFF)
10+
option(BUILD_EXAMPLES "Build the examples" ON)
11+
set(REQUIRED_QT_VERSION 5.0.0)
12+
find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
13+
find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
14+
find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
15+
message(STATUS "Found Qt ${Qt5Core_VERSION}")
16+
set(ads_INCLUDE ${ads_INCLUDE} ${Qt5Core_INCLUDE_DIRS})
17+
set(ads_INCLUDE ${ads_INCLUDE} "${CMAKE_CURRENT_SOURCE_DIR}/src")
18+
set(ads_LIBS ${ads_LIBS} ${Qt5Core_LIBRARIES})
19+
set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ${Qt5Core_COMPILE_DEFINITIONS})
20+
set(ads_LIBS ${ads_LIBS} ${Qt5Gui_LIBRARIES})
21+
set(ads_INCLUDE ${ads_INCLUDE} ${Qt5Gui_INCLUDE_DIRS})
22+
set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ${Qt5Gui_COMPILE_DEFINITIONS})
23+
set(ads_LIBS ${ads_LIBS} ${Qt5Widgets_LIBRARIES})
24+
set(ads_INCLUDE ${ads_INCLUDE} ${Qt5Widgets_INCLUDE_DIRS})
25+
set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ${Qt5Widgets_COMPILE_DEFINITIONS})
26+
if(BUILD_STATIC)
27+
set(CMAKE_STATIC_LIBRARY_SUFFIX "_static${CMAKE_STATIC_LIBRARY_SUFFIX}")
28+
endif()
29+
set(ads_SRCS
30+
src/ads_globals.cpp
31+
src/DockAreaTabBar.cpp
32+
src/DockAreaTitleBar.cpp
33+
src/DockAreaWidget.cpp
34+
src/DockContainerWidget.cpp
35+
src/DockManager.cpp
36+
src/DockOverlay.cpp
37+
src/DockSplitter.cpp
38+
src/DockWidget.cpp
39+
src/DockWidgetTab.cpp
40+
src/ElidingLabel.cpp
41+
src/FloatingDockContainer.cpp
42+
src/ads.qrc
43+
)
44+
set(ads_INSTALL_INCLUDE
45+
src/ads_globals.h
46+
src/DockAreaTabBar.h
47+
src/DockAreaTitleBar.h
48+
src/DockAreaWidget.h
49+
src/DockContainerWidget.h
50+
src/DockManager.h
51+
src/DockOverlay.h
52+
src/DockSplitter.h
53+
src/DockWidget.h
54+
src/DockWidgetTab.h
55+
src/ElidingLabel.h
56+
src/FloatingDockContainer.h
57+
)
58+
if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
59+
set(ads_PlatformDir "x64")
60+
else()
61+
set(ads_PlatformDir "x86")
62+
endif()
63+
if(BUILD_STATIC)
64+
add_library(ads STATIC ${ads_SRCS})
65+
set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_STATIC)
66+
else()
67+
add_library(ads SHARED ${ads_SRCS})
68+
set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_SHARED_EXPORT)
69+
endif()
70+
install(FILES ${ads_INSTALL_INCLUDE}
71+
DESTINATION include
72+
COMPONENT headers
73+
)
74+
install(FILES
75+
"${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md"
76+
"${CMAKE_CURRENT_SOURCE_DIR}/gnu-lgpl-v2.1.md"
77+
DESTINATION license
78+
COMPONENT license
79+
)
80+
install(TARGETS ads
81+
EXPORT adsBinary
82+
RUNTIME DESTINATION bin COMPONENT library
83+
LIBRARY DESTINATION lib COMPONENT library
84+
ARCHIVE DESTINATION lib COMPONENT library
85+
)
86+
target_include_directories(ads PUBLIC
87+
$<BUILD_INTERFACE:${ads_INCLUDE}>
88+
$<INSTALL_INTERFACE:include>
89+
)
90+
target_link_libraries(ads PUBLIC ${ads_LIBS})
91+
target_compile_definitions(ads PRIVATE ${ads_COMPILE_DEFINE})
92+
set_target_properties(ads PROPERTIES
93+
VERSION ${ads_VERSION}
94+
EXPORT_NAME "Qt Advanced Docking System"
95+
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
96+
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
97+
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin"
98+
)
99+
if(BUILD_EXAMPLES)
100+
add_subdirectory(example)
101+
add_subdirectory(demo)
102+
endif()
103+

0 commit comments

Comments
 (0)