Skip to content

Reduce QtWidgets dependency #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igorkorsukov merged 5 commits into from
Jul 13, 2026
Merged

Reduce QtWidgets dependency #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63ddb33
Split QWidgets style from ThemeApi
cbjeukendrup Jul 12, 2026
a6c8993
DialogView: overhaul frame size determination to remove QtWidgets dep
cbjeukendrup Jul 12, 2026
cf2d47a
Replace QApplication with QGuiApplication to reduce QtWidgets dep
cbjeukendrup Jul 12, 2026
7cb4721
Remove unused method
cbjeukendrup Jul 12, 2026
aae16c1
Remove public QtWidgets linking from muse_global target
cbjeukendrup Jul 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions framework/global/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,7 @@ if (MUSE_QT_SUPPORT)
# so that other modules get them transitively.
target_link_libraries(muse_global PUBLIC Qt::Core Qt::Gui)

# These are needed by the PCH; if we don't make them public, modules
# that don't use them won't be able to use the PCH with some compilers.
target_link_libraries(muse_global PUBLIC Qt::Quick Qt::Widgets)
target_link_libraries(muse_global PRIVATE Qt::Quick Qt::Widgets)
endif()

target_link_libraries(muse_global PRIVATE ${CMAKE_DL_LIBS})
Expand Down
5 changes: 4 additions & 1 deletion framework/interactive/iinteractiveuriregister.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@
#include "modularity/imoduleinterface.h"
#include "types/uri.h"
#include "interactivetypes.h"
#include "ui/view/widgetdialog.h"

class QWidget;

namespace muse::ui {
class WidgetDialog;
}

namespace muse::interactive {
class IInteractiveUriRegister : MODULE_GLOBAL_INTERFACE
{
Expand Down
5 changes: 3 additions & 2 deletions framework/tours/internal/toursprovider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

#include "toursprovider.h"

#include <QApplication>
#include <QGuiApplication>

#include "log.h"

Expand All @@ -35,7 +36,7 @@ ToursProvider::ToursProvider(const modularity::ContextPtr& iocCtx)
{
connect(&m_openTimer, &QTimer::timeout, this, &ToursProvider::doShow);

connect(qApp, &QApplication::applicationStateChanged, this, &ToursProvider::onApplicationStateChanged);
connect(qApp, &QGuiApplication::applicationStateChanged, this, &ToursProvider::onApplicationStateChanged);
}

void ToursProvider::showTour(const Tour& tour)
Expand Down
9 changes: 6 additions & 3 deletions framework/ui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,14 @@ target_sources(muse_ui PRIVATE
view/qmltooltip.h
view/qmltranslation.cpp
view/qmltranslation.h
view/widgetdialog.h
view/widgetnavigationfix.cpp
view/widgetnavigationfix.h
view/widgetstatestore.cpp
view/widgetstatestore.h
view/widgetstyle.cpp
view/widgetstyle.h
view/widgetutils.h
view/widgetdialog.h
)

if (OS_IS_MAC)
Expand Down Expand Up @@ -128,7 +130,7 @@ elseif(OS_IS_WIN)
)

# Exclude from Unity Build to avoid Error C2872: 'Uri': ambiguous symbol
# and avoid error with IconCode::ERROR
# and avoid error with IconCode::ERROR
set_source_files_properties(
${CMAKE_CURRENT_LIST_DIR}/internal/platform/windows/windowsplatformtheme.cpp
${CMAKE_CURRENT_LIST_DIR}/internal/platform/windows/winwindowscontroller.cpp
Expand Down Expand Up @@ -161,7 +163,8 @@ if (MUSE_LOAD_QML_FROM_SOURCE)
endif()

if (MUSE_QT_SUPPORT)
target_link_libraries(muse_ui PRIVATE Qt::Quick Qt::Widgets)
target_link_libraries(muse_ui PUBLIC Qt::Quick)
target_link_libraries(muse_ui PRIVATE Qt::Widgets)

if (OS_IS_LIN)
target_link_libraries(muse_ui PRIVATE Qt::DBus)
Expand Down
Loading