From f727ffa1eb6ffe18a485fd91d1d702c5c1558c4f Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 16 Feb 2015 08:39:57 +0100 Subject: [PATCH] compose: Rename main.cpp to qcomposeplatforminputcontextmain.cpp Files with same base name cause extra trouble for debuggers. Similarly to 26cf0f0d5a8, it can be avoided here. Change-Id: Ide47170f417d636aa031b0d84a1951df8bf32316 Reviewed-by: Friedemann Kleint --- src/plugins/platforminputcontexts/compose/compose.pro | 2 +- .../compose/{main.cpp => qcomposeplatforminputcontextmain.cpp} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/plugins/platforminputcontexts/compose/{main.cpp => qcomposeplatforminputcontextmain.cpp} (97%) diff --git a/src/plugins/platforminputcontexts/compose/compose.pro b/src/plugins/platforminputcontexts/compose/compose.pro index 10e50a7a7e9..a9da36c4737 100644 --- a/src/plugins/platforminputcontexts/compose/compose.pro +++ b/src/plugins/platforminputcontexts/compose/compose.pro @@ -9,7 +9,7 @@ QT += gui-private DEFINES += X11_PREFIX='\\"$$QMAKE_X11_PREFIX\\"' -SOURCES += $$PWD/main.cpp \ +SOURCES += $$PWD/qcomposeplatforminputcontextmain.cpp \ $$PWD/qcomposeplatforminputcontext.cpp \ $$PWD/generator/qtablegenerator.cpp \ diff --git a/src/plugins/platforminputcontexts/compose/main.cpp b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp similarity index 97% rename from src/plugins/platforminputcontexts/compose/main.cpp rename to src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp index e0c252eaf67..5ab0dd8f046 100644 --- a/src/plugins/platforminputcontexts/compose/main.cpp +++ b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp @@ -59,4 +59,4 @@ QComposeInputContext *QComposePlatformInputContextPlugin::create(const QString & QT_END_NAMESPACE -#include "main.moc" +#include "qcomposeplatforminputcontextmain.moc"