From bca4f0d2affb5378021d28868c41e91be00cd0e5 Mon Sep 17 00:00:00 2001 From: vicente Date: Wed, 15 Nov 2023 23:29:11 +0100 Subject: [PATCH] change order in initialization --- QtHtmlEditor.pro.user | 261 ++++++++++++++++++++++++++++++++++ src/richtexteditortoolbar.cpp | 2 +- 2 files changed, 262 insertions(+), 1 deletion(-) create mode 100644 QtHtmlEditor.pro.user diff --git a/QtHtmlEditor.pro.user b/QtHtmlEditor.pro.user new file mode 100644 index 0000000..860337e --- /dev/null +++ b/QtHtmlEditor.pro.user @@ -0,0 +1,261 @@ + + + + + + EnvironmentId + {1988a14f-ea96-4f6c-ac0c-08d49440a8e5} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + false + true + false + 0 + true + true + 0 + 8 + true + false + 1 + true + true + true + *.md, *.MD, Makefile + false + true + true + + + + ProjectExplorer.Project.PluginSettings + + + true + false + true + true + true + true + + + 0 + true + + true + true + Builtin.DefaultTidyAndClazy + 4 + true + + + + true + + + + + ProjectExplorer.Project.Target.0 + + Desktop + Desktop Qt 6.6.0 MSVC2019 64bit + Desktop Qt 6.6.0 MSVC2019 64bit + qt.qt6.660.win64_msvc2019_64_kit + 0 + 0 + 0 + + 0 + E:\cpp\build-QtHtmlEditor-Desktop_Qt_6_6_0_MSVC2019_64bit-Debug + E:/cpp/build-QtHtmlEditor-Desktop_Qt_6_6_0_MSVC2019_64bit-Debug + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + E:\cpp\build-QtHtmlEditor-Desktop_Qt_6_6_0_MSVC2019_64bit-Release + E:/cpp/build-QtHtmlEditor-Desktop_Qt_6_6_0_MSVC2019_64bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + E:\cpp\build-QtHtmlEditor-Desktop_Qt_6_6_0_MSVC2019_64bit-Profile + E:/cpp/build-QtHtmlEditor-Desktop_Qt_6_6_0_MSVC2019_64bit-Profile + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + true + true + + 2 + + false + ProjectExplorer.CustomExecutableRunConfiguration + + true + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/src/richtexteditortoolbar.cpp b/src/richtexteditortoolbar.cpp index 2ad960c..377305f 100644 --- a/src/richtexteditortoolbar.cpp +++ b/src/richtexteditortoolbar.cpp @@ -44,8 +44,8 @@ RichTextEditorToolBar::RichTextEditorToolBar(RichTextEditor *editor, m_link_action(new QAction(this)), m_image_action(new QAction(this)), m_color_action(new ColorAction(this)), - m_font_family_input(new QFontComboBox(this)), m_font_size_input(new QComboBox), + m_font_family_input(new QFontComboBox(this)), m_editor(editor) { // Font comboBox