diff options
| author | Jarek Kobus <[email protected]> | 2017-05-31 11:44:02 +0200 |
|---|---|---|
| committer | Jarek Kobus <[email protected]> | 2017-06-12 12:04:42 +0000 |
| commit | d6d76df9e0ed0e9e6c761a1d3c2581ec317d3ebb (patch) | |
| tree | 31d81bd1fd0bf8ef99ae2c057298b52d847c1f3e /src/tools/uic/cpp/cppwriteincludes.cpp | |
| parent | d57bf5e8aa6c575c4e3b9d80793e9becf1469d82 (diff) | |
Remove ancient embedded pixmaps and scripts from uic
Change-Id: Iec06e1af91a6d61226ae484325b1ec82810d634d
Reviewed-by: Friedemann Kleint <[email protected]>
Diffstat (limited to 'src/tools/uic/cpp/cppwriteincludes.cpp')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteincludes.cpp | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp index dcbe400224c..de64b85219b 100644 --- a/src/tools/uic/cpp/cppwriteincludes.cpp +++ b/src/tools/uic/cpp/cppwriteincludes.cpp @@ -69,7 +69,7 @@ static inline QString moduleHeader(const QString &module, const QString &header) namespace CPP { WriteIncludes::WriteIncludes(Uic *uic) - : m_uic(uic), m_output(uic->output()), m_scriptsActivated(false), m_laidOut(false) + : m_uic(uic), m_output(uic->output()), m_laidOut(false) { // When possible (no namespace) use the "QtModule/QClass" convention // and create a re-mapping of the old header "qclass.h" to it. Do not do this @@ -92,7 +92,6 @@ WriteIncludes::WriteIncludes(Uic *uic) void WriteIncludes::acceptUI(DomUI *node) { - m_scriptsActivated = false; m_laidOut = false; m_localIncludes.clear(); m_globalIncludes.clear(); @@ -231,10 +230,6 @@ void WriteIncludes::acceptCustomWidget(DomCustomWidget *node) if (className.isEmpty()) return; - if (const DomScript *domScript = node->elementScript()) - if (!domScript->text().isEmpty()) - activateScripts(); - if (!node->elementHeader() || node->elementHeader()->text().isEmpty()) { add(className, false); // no header specified } else { @@ -296,21 +291,6 @@ void WriteIncludes::writeHeaders(const OrderedSet &headers, bool global) } } -void WriteIncludes::acceptWidgetScripts(const DomScripts &scripts, DomWidget *, const DomWidgets &) -{ - if (!scripts.empty()) { - activateScripts(); - } -} - -void WriteIncludes::activateScripts() -{ - if (!m_scriptsActivated) { - add(QLatin1String("QScriptEngine")); - add(QLatin1String("QDebug")); - m_scriptsActivated = true; - } -} } // namespace CPP QT_END_NAMESPACE |