Skip to content

Commit 1fa75b3

Browse files
kwagyemankwagyeman
committedOct 4, 2024
qtcreator: Update to qtc 14.0.2 and strip down the IDE.
1 parent 3004ebc commit 1fa75b3

12 files changed

+477
-234
lines changed
 

‎bin/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
if (NOT APPLE)
2-
install(PROGRAMS qtcreator.sh DESTINATION bin)
2+
# OPENMV-DIFF #
3+
# install(PROGRAMS qtcreator.sh DESTINATION bin)
4+
# OPENMV-DIFF #
5+
install(PROGRAMS openmvide.sh DESTINATION bin)
6+
# OPENMV-DIFF #
37
endif()

‎bin/openmvide.sh

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#! /bin/sh
2+
3+
# Use this script if you add paths to LD_LIBRARY_PATH
4+
# that contain libraries that conflict with the
5+
# libraries that OpenMV IDE depends on.
6+
7+
makeAbsolute() {
8+
case $1 in
9+
/*)
10+
# already absolute, return it
11+
echo "$1"
12+
;;
13+
*)
14+
# relative, prepend $2 made absolute
15+
echo `makeAbsolute "$2" "$PWD"`/"$1" | sed 's,/\.$,,'
16+
;;
17+
esac
18+
}
19+
20+
me=`which "$0"` # Search $PATH if necessary
21+
if test -L "$me"; then
22+
# Try GNU readlink(1)
23+
nme=`readlink -nf "$me" 2>/dev/null`
24+
if test -n "$nme"; then
25+
me=$nme
26+
else
27+
# No GNU readlink(1), so let's try ls -l
28+
base=`dirname "$me"`
29+
me=`ls -l "$me" | sed 's/^.*-> //'`
30+
me=`makeAbsolute "$me" "$base"`
31+
fi
32+
fi
33+
34+
bindir=`dirname "$me"`
35+
libdir=`cd "$bindir/../lib" ; pwd`
36+
# Add path to deployed Qt libraries in package
37+
qtlibdir=$libdir/Qt/lib
38+
if test -d "$qtlibdir"; then
39+
qtlibpath=:$qtlibdir
40+
fi
41+
# Add OpenMV IDE library path
42+
_ORIGINAL_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
43+
LD_LIBRARY_PATH=$libdir:$libdir/qtcreator$qtlibpath${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
44+
export LD_LIBRARY_PATH
45+
exec "$bindir/openmvide" -user-library-path "$_ORIGINAL_LD_LIBRARY_PATH" ${1+"$@"}

‎cmake/QtCreatorIDEBranding.cmake

+18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
set(IDE_VERSION "14.0.2") # The IDE version.
22
set(IDE_VERSION_COMPAT "14.0.0") # The IDE Compatibility version.
33
set(IDE_VERSION_DISPLAY "14.0.2") # The IDE display version.
4+
# OPENMV-DIFF #
5+
set(IDE_AUTHOR "The Qt Company Ltd")
6+
set(IDE_COPYRIGHT_YEAR_FOUNDED "2008")
7+
# OPENMV-DIFF #
48
set(IDE_COPYRIGHT_YEAR "2024") # The IDE current copyright year.
59

610
set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation.
@@ -19,3 +23,17 @@ set(IDE_ICON_PATH "")
1923
# Absolute, or relative to <qtcreator>/src/app
2024
# Should contain images/logo/(16|24|32|48|64|128|256|512)/QtProject-qtcreator.png
2125
set(IDE_LOGO_PATH "")
26+
27+
# OPENMV-DIFF #
28+
set(IDE_VERSION "4.3.0")
29+
set(IDE_VERSION_COMPAT "${IDE_VERSION}")
30+
set(IDE_VERSION_DISPLAY "${IDE_VERSION}")
31+
set(IDE_AUTHOR "OpenMV LLC")
32+
set(IDE_COPYRIGHT_YEAR_FOUNDED "2013")
33+
set(IDE_COPYRIGHT_YEAR "2024")
34+
set(IDE_SETTINGSVARIANT "OpenMV")
35+
set(IDE_DISPLAY_NAME "OpenMV IDE")
36+
set(IDE_ID "openmvide")
37+
set(IDE_CASED_ID "OpenMVIDE")
38+
set(IDE_BUNDLE_IDENTIFIER "io.openmv.${IDE_ID}")
39+
# OPENMV-DIFF #

‎share/qtcreator/CMakeLists.txt

+68-53
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,77 @@
11
set(resource_directories
2-
android
3-
cplusplus
4-
glsl
5-
indexer_preincludes
6-
jsonschemas
2+
# OPENMV-DIFF #
3+
# android
4+
# cplusplus
5+
# glsl
6+
# indexer_preincludes
7+
# jsonschemas
8+
# OPENMV-DIFF #
79
lua-plugins
8-
modeleditor
9-
qmldesigner
10-
qmlicons
11-
qml-type-descriptions
12-
schemes
13-
snippets
14-
styles
15-
templates
16-
themes
10+
# OPENMV-DIFF #
11+
# modeleditor
12+
# qmldesigner
13+
# qmlicons
14+
# qml-type-descriptions
15+
# schemes
16+
# snippets
17+
# styles
18+
# templates
19+
# themes
20+
# OPENMV-DIFF #
1721
)
1822

1923
set(resource_files
20-
debugger/.pylintrc
21-
debugger/boosttypes.py
22-
debugger/cdbbridge.py
23-
debugger/cdbext.pyi
24-
debugger/creatortypes.py
25-
debugger/dumper.py
26-
debugger/gdbbridge.py
27-
debugger/gdbtracepoint.py
28-
debugger/LICENSE.GPL3-EXCEPT
29-
debugger/lldbbridge.py
30-
debugger/misctypes.py
31-
debugger/opencvtypes.py
32-
debugger/pdbbridge.py
33-
debugger/personaltypes.py
34-
debugger/qttypes.py
35-
debugger/README.txt
36-
debugger/setup.cfg
37-
debugger/android_stdtypes.py
38-
debugger/libcpp_stdtypes.py
39-
debugger/stdtypes.py
40-
debugger/utils.py
41-
debugger/loadorder.txt
24+
# OPENMV-DIFF #
25+
# debugger/.pylintrc
26+
# debugger/boosttypes.py
27+
# debugger/cdbbridge.py
28+
# debugger/cdbext.pyi
29+
# debugger/creatortypes.py
30+
# debugger/dumper.py
31+
# debugger/gdbbridge.py
32+
# debugger/gdbtracepoint.py
33+
# debugger/LICENSE.GPL3-EXCEPT
34+
# debugger/lldbbridge.py
35+
# debugger/misctypes.py
36+
# debugger/opencvtypes.py
37+
# debugger/pdbbridge.py
38+
# debugger/personaltypes.py
39+
# debugger/qttypes.py
40+
# debugger/README.txt
41+
# debugger/setup.cfg
42+
# debugger/android_stdtypes.py
43+
# debugger/libcpp_stdtypes.py
44+
# debugger/stdtypes.py
45+
# debugger/utils.py
46+
# debugger/loadorder.txt
47+
# OPENMV-DIFF #
4248

43-
debugger-with-python2/qttypes.py
44-
debugger-with-python2/personaltypes.py
45-
debugger-with-python2/android_stdtypes.py
46-
debugger-with-python2/README.txt
47-
debugger-with-python2/gdbbridge.py
48-
debugger-with-python2/cdbbridge.py
49-
debugger-with-python2/lldbbridge.py
50-
debugger-with-python2/misctypes.py
51-
debugger-with-python2/opencvtypes.py
52-
debugger-with-python2/libcpp_stdtypes.py
53-
debugger-with-python2/creatortypes.py
54-
debugger-with-python2/stdtypes.py
55-
debugger-with-python2/gdbtracepoint.py
56-
debugger-with-python2/utils.py
57-
debugger-with-python2/boosttypes.py
58-
debugger-with-python2/dumper.py
59-
debugger-with-python2/pdbbridge.py
49+
# OPENMV-DIFF #
50+
# debugger-with-python2/qttypes.py
51+
# debugger-with-python2/personaltypes.py
52+
# debugger-with-python2/android_stdtypes.py
53+
# debugger-with-python2/README.txt
54+
# debugger-with-python2/gdbbridge.py
55+
# debugger-with-python2/cdbbridge.py
56+
# debugger-with-python2/lldbbridge.py
57+
# debugger-with-python2/misctypes.py
58+
# debugger-with-python2/opencvtypes.py
59+
# debugger-with-python2/libcpp_stdtypes.py
60+
# debugger-with-python2/creatortypes.py
61+
# debugger-with-python2/stdtypes.py
62+
# debugger-with-python2/gdbtracepoint.py
63+
# debugger-with-python2/utils.py
64+
# debugger-with-python2/boosttypes.py
65+
# debugger-with-python2/dumper.py
66+
# debugger-with-python2/pdbbridge.py
67+
# OPENMV-DIFF #
68+
69+
# OPENMV-DIFF #
70+
# styles/flat-dark.xml
71+
# styles/flat-light.xml
72+
themes/flat-dark.creatortheme
73+
themes/flat-light.creatortheme
74+
# OPENMV-DIFF #
6075
)
6176

6277
# copy resource directories during build

‎src/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ add_subdirectory(share)
99
add_subdirectory(shared)
1010
add_subdirectory(plugins)
1111
add_subdirectory(app)
12-
add_subdirectory(tools)
12+
# OPENMV-DIFF #
13+
# add_subdirectory(tools)
14+
# OPENMV-DIFF #
1315

1416
install(
1517
FILES

‎src/app/CMakeLists.txt

+48-23
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ if (WIN32)
7676
set(RC_APPLICATION_NAME "${IDE_DISPLAY_NAME}")
7777
set(RC_VERSION "${IDE_VERSION}.0")
7878
set(RC_VERSION_STRING "${IDE_VERSION_DISPLAY}")
79-
set(RC_COPYRIGHT "2008-${IDE_COPYRIGHT_YEAR} The Qt Company Ltd")
79+
# OPENMV-DIFF #
80+
# set(RC_COPYRIGHT "2008-${IDE_COPYRIGHT_YEAR} The Qt Company Ltd")
81+
# OPENMV-DIFF #
82+
set(RC_COPYRIGHT "${IDE_COPYRIGHT_YEAR_FOUNDED}-${IDE_COPYRIGHT_YEAR} ${IDE_AUTHOR}")
83+
# OPENMV-DIFF #
8084

8185
string(REPLACE " " "\\x20" RC_APPLICATION_NAME "${RC_APPLICATION_NAME}")
8286
string(REPLACE " " "\\x20" RC_COPYRIGHT "${RC_COPYRIGHT}")
@@ -98,36 +102,53 @@ if (APPLE)
98102
set(MACOSX_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET})
99103
endif()
100104
set_target_properties(qtcreator PROPERTIES
101-
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/app-Info.plist"
102-
)
103-
# icon
104-
add_custom_command(
105-
OUTPUT qtcreator.icns qtcreator-project.icns
106-
COMMAND
107-
xcrun actool --app-icon qtcreator --output-partial-info-plist "${CMAKE_CURRENT_BINARY_DIR}/qtcreator.Info.plist"
108-
--platform macosx --minimum-deployment-target 10.7 --compile "${CMAKE_CURRENT_BINARY_DIR}"
109-
"${IDE_ICON_PATH}/qtcreator.xcassets"
110-
> /dev/null
111-
BYPRODUCTS qtcreator.Info.plist
112-
VERBATIM
113-
)
114-
target_sources(qtcreator
115-
PRIVATE
116-
"${CMAKE_CURRENT_BINARY_DIR}/qtcreator.icns"
117-
"${CMAKE_CURRENT_BINARY_DIR}/qtcreator-project.icns"
105+
# OPENMV-DIFF #
106+
# MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/app-Info.plist"
107+
# OPENMV-DIFF #
108+
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/openmvide-Info.plist"
109+
# OPENMV-DIFF #
118110
)
111+
# OPENMV-DIFF #
112+
# # icon
113+
# add_custom_command(
114+
# OUTPUT qtcreator.icns qtcreator-project.icns
115+
# COMMAND
116+
# xcrun actool --app-icon qtcreator --output-partial-info-plist "${CMAKE_CURRENT_BINARY_DIR}/qtcreator.Info.plist"
117+
# --platform macosx --minimum-deployment-target 10.7 --compile "${CMAKE_CURRENT_BINARY_DIR}"
118+
# "${IDE_ICON_PATH}/qtcreator.xcassets"
119+
# > /dev/null
120+
# BYPRODUCTS qtcreator.Info.plist
121+
# VERBATIM
122+
# )
123+
# target_sources(qtcreator
124+
# PRIVATE
125+
# "${CMAKE_CURRENT_BINARY_DIR}/qtcreator.icns"
126+
# "${CMAKE_CURRENT_BINARY_DIR}/qtcreator-project.icns"
127+
# )
128+
# qtc_copy_to_builddir(copy_icns
129+
# DESTINATION ${IDE_DATA_PATH}
130+
# FILES
131+
# ${CMAKE_CURRENT_BINARY_DIR}/qtcreator.icns
132+
# ${CMAKE_CURRENT_BINARY_DIR}/qtcreator-project.icns
133+
# )
134+
# install(
135+
# FILES
136+
# ${CMAKE_CURRENT_BINARY_DIR}/qtcreator.icns
137+
# ${CMAKE_CURRENT_BINARY_DIR}/qtcreator-project.icns
138+
# DESTINATION ${IDE_DATA_PATH}
139+
# )
140+
# OPENMV-DIFF #
119141
qtc_copy_to_builddir(copy_icns
120142
DESTINATION ${IDE_DATA_PATH}
121143
FILES
122-
${CMAKE_CURRENT_BINARY_DIR}/qtcreator.icns
123-
${CMAKE_CURRENT_BINARY_DIR}/qtcreator-project.icns
144+
${CMAKE_BINARY_DIR}/../openmv-media/icons/openmv-icon/openmv.icns
124145
)
125146
install(
126147
FILES
127-
${CMAKE_CURRENT_BINARY_DIR}/qtcreator.icns
128-
${CMAKE_CURRENT_BINARY_DIR}/qtcreator-project.icns
148+
${CMAKE_BINARY_DIR}/../openmv-media/icons/openmv-icon/openmv.icns
129149
DESTINATION ${IDE_DATA_PATH}
130150
)
151+
# OPENMV-DIFF #
131152
endif()
132153

133154
option(QTC_FORCE_XCB "Enables that Qt Creator forces XCB on Linux if QT_QPA_PLATFORM is not set." OFF)
@@ -156,7 +177,11 @@ if ((NOT WIN32) AND (NOT APPLE))
156177
# install logo
157178
foreach(size 16 24 32 48 64 128 256 512)
158179
install(
159-
FILES ${IDE_LOGO_PATH}/images/logo/${size}/QtProject-qtcreator.png
180+
# OPENMV-DIFF #
181+
# FILES ${IDE_LOGO_PATH}/images/logo/${size}/QtProject-qtcreator.png
182+
# OPENMV-DIFF #
183+
FILES ${IDE_LOGO_PATH}/images/logo/${size}/OpenMV-openmvide.png
184+
# OPENMV-DIFF #
160185
DESTINATION share/icons/hicolor/${size}x${size}/apps
161186
)
162187
endforeach()

‎src/app/openmvide-Info.plist

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>UTImportedTypeDeclarations</key>
6+
<array>
7+
<dict>
8+
<key>UTTypeDescription</key>
9+
<string>Python Script</string>
10+
<key>UTTypeConformsTo</key>
11+
<array>
12+
<string>public.shell-script</string>
13+
</array>
14+
<key>UTTypeIdentifier</key>
15+
<string>public.python-script</string>
16+
<key>UTTypeTagSpecification</key>
17+
<dict>
18+
<key>public.filename-extension</key>
19+
<array>
20+
<string>py</string>
21+
</array>
22+
<key>public.mime-type</key>
23+
<array>
24+
<string>text/x-python-script</string>
25+
</array>
26+
</dict>
27+
</dict>
28+
</array>
29+
<key>NSPrincipalClass</key>
30+
<string>NSApplication</string>
31+
<key>NSSupportsAutomaticGraphicsSwitching</key>
32+
<true/>
33+
<key>CFBundleDocumentTypes</key>
34+
<array>
35+
<dict>
36+
<key>CFBundleTypeRole</key>
37+
<string>Editor</string>
38+
<key>LSHandlerRank</key>
39+
<string>Alternate</string>
40+
<key>LSItemContentTypes</key>
41+
<array>
42+
<string>public.python-script</string>
43+
</array>
44+
</dict>
45+
<dict>
46+
<key>CFBundleTypeRole</key>
47+
<string>Editor</string>
48+
<key>LSItemContentTypes</key>
49+
<array>
50+
<string>public.plain-text</string>
51+
<string>com.apple.nspboard-type</string>
52+
</array>
53+
</dict>
54+
</array>
55+
<key>NSHumanReadableCopyright</key>
56+
<string>(C) ${IDE_COPYRIGHT_YEAR} ${IDE_AUTHOR}</string>
57+
<key>CFBundleIconFile</key>
58+
<string>openmv</string>
59+
<key>CFBundlePackageType</key>
60+
<string>APPL</string>
61+
<key>CFBundleSignature</key>
62+
<string>????</string>
63+
<key>CFBundleExecutable</key>
64+
<string>${IDE_APP_TARGET}</string>
65+
<key>CFBundleIdentifier</key>
66+
<string>${IDE_BUNDLE_IDENTIFIER}</string>
67+
<key>CFBundleVersion</key>
68+
<string>${IDE_VERSION}</string>
69+
<key>CFBundleShortVersionString</key>
70+
<string>${IDE_VERSION}</string>
71+
<key>LSMinimumSystemVersion</key>
72+
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
73+
</dict>
74+
</plist>

‎src/app/qtcreator.rc

+12-8
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@
55

66
#define ICON_PATH STRINGIFY(RC_ICON_PATH/qtcreator.ico)
77

8-
IDI_ICON1 ICON DISCARDABLE ICON_PATH
9-
IDI_ICON2 ICON DISCARDABLE "winicons/c.ico"
10-
IDI_ICON3 ICON DISCARDABLE "winicons/cpp.ico"
11-
IDI_ICON4 ICON DISCARDABLE "winicons/h.ico"
12-
IDI_ICON5 ICON DISCARDABLE "winicons/ui.ico"
13-
IDI_ICON6 ICON DISCARDABLE "winicons/pro.ico"
14-
IDI_ICON7 ICON DISCARDABLE "winicons/pri.ico"
15-
IDI_ICON8 ICON DISCARDABLE "winicons/qml.ico"
8+
// OPENMV-DIFF //
9+
// IDI_ICON1 ICON DISCARDABLE ICON_PATH
10+
// IDI_ICON2 ICON DISCARDABLE "winicons/c.ico"
11+
// IDI_ICON3 ICON DISCARDABLE "winicons/cpp.ico"
12+
// IDI_ICON4 ICON DISCARDABLE "winicons/h.ico"
13+
// IDI_ICON5 ICON DISCARDABLE "winicons/ui.ico"
14+
// IDI_ICON6 ICON DISCARDABLE "winicons/pro.ico"
15+
// IDI_ICON7 ICON DISCARDABLE "winicons/pri.ico"
16+
// IDI_ICON8 ICON DISCARDABLE "winicons/qml.ico"
17+
// OPENMV-DIFF //
18+
IDI_ICON1 ICON DISCARDABLE "../../../openmv-media/icons/openmv-icon/openmv.ico"
19+
// OPENMV-DIFF //
1620

1721
VS_VERSION_INFO VERSIONINFO
1822
FILEVERSION RC_VERSION

‎src/libs/3rdparty/CMakeLists.txt

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ add_subdirectory(syntax-highlighting)
33
add_subdirectory(libvterm)
44
add_subdirectory(libptyqt)
55
add_subdirectory(qrcodegen)
6-
add_subdirectory(qtkeychain)
7-
add_subdirectory(lua)
8-
add_subdirectory(sol2)
6+
# OPENMV-DIFF #
7+
# add_subdirectory(qtkeychain)
8+
# add_subdirectory(lua)
9+
# add_subdirectory(sol2)
10+
# OPENMV-DIFF #
911

1012
if(WIN32)
1113
add_subdirectory(winpty)

‎src/libs/CMakeLists.txt

+65-49
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,78 @@
11
add_subdirectory(3rdparty)
22

3-
add_subdirectory(nanotrace)
4-
add_subdirectory(advanceddockingsystem)
3+
# OPENMV-DIFF #
4+
# add_subdirectory(nanotrace)
5+
# add_subdirectory(advanceddockingsystem)
6+
# OPENMV-DIFF #
57
add_subdirectory(aggregation)
68
add_subdirectory(cplusplus)
79
add_subdirectory(extensionsystem)
8-
add_subdirectory(glsl)
10+
# OPENMV-DIFF #
11+
# add_subdirectory(glsl)
12+
# OPENMV-DIFF #
913
add_subdirectory(languageserverprotocol)
1014
add_subdirectory(languageutils)
11-
add_subdirectory(modelinglib)
12-
add_subdirectory(qmldebug)
13-
add_subdirectory(qmleditorwidgets)
15+
# OPENMV-DIFF #
16+
# add_subdirectory(modelinglib)
17+
# add_subdirectory(qmldebug)
18+
# add_subdirectory(qmleditorwidgets)
19+
# OPENMV-DIFF #
1420
add_subdirectory(qmljs)
15-
add_subdirectory(qtcreatorcdbext)
21+
# OPENMV-DIFF #
22+
# add_subdirectory(qtcreatorcdbext)
23+
# OPENMV-DIFF #
1624
add_subdirectory(utils)
1725
add_subdirectory(solutions)
18-
add_subdirectory(tracing)
26+
# OPENMV-DIFF #
27+
# add_subdirectory(tracing)
28+
# OPENMV-DIFF #
1929

20-
if (WITH_QMLDESIGNER)
21-
add_subdirectory(sqlite)
22-
add_subdirectory(qmlpuppetcommunication)
23-
endif()
30+
# OPENMV-DIFF #
31+
# if (WITH_QMLDESIGNER)
32+
# add_subdirectory(sqlite)
33+
# add_subdirectory(qmlpuppetcommunication)
34+
# endif()
35+
# OPENMV-DIFF #
2436

25-
if (WITH_TESTS)
26-
add_subdirectory(googletest)
27-
endif()
37+
# OPENMV-DIFF #
38+
# if (WITH_TESTS)
39+
# add_subdirectory(googletest)
40+
# endif()
41+
# OPENMV-DIFF #
2842

29-
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/qlitehtml/src/CMakeLists.txt)
30-
option(BUILD_LIBRARY_QLITEHTML "Build library qlitehtml." ${BUILD_LIBRARIES_BY_DEFAULT})
31-
set(QLITEHTML_VERSION_COMPAT ${IDE_VERSION_COMPAT} CACHE STRING "")
32-
if(BUILD_LIBRARY_QLITEHTML)
33-
set(QLITEHTML_LIBRARY_ARCHIVE_PATH ${IDE_LIBRARY_ARCHIVE_PATH})
34-
set(QLITEHTML_EXPORT QtCreator)
35-
set(QLITEHTML_DEVEL_COMPONENT Devel)
36-
set(QLITEHTML_DEVEL_EXCLUDE_FROM_ALL ON)
37-
set(QLITEHTML_HEADER_PATH "${IDE_HEADER_INSTALL_PATH}/src/lib/qlitehtml")
38-
if (QTC_STATIC_BUILD)
39-
set(QLITEHTML_LIBRARY_TYPE STATIC)
40-
else()
41-
set(QLITEHTML_BIN_PATH ${IDE_BIN_PATH})
42-
set(QLITEHTML_LIBRARY_PATH ${IDE_LIBRARY_PATH})
43-
endif()
44-
set(QT_VERSION_MAJOR ${Qt6_VERSION_MAJOR})
45-
option(BUILD_TESTING "Build litehtml tests" OFF) # otherwise litehtml downloads googletest
46-
add_subdirectory(qlitehtml/src)
47-
endif()
48-
if(TARGET qlitehtml)
49-
target_compile_definitions(qlitehtml PRIVATE ${DEFAULT_DEFINES}) # for precompiled headers
50-
enable_pch(qlitehtml)
51-
#doesn't work: TARGET 'qlitehtml' was not created in this directory.
52-
#qtc_enable_separate_debug_info(qlitehtml "${IDE_LIBRARY_PATH}")
53-
qtc_output_binary_dir(_output_binary_dir)
54-
set_target_properties(qlitehtml PROPERTIES
55-
BUILD_RPATH "${_LIB_RPATH};${CMAKE_BUILD_RPATH}"
56-
INSTALL_RPATH "${_LIB_RPATH};${CMAKE_INSTALL_RPATH}"
57-
RUNTIME_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_BIN_PATH}"
58-
LIBRARY_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_LIBRARY_PATH}"
59-
ARCHIVE_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_LIBRARY_ARCHIVE_PATH}"
60-
)
61-
endif()
62-
endif()
43+
# OPENMV-DIFF #
44+
# if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/qlitehtml/src/CMakeLists.txt)
45+
# option(BUILD_LIBRARY_QLITEHTML "Build library qlitehtml." ${BUILD_LIBRARIES_BY_DEFAULT})
46+
# set(QLITEHTML_VERSION_COMPAT ${IDE_VERSION_COMPAT} CACHE STRING "")
47+
# if(BUILD_LIBRARY_QLITEHTML)
48+
# set(QLITEHTML_LIBRARY_ARCHIVE_PATH ${IDE_LIBRARY_ARCHIVE_PATH})
49+
# set(QLITEHTML_EXPORT QtCreator)
50+
# set(QLITEHTML_DEVEL_COMPONENT Devel)
51+
# set(QLITEHTML_DEVEL_EXCLUDE_FROM_ALL ON)
52+
# set(QLITEHTML_HEADER_PATH "${IDE_HEADER_INSTALL_PATH}/src/lib/qlitehtml")
53+
# if (QTC_STATIC_BUILD)
54+
# set(QLITEHTML_LIBRARY_TYPE STATIC)
55+
# else()
56+
# set(QLITEHTML_BIN_PATH ${IDE_BIN_PATH})
57+
# set(QLITEHTML_LIBRARY_PATH ${IDE_LIBRARY_PATH})
58+
# endif()
59+
# set(QT_VERSION_MAJOR ${Qt6_VERSION_MAJOR})
60+
# option(BUILD_TESTING "Build litehtml tests" OFF) # otherwise litehtml downloads googletest
61+
# add_subdirectory(qlitehtml/src)
62+
# endif()
63+
# if(TARGET qlitehtml)
64+
# target_compile_definitions(qlitehtml PRIVATE ${DEFAULT_DEFINES}) # for precompiled headers
65+
# enable_pch(qlitehtml)
66+
# #doesn't work: TARGET 'qlitehtml' was not created in this directory.
67+
# #qtc_enable_separate_debug_info(qlitehtml "${IDE_LIBRARY_PATH}")
68+
# qtc_output_binary_dir(_output_binary_dir)
69+
# set_target_properties(qlitehtml PROPERTIES
70+
# BUILD_RPATH "${_LIB_RPATH};${CMAKE_BUILD_RPATH}"
71+
# INSTALL_RPATH "${_LIB_RPATH};${CMAKE_INSTALL_RPATH}"
72+
# RUNTIME_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_BIN_PATH}"
73+
# LIBRARY_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_LIBRARY_PATH}"
74+
# ARCHIVE_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_LIBRARY_ARCHIVE_PATH}"
75+
# )
76+
# endif()
77+
# endif()
78+
# OPENMV-DIFF #

‎src/plugins/CMakeLists.txt

+127-93
Original file line numberDiff line numberDiff line change
@@ -2,120 +2,154 @@
22
add_subdirectory(coreplugin)
33

44
# Level 1: (only depends of Level 0)
5-
add_subdirectory(lua)
5+
# OPENMV-DIFF #
6+
# add_subdirectory(lua)
7+
# OPENMV-DIFF #
68
add_subdirectory(texteditor)
7-
add_subdirectory(serialterminal)
8-
add_subdirectory(extensionmanager)
9-
add_subdirectory(helloworld)
9+
# OPENMV-DIFF #
10+
# add_subdirectory(serialterminal)
11+
# add_subdirectory(extensionmanager)
12+
# add_subdirectory(helloworld)
13+
# OPENMV-DIFF #
1014
add_subdirectory(imageviewer)
11-
add_subdirectory(marketplace)
12-
add_subdirectory(screenrecorder)
13-
add_subdirectory(updateinfo)
14-
add_subdirectory(welcome)
15+
# OPENMV-DIFF #
16+
# add_subdirectory(marketplace)
17+
# add_subdirectory(screenrecorder)
18+
# add_subdirectory(updateinfo)
19+
# add_subdirectory(welcome)
20+
# OPENMV-DIFF #
1521

1622
# Level 2: (only depends on Level 1 and below)
1723
add_subdirectory(bineditor)
18-
add_subdirectory(cpaster)
24+
# OPENMV-DIFF #
25+
# add_subdirectory(cpaster)
26+
# OPENMV-DIFF #
1927
add_subdirectory(diffeditor)
20-
add_subdirectory(emacskeys)
21-
add_subdirectory(macros)
28+
# OPENMV-DIFF #
29+
# add_subdirectory(emacskeys)
30+
# add_subdirectory(macros)
31+
# OPENMV-DIFF #
2232
add_subdirectory(projectexplorer)
23-
add_subdirectory(silversearcher)
33+
# OPENMV-DIFF #
34+
# add_subdirectory(silversearcher)
35+
# OPENMV-DIFF #
2436

2537
# Level 3: (only depends on Level 2 and below)
26-
add_subdirectory(axivion)
27-
add_subdirectory(compilerexplorer)
28-
add_subdirectory(cppeditor)
29-
add_subdirectory(haskell)
30-
add_subdirectory(help)
38+
# OPENMV-DIFF #
39+
# add_subdirectory(axivion)
40+
# add_subdirectory(compilerexplorer)
41+
# add_subdirectory(cppeditor)
42+
# add_subdirectory(haskell)
43+
# add_subdirectory(help)
44+
# OPENMV-DIFF #
3145
add_subdirectory(resourceeditor)
32-
add_subdirectory(nim)
33-
add_subdirectory(conan)
34-
add_subdirectory(saferenderer)
35-
add_subdirectory(terminal)
36-
add_subdirectory(vcpkg)
46+
# OPENMV-DIFF #
47+
# add_subdirectory(nim)
48+
# add_subdirectory(conan)
49+
# add_subdirectory(saferenderer)
50+
# add_subdirectory(terminal)
51+
# add_subdirectory(vcpkg)
52+
# OPENMV-DIFF #
3753

3854
# Level 4: (only depends on Level 3 and below)
39-
add_subdirectory(classview)
40-
add_subdirectory(glsleditor)
41-
add_subdirectory(modeleditor)
55+
# OPENMV-DIFF #
56+
# add_subdirectory(classview)
57+
# add_subdirectory(glsleditor)
58+
# add_subdirectory(modeleditor)
59+
# OPENMV-DIFF #
4260
add_subdirectory(qtsupport)
43-
add_subdirectory(todo)
44-
add_subdirectory(vcsbase)
61+
# OPENMV-DIFF #
62+
# add_subdirectory(todo)
63+
# add_subdirectory(vcsbase)
64+
# OPENMV-DIFF #
4565

4666
# Level 5:
47-
add_subdirectory(autotoolsprojectmanager)
48-
add_subdirectory(bazaar)
49-
add_subdirectory(beautifier)
50-
add_subdirectory(clearcase)
51-
add_subdirectory(cvs)
52-
add_subdirectory(designer)
53-
add_subdirectory(docker)
54-
add_subdirectory(fakevim)
55-
add_subdirectory(fossil)
56-
add_subdirectory(genericprojectmanager)
57-
add_subdirectory(git)
58-
add_subdirectory(mercurial)
59-
add_subdirectory(mesonprojectmanager)
60-
add_subdirectory(perforce)
61-
add_subdirectory(qmakeprojectmanager)
62-
add_subdirectory(qmljstools)
63-
add_subdirectory(scxmleditor)
64-
add_subdirectory(subversion)
65-
add_subdirectory(compilationdatabaseprojectmanager)
67+
# OPENMV-DIFF #
68+
# add_subdirectory(autotoolsprojectmanager)
69+
# add_subdirectory(bazaar)
70+
# add_subdirectory(beautifier)
71+
# add_subdirectory(clearcase)
72+
# add_subdirectory(cvs)
73+
# add_subdirectory(designer)
74+
# add_subdirectory(docker)
75+
# add_subdirectory(fakevim)
76+
# add_subdirectory(fossil)
77+
# add_subdirectory(genericprojectmanager)
78+
# add_subdirectory(git)
79+
# add_subdirectory(mercurial)
80+
# add_subdirectory(mesonprojectmanager)
81+
# add_subdirectory(perforce)
82+
# add_subdirectory(qmakeprojectmanager)
83+
# add_subdirectory(qmljstools)
84+
# add_subdirectory(scxmleditor)
85+
# add_subdirectory(subversion)
86+
# add_subdirectory(compilationdatabaseprojectmanager)
87+
# OPENMV-DIFF #
6688
add_subdirectory(languageclient)
67-
if (WITH_QMLDESIGNER)
68-
add_subdirectory(qmldesignerbase)
69-
endif()
70-
add_subdirectory(webassembly)
89+
# OPENMV-DIFF #
90+
# if (WITH_QMLDESIGNER)
91+
# add_subdirectory(qmldesignerbase)
92+
# endif()
93+
# add_subdirectory(webassembly)
94+
# OPENMV-DIFF #
7195

7296
# Level 6:
73-
add_subdirectory(debugger)
74-
add_subdirectory(coco)
97+
# OPENMV-DIFF #
98+
# add_subdirectory(debugger)
99+
# add_subdirectory(coco)
100+
# OPENMV-DIFF #
75101
add_subdirectory(copilot)
76-
add_subdirectory(gitlab)
77-
if (WITH_QMLDESIGNER)
78-
add_subdirectory(qmlprojectmanager)
79-
endif()
102+
# OPENMV-DIFF #
103+
# add_subdirectory(gitlab)
104+
# if (WITH_QMLDESIGNER)
105+
# add_subdirectory(qmlprojectmanager)
106+
# endif()
107+
# OPENMV-DIFF #
80108
add_subdirectory(python)
81-
add_subdirectory(clangformat)
82-
add_subdirectory(cmakeprojectmanager)
109+
# OPENMV-DIFF #
110+
# add_subdirectory(clangformat)
111+
# add_subdirectory(cmakeprojectmanager)
112+
# OPENMV-DIFF #
83113

84114
# Level 7:
85-
add_subdirectory(android)
86-
add_subdirectory(autotest)
87-
add_subdirectory(baremetal)
88-
add_subdirectory(clangcodemodel)
89-
add_subdirectory(clangtools)
90-
add_subdirectory(cppcheck)
91-
add_subdirectory(incredibuild)
92-
add_subdirectory(ios)
93-
add_subdirectory(qmljseditor)
94-
add_subdirectory(qmlpreview)
95-
add_subdirectory(qmlprofiler)
96-
add_subdirectory(remotelinux)
97-
add_subdirectory(valgrind)
98-
add_subdirectory(perfprofiler)
99-
add_subdirectory(qbsprojectmanager)
100-
add_subdirectory(ctfvisualizer)
101-
add_subdirectory(squish)
102-
add_subdirectory(appstatisticsmonitor)
115+
# OPENMV-DIFF #
116+
# add_subdirectory(android)
117+
# add_subdirectory(autotest)
118+
# add_subdirectory(baremetal)
119+
# add_subdirectory(clangcodemodel)
120+
# add_subdirectory(clangtools)
121+
# add_subdirectory(cppcheck)
122+
# add_subdirectory(incredibuild)
123+
# add_subdirectory(ios)
124+
# add_subdirectory(qmljseditor)
125+
# add_subdirectory(qmlpreview)
126+
# add_subdirectory(qmlprofiler)
127+
# add_subdirectory(remotelinux)
128+
# add_subdirectory(valgrind)
129+
# add_subdirectory(perfprofiler)
130+
# add_subdirectory(qbsprojectmanager)
131+
# add_subdirectory(ctfvisualizer)
132+
# add_subdirectory(squish)
133+
# add_subdirectory(appstatisticsmonitor)
134+
# OPENMV-DIFF #
103135

104136
# Level 8:
105-
add_subdirectory(boot2qt)
106-
if (WITH_QMLDESIGNER)
107-
unset(qmldesigner_builddir)
108-
if (WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
109-
# Workaround for @CMakeFiles\QmlDesigner.rsp ld.lld.exe: The filename or extension is too long.
110-
# Clang on Windows is having problems with QmlDesigner.rsp which is bigger than 32KiB
111-
set(qmldesigner_builddir ${PROJECT_BINARY_DIR}/qmldsgnr)
112-
endif()
113-
add_subdirectory(qmldesigner ${qmldesigner_builddir})
114-
add_subdirectory(qmldesignerlite)
115-
add_subdirectory(effectcomposer)
116-
add_subdirectory(studiowelcome)
117-
add_subdirectory(insight)
118-
endif()
119-
add_subdirectory(qnx)
120-
add_subdirectory(mcusupport)
121-
add_subdirectory(qtapplicationmanager)
137+
# OPENMV-DIFF #
138+
# add_subdirectory(boot2qt)
139+
# if (WITH_QMLDESIGNER)
140+
# unset(qmldesigner_builddir)
141+
# if (WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
142+
# # Workaround for @CMakeFiles\QmlDesigner.rsp ld.lld.exe: The filename or extension is too long.
143+
# # Clang on Windows is having problems with QmlDesigner.rsp which is bigger than 32KiB
144+
# set(qmldesigner_builddir ${PROJECT_BINARY_DIR}/qmldsgnr)
145+
# endif()
146+
# add_subdirectory(qmldesigner ${qmldesigner_builddir})
147+
# add_subdirectory(qmldesignerlite)
148+
# add_subdirectory(effectcomposer)
149+
# add_subdirectory(studiowelcome)
150+
# add_subdirectory(insight)
151+
# endif()
152+
# add_subdirectory(qnx)
153+
# add_subdirectory(mcusupport)
154+
# add_subdirectory(qtapplicationmanager)
155+
# OPENMV-DIFF #

‎src/shared/CMakeLists.txt

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
add_subdirectory(designerintegrationv2)
1+
# OPENMV-DIFF #
2+
# add_subdirectory(designerintegrationv2)
3+
# OPENMV-DIFF #
24
add_subdirectory(proparser)
35
add_subdirectory(qtsingleapplication)
4-
add_subdirectory(help)
5-
add_subdirectory(registryaccess)
6+
# OPENMV-DIFF #
7+
# add_subdirectory(help)
8+
# add_subdirectory(registryaccess)
9+
# OPENMV-DIFF #
610

711
# PCHs used by qmake based plugin builds
812
qtc_add_public_header(qtcreator_pch.h)

0 commit comments

Comments
 (0)
Please sign in to comment.