Compare commits

...
Author SHA1 Message Date
Tannin f77b5daf9d incorrect use of "complete" file suffixes 2015-06-09 20:40:13 +02:00
Tannin 1dc5a32871 Merge 2015-05-09 21:46:40 +02:00
Tannin db0a791155 Merge in changes by Tom Tanner 2015-03-27 18:24:37 +01:00
Tom Tanner 65ce23f906 Fixed Scons build for existing bits.
Changed pynedit.pro to fetch from 'standard' install location
Changed saveas code to use organizer report rather than uibase - this way it's
not dependant on the vagaries of the include path, and works the same as the
rest of the organiser directory
2015-03-20 10:34:30 +00:00
Tom Tanner 4fddc311c5 Merge with branch1.2 2015-03-18 17:40:29 +00:00
Tom Tanner c863a94793 Refactoring and cleanup. 2015-03-18 14:16:04 +00:00
Tom Tanner 77f074f59e Every plugin now built 2015-03-17 16:31:15 +00:00
Tannin b72216ad8c extended the game-plugin interface 2015-01-29 19:26:42 +01:00
Tannin 0a8bcff070 Merge with branch1.2 2015-01-03 15:58:52 +01:00
3 changed files with 16 additions and 4 deletions
+11
View File
@@ -0,0 +1,11 @@
Import('qt_env')
env = qt_env.Clone()
env.AppendUnique(CPPDEFINES = [ 'PREVIEWBASE_LIBRARY' ])
lib = env.SharedLibrary('previewBase', env.Glob('*.cpp'))
env.InstallModule(lib)
res = env['QT_USED_MODULES']
Return('res')
+3 -2
View File
@@ -10,7 +10,7 @@ TEMPLATE = lib
CONFIG += plugins
CONFIG += dll
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets gui
DEFINES += PREVIEWBASE_LIBRARY
@@ -22,4 +22,5 @@ HEADERS += previewbase.h
include(../plugin_template.pri)
OTHER_FILES += \
previewbase.json
previewbase.json\
SConscript
+2 -2
View File
@@ -84,7 +84,7 @@ QList<MOBase::PluginSetting> PreviewBase::settings() const
std::set<QString> PreviewBase::supportedExtensions() const
{
std::set<QString> extensions;
foreach (const auto &generator, m_PreviewGenerators) {
for (const auto &generator : m_PreviewGenerators) {
extensions.insert(generator.first);
}
@@ -93,7 +93,7 @@ std::set<QString> PreviewBase::supportedExtensions() const
QWidget *PreviewBase::genFilePreview(const QString &fileName, const QSize &maxSize) const
{
auto iter = m_PreviewGenerators.find(QFileInfo(fileName).completeSuffix().toLower());
auto iter = m_PreviewGenerators.find(QFileInfo(fileName).suffix().toLower());
if (iter != m_PreviewGenerators.end()) {
return iter->second(fileName, maxSize);
} else {