feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Designer: Remove compatibility code for Qt < 5.0

Browse Source 
Change-Id: I3ebe69b2c56635d1978da994fc772536a2839304
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-08-20 16:09:26 +02:00
committed by Eike Ziller
parent 48157ccb53
commit 208865dd0a
13 changed files with 12 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/designer/resourcehandler.cpp
View File

@@ -37,12 +37,7 @@
#include <projectexplorer/session.h>
#include <resourceeditor/resourcenode.h>
#if QT_VERSION >= 0x050000
# include <QDesignerFormWindowInterface>
#else
# include "qt_private/formwindowbase_p.h"
# include "qt_private/qtresourcemodel_p.h"
#endif
#include <QDesignerFormWindowInterface>
#include <utils/qtcassert.h>
@@ -84,11 +79,7 @@ void QrcFilesVisitor::visitFolderNode(FolderNode *folderNode)
}
// ------------ ResourceHandler
#if QT_VERSION >= 0x050000
ResourceHandler::ResourceHandler(QDesignerFormWindowInterface *fw) :
#else
ResourceHandler::ResourceHandler(qdesigner_internal::FormWindowBase *fw) :
#endif
QObject(fw),
m_form(fw),
m_sessionNode(0),
@@ -110,11 +101,7 @@ void ResourceHandler::ensureInitialized()
connect(m_sessionWatcher, SIGNAL(foldersAdded()), this, SLOT(updateResources()));
connect(m_sessionWatcher, SIGNAL(foldersRemoved()), this, SLOT(updateResources()));
m_sessionNode->registerWatcher(m_sessionWatcher);
#if QT_VERSION >= 0x050000
m_originalUiQrcPaths = m_form->activeResourceFilePaths();
#else
m_originalUiQrcPaths = m_form->resourceSet()->activeQrcPaths();
#endif
if (Designer::Constants::Internal::debug)
qDebug() << "ResourceHandler::ensureInitialized() origPaths=" << m_originalUiQrcPaths;
}
@@ -169,26 +156,16 @@ void ResourceHandler::updateResources(bool updateProjectResources)
}
}
#if QT_VERSION >= 0x050000
m_form->activateResourceFilePaths(projectQrcFiles);
m_form->setResourceFileSaveMode(QDesignerFormWindowInterface::SaveOnlyUsedResourceFiles);
#else
m_form->resourceSet()->activateQrcPaths(projectQrcFiles);
m_form->setSaveResourcesBehaviour(qdesigner_internal::FormWindowBase::SaveOnlyUsedQrcFiles);
#endif
if (Designer::Constants::Internal::debug)
qDebug() << "ResourceHandler::updateResources()" << fileName
<< " associated with project" << project->rootProjectNode()->path()
<< " using project qrc files" << projectQrcFiles.size();
} else {
// Use resource file originally used in form
#if QT_VERSION >= 0x050000
m_form->activateResourceFilePaths(m_originalUiQrcPaths);
m_form->setResourceFileSaveMode(QDesignerFormWindowInterface::SaveAllResourceFiles);
#else
m_form->resourceSet()->activateQrcPaths(m_originalUiQrcPaths);
m_form->setSaveResourcesBehaviour(qdesigner_internal::FormWindowBase::SaveAll);
#endif
if (Designer::Constants::Internal::debug)
qDebug() << "ResourceHandler::updateResources()" << fileName << " not associated with project, using loaded qrc files.";
}