Skip to content

Commit d6dc50b

Browse files
kwagyemankwagyeman
committed
qtcreator: Eliminated a lot of uncessary libraries.
1 parent 5793b31 commit d6dc50b

File tree

9 files changed

+53
-31
lines changed

9 files changed

+53
-31
lines changed

‎src/libs/3rdparty/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
add_subdirectory(cplusplus)
1+
# OPENMV-DIFF #
2+
# add_subdirectory(cplusplus)
3+
# OPENMV-DIFF #
24
add_subdirectory(syntax-highlighting)
35
add_subdirectory(libvterm)
46
add_subdirectory(libptyqt)

‎src/libs/CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ add_subdirectory(3rdparty)
55
# add_subdirectory(advanceddockingsystem)
66
# OPENMV-DIFF #
77
add_subdirectory(aggregation)
8-
add_subdirectory(cplusplus)
8+
# OPENMV-DIFF #
9+
# add_subdirectory(cplusplus)
10+
# OPENMV-DIFF #
911
add_subdirectory(extensionsystem)
1012
# OPENMV-DIFF #
1113
# add_subdirectory(glsl)
1214
# OPENMV-DIFF #
1315
add_subdirectory(languageserverprotocol)
14-
add_subdirectory(languageutils)
1516
# OPENMV-DIFF #
17+
# add_subdirectory(languageutils)
1618
# add_subdirectory(modelinglib)
1719
# add_subdirectory(qmldebug)
1820
# add_subdirectory(qmleditorwidgets)
19-
# OPENMV-DIFF #
20-
add_subdirectory(qmljs)
21-
# OPENMV-DIFF #
21+
# add_subdirectory(qmljs)
2222
# add_subdirectory(qtcreatorcdbext)
2323
# OPENMV-DIFF #
2424
add_subdirectory(utils)

‎src/plugins/CMakeLists.txt

+2-6
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ add_subdirectory(projectexplorer)
4141
# add_subdirectory(cppeditor)
4242
# add_subdirectory(haskell)
4343
# add_subdirectory(help)
44-
# OPENMV-DIFF #
45-
add_subdirectory(resourceeditor)
46-
# OPENMV-DIFF #
44+
# add_subdirectory(resourceeditor)
4745
# add_subdirectory(nim)
4846
# add_subdirectory(conan)
4947
# add_subdirectory(saferenderer)
@@ -58,9 +56,7 @@ add_subdirectory(tabbededitor)
5856
# add_subdirectory(classview)
5957
# add_subdirectory(glsleditor)
6058
# add_subdirectory(modeleditor)
61-
# OPENMV-DIFF #
62-
add_subdirectory(qtsupport)
63-
# OPENMV-DIFF #
59+
# add_subdirectory(qtsupport)
6460
# add_subdirectory(todo)
6561
# add_subdirectory(vcsbase)
6662
# OPENMV-DIFF #

‎src/plugins/python/CMakeLists.txt

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
add_qtc_plugin(Python
2-
DEPENDS QmlJS
3-
PLUGIN_DEPENDS Core LanguageClient ProjectExplorer TextEditor QtSupport
2+
# OPENMV-DIFF #
3+
# DEPENDS QmlJS
4+
# PLUGIN_DEPENDS Core LanguageClient ProjectExplorer TextEditor QtSupport
5+
# OPENMV-DIFF #
6+
PLUGIN_DEPENDS Core LanguageClient ProjectExplorer TextEditor
7+
# OPENMV-DIFF #
48
SOURCES
59
pipsupport.cpp pipsupport.h
6-
pyside.cpp pyside.h
7-
pythonbuildconfiguration.cpp pythonbuildconfiguration.h
8-
pysideuicextracompiler.cpp pysideuicextracompiler.h
10+
# OPENMV-DIFF #
11+
# pyside.cpp pyside.h
12+
# pythonbuildconfiguration.cpp pythonbuildconfiguration.h
13+
# pysideuicextracompiler.cpp pysideuicextracompiler.h
14+
# OPENMV-DIFF #
915
python.qrc
10-
pythonbuildsystem.cpp pythonbuildsystem.h
16+
# OPENMV-DIFF #
17+
# pythonbuildsystem.cpp pythonbuildsystem.h
18+
# OPENMV-DIFF #
1119
pythonconstants.h
1220
pythoneditor.cpp pythoneditor.h
1321
pythonformattoken.h

‎src/plugins/python/pythoneditor.cpp

+11-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
#include "pythoneditor.h"
55

6-
#include "pyside.h"
7-
#include "pythonbuildconfiguration.h"
6+
// OPENMV-DIFF //
7+
// #include "pyside.h"
8+
// #include "pythonbuildconfiguration.h"
9+
// OPENMV-DIFF //
810
#include "pythonconstants.h"
911
#include "pythonhighlighter.h"
1012
#include "pythonindenter.h"
@@ -175,8 +177,10 @@ void PythonEditorWidget::updateInterpretersSelector()
175177
&& target->activeBuildConfiguration() == buildConfiguration) {
176178
action->setChecked(true);
177179
setButtonText(name);
178-
if (auto pbc = qobject_cast<PythonBuildConfiguration *>(buildConfiguration))
179-
m_interpreters->setToolTip(pbc->python().toUserOutput());
180+
// OPENMV-DIFF //
181+
// if (auto pbc = qobject_cast<PythonBuildConfiguration *>(buildConfiguration))
182+
// m_interpreters->setToolTip(pbc->python().toUserOutput());
183+
// OPENMV-DIFF //
180184
}
181185
connect(action,
182186
&QAction::triggered,
@@ -311,7 +315,9 @@ void PythonDocument::updateCurrentPython()
311315
void PythonDocument::updatePython(const FilePath &python)
312316
{
313317
openDocumentWithPython(python, this);
314-
PySideInstaller::instance().checkPySideInstallation(python, this);
318+
// OPENMV-DIFF //
319+
// PySideInstaller::instance().checkPySideInstallation(python, this);
320+
// OPENMV-DIFF //
315321
emit pythonUpdated(python);
316322
}
317323

‎src/plugins/python/pythonplugin.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@ class PythonPlugin final : public ExtensionSystem::IPlugin
6363

6464
setupPipSupport(this);
6565

66-
KitManager::setIrrelevantAspects(KitManager::irrelevantAspects()
67-
+ QSet<Id>{PythonKitAspect::id()});
66+
// OPENMV-DIFF //
67+
// KitManager::setIrrelevantAspects(KitManager::irrelevantAspects()
68+
// + QSet<Id>{PythonKitAspect::id()});
69+
// OPENMV-DIFF //
6870

6971
ProjectManager::registerProjectType<PythonProject>(Constants::C_PY_PROJECT_MIME_TYPE);
7072
ProjectManager::registerProjectType<PythonProject>(Constants::C_PY_PROJECT_MIME_TYPE_LEGACY);

‎src/plugins/python/pythonproject.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
#include "pythonproject.h"
55

6-
#include "pythonbuildsystem.h"
6+
// OPENMV-DIFF //
7+
// #include "pythonbuildsystem.h"
8+
// OPENMV-DIFF //
79
#include "pythonconstants.h"
810
#include "pythonkitaspect.h"
911
#include "pythontr.h"
@@ -26,7 +28,9 @@ PythonProject::PythonProject(const FilePath &fileName)
2628
setProjectLanguages(Context(ProjectExplorer::Constants::PYTHON_LANGUAGE_ID));
2729
setDisplayName(fileName.completeBaseName());
2830

29-
setBuildSystemCreator([](Target *t) { return new PythonBuildSystem(t); });
31+
// OPENMV-DIFF //
32+
// setBuildSystemCreator([](Target *t) { return new PythonBuildSystem(t); });
33+
// OPENMV-DIFF //
3034
}
3135

3236
Tasks PythonProject::projectIssues(const Kit *k) const

‎src/plugins/python/pythonutils.cpp

+7-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
#include "pythonutils.h"
55

6-
#include "pythonbuildconfiguration.h"
6+
// OPENMV-DIFF //
7+
// #include "pythonbuildconfiguration.h"
8+
// OPENMV-DIFF //
79
#include "pythonconstants.h"
810
#include "pythonkitaspect.h"
911
#include "pythonproject.h"
@@ -45,8 +47,10 @@ FilePath detectPython(const FilePath &documentPath)
4547

4648
if (project && project->mimeType() == Constants::C_PY_PROJECT_MIME_TYPE) {
4749
if (const Target *target = project->activeTarget()) {
48-
if (auto bc = qobject_cast<PythonBuildConfiguration *>(target->activeBuildConfiguration()))
49-
return bc->python();
50+
// OPENMV-DIFF //
51+
// if (auto bc = qobject_cast<PythonBuildConfiguration *>(target->activeBuildConfiguration()))
52+
// return bc->python();
53+
// OPENMV-DIFF //
5054
if (const std::optional<Interpreter> python = PythonKitAspect::python(target->kit()))
5155
return python->command;
5256
}

‎src/shared/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# OPENMV-DIFF #
22
# add_subdirectory(designerintegrationv2)
3+
# add_subdirectory(proparser)
34
# OPENMV-DIFF #
4-
add_subdirectory(proparser)
55
add_subdirectory(qtsingleapplication)
66
# OPENMV-DIFF #
77
# add_subdirectory(help)

0 commit comments

Comments
 (0)