From 8b95ca89572479262c9eb3dd4b2ecd88ddf6db5c Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Fri, 27 May 2011 14:51:30 +0200 Subject: QmlJS: Allow for QML modules with version subdirectories. That means import Foo 2.1 can resolve to /path/Foo.2.1 or /path/Foo.2 or /path/Foo Task-number: QTCREATORBUG-4607 Change-Id: Ie1efc5be2ca2ed3ccc130e8a662f94aed11bec1ax Reviewed-on: http://codereview.qt.nokia.com/194 Reviewed-by: Roberto Raggi (cherry picked from commit 8742026380faeb39c7084872d5c146f301253a78) Reviewed-on: http://codereview.qt.nokia.com/380 Reviewed-by: Qt Sanity Bot Reviewed-by: hjk --- src/plugins/qmljstools/qmljsmodelmanager.cpp | 80 +++++++++++++++++++++------- 1 file changed, 61 insertions(+), 19 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index 08f943e0554..5cb426e2c2e 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -285,7 +285,9 @@ void ModelManager::updateLibraryInfo(const QString &path, const LibraryInfo &inf QMutexLocker locker(&m_mutex); _snapshot.insertLibraryInfo(path, info); } - emit libraryInfoUpdated(path, info); + // only emit if we got new useful information + if (info.isValid()) + emit libraryInfoUpdated(path, info); } static QStringList qmlFilesInDirectory(const QString &path) @@ -356,15 +358,22 @@ static bool findNewQmlLibraryInPath(const QString &path, QSet *newLibraries) { // if we know there is a library, done - if (snapshot.libraryInfo(path).isValid()) + const LibraryInfo &existingInfo = snapshot.libraryInfo(path); + if (existingInfo.isValid()) return true; if (newLibraries->contains(path)) return true; + // if we looked at the path before, done + if (existingInfo.wasScanned()) + return false; const QDir dir(path); QFile qmldirFile(dir.filePath(QLatin1String("qmldir"))); - if (!qmldirFile.exists()) + if (!qmldirFile.exists()) { + LibraryInfo libraryInfo(LibraryInfo::NotFound); + modelManager->updateLibraryInfo(path, libraryInfo); return false; + } #ifdef Q_OS_WIN // QTCREATORBUG-3402 - be case sensitive even here? @@ -380,8 +389,7 @@ static bool findNewQmlLibraryInPath(const QString &path, const QString libraryPath = QFileInfo(qmldirFile).absolutePath(); newLibraries->insert(libraryPath); - modelManager->updateLibraryInfo(libraryPath, - LibraryInfo(qmldirParser)); + modelManager->updateLibraryInfo(libraryPath, LibraryInfo(qmldirParser)); // scan the qml files in the library foreach (const QmlDirParser::Component &component, qmldirParser.components()) { @@ -398,30 +406,62 @@ static bool findNewQmlLibraryInPath(const QString &path, return true; } +static void findNewQmlLibrary( + const QString &path, + const LanguageUtils::ComponentVersion &version, + const Snapshot &snapshot, + ModelManager *modelManager, + QStringList *importedFiles, + QSet *scannedPaths, + QSet *newLibraries) +{ + QString libraryPath = QString("%1.%2.%3").arg( + path, + QString::number(version.majorVersion()), + QString::number(version.minorVersion())); + findNewQmlLibraryInPath( + libraryPath, snapshot, modelManager, + importedFiles, scannedPaths, newLibraries); + + libraryPath = QString("%1.%2").arg( + path, + QString::number(version.majorVersion())); + findNewQmlLibraryInPath( + libraryPath, snapshot, modelManager, + importedFiles, scannedPaths, newLibraries); + + findNewQmlLibraryInPath( + path, snapshot, modelManager, + importedFiles, scannedPaths, newLibraries); +} + static void findNewLibraryImports(const Document::Ptr &doc, const Snapshot &snapshot, ModelManager *modelManager, QStringList *importedFiles, QSet *scannedPaths, QSet *newLibraries) { - // scan library imports + // scan current dir + findNewQmlLibraryInPath(doc->path(), snapshot, modelManager, + importedFiles, scannedPaths, newLibraries); + + // scan dir and lib imports const QStringList importPaths = modelManager->importPaths(); foreach (const Interpreter::ImportInfo &import, doc->bind()->imports()) { + if (import.type() == Interpreter::ImportInfo::DirectoryImport) { + const QString targetPath = import.name(); + findNewQmlLibraryInPath(targetPath, snapshot, modelManager, + importedFiles, scannedPaths, newLibraries); + } + if (import.type() == Interpreter::ImportInfo::LibraryImport) { + if (!import.version().isValid()) + continue; foreach (const QString &importPath, importPaths) { const QString targetPath = QDir(importPath).filePath(import.name()); - - if (findNewQmlLibraryInPath(targetPath, snapshot, modelManager, - importedFiles, scannedPaths, newLibraries)) - break; + findNewQmlLibrary(targetPath, import.version(), snapshot, modelManager, + importedFiles, scannedPaths, newLibraries); } - } else if (import.type() == Interpreter::ImportInfo::DirectoryImport) { - const QString targetPath = import.name(); - findNewQmlLibraryInPath(targetPath, snapshot, modelManager, - importedFiles, scannedPaths, newLibraries); } } - - findNewQmlLibraryInPath(doc->path(), snapshot, modelManager, - importedFiles, scannedPaths, newLibraries); } static bool suffixMatches(const QString &fileName, const Core::MimeType &mimeType) @@ -451,8 +491,6 @@ void ModelManager::parse(QFutureInterface &future, int progressRange = files.size(); future.setProgressRange(0, progressRange); - Snapshot snapshot = modelManager->_snapshot; - // paths we have scanned for files and added to the files list QSet scannedPaths; // libraries we've found while scanning imports @@ -499,6 +537,10 @@ void ModelManager::parse(QFutureInterface &future, doc->setSource(contents); doc->parse(); + // update snapshot. requires synchronization, but significantly reduces amount of file + // system queries for library imports because queries are cached in libraryInfo + const Snapshot snapshot = modelManager->snapshot(); + // get list of referenced files not yet in snapshot or in directories already scanned QStringList importedFiles; findNewImplicitImports(doc, snapshot, &importedFiles, &scannedPaths); -- cgit v1.2.3 From 918a1653da02f712d56bc56c38d235bbf0c41204 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Wed, 20 Apr 2011 10:46:04 +0200 Subject: QmlJS: Fix library-by-path imports. Fixes the problem 5426c3ac2cdf898ca1190a7746ba506ff24abc50 and 7b25f438c67c7cf395ccd2cd846e5d413f6d9222 worked around. Reviewed-by: Erik Verbruggen (cherry picked from commit e21311132ba3fa8cf0d8ade81117f988da8363e9) Change-Id: I5426c3ac2cdf898ca1190a7746ba506ff24abc50xx Reviewed-on: http://codereview.qt.nokia.com/381 Reviewed-by: Qt Sanity Bot Reviewed-by: hjk --- src/plugins/qmljstools/qmljsplugindumper.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/plugins') diff --git a/src/plugins/qmljstools/qmljsplugindumper.cpp b/src/plugins/qmljstools/qmljsplugindumper.cpp index 8e1c5f2113b..07cea32863f 100644 --- a/src/plugins/qmljstools/qmljsplugindumper.cpp +++ b/src/plugins/qmljstools/qmljsplugindumper.cpp @@ -274,7 +274,6 @@ void PluginDumper::dump(const Plugin &plugin) connect(process, SIGNAL(finished(int)), SLOT(qmlPluginTypeDumpDone(int))); connect(process, SIGNAL(error(QProcess::ProcessError)), SLOT(qmlPluginTypeDumpError(QProcess::ProcessError))); QStringList args; - args << QLatin1String("--notrelocatable"); if (plugin.importUri.isEmpty()) { args << QLatin1String("--path"); args << plugin.importPath; -- cgit v1.2.3 From aee9a55a819971bc9bcddedf8b2c3b489ed9e61d Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Wed, 8 Jun 2011 12:58:46 +0200 Subject: QmlJS: Fix missing rehighlight if other file changes. When QML modules with many source files were loaded, the rehighlight from the found library was done before the files contained in the library were done parsing. This way any updated document will eventually lead to the current editor rehighlighting. Reviewed-by: Erik Verbruggen Change-Id: I0f4d18390d3e0ee17cd255c68496f61479f82f05x Reviewed-on: http://codereview.qt.nokia.com/382 Reviewed-by: Qt Sanity Bot Reviewed-by: hjk --- src/plugins/qmljseditor/qmljseditor.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/plugins') diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 4261431953b..f2eba64f426 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -635,7 +635,7 @@ QmlJSTextEditorWidget::QmlJSTextEditorWidget(QWidget *parent) : m_semanticRehighlightTimer = new QTimer(this); m_semanticRehighlightTimer->setInterval(UPDATE_DOCUMENT_DEFAULT_INTERVAL); m_semanticRehighlightTimer->setSingleShot(true); - connect(m_semanticRehighlightTimer, SIGNAL(timeout()), this, SLOT(forceSemanticRehighlight())); + connect(m_semanticRehighlightTimer, SIGNAL(timeout()), this, SLOT(forceSemanticRehighlightIfCurrentEditor())); connect(this, SIGNAL(textChanged()), this, SLOT(updateDocument())); @@ -808,6 +808,9 @@ void QmlJSTextEditorWidget::onDocumentUpdated(QmlJS::Document::Ptr doc) { if (file()->fileName() != doc->fileName() || doc->editorRevision() != document()->revision()) { + // maybe a dependency changed: schedule a potential rehighlight + // will not rehighlight if the current editor changes away from this file + m_semanticRehighlightTimer->start(); return; } -- cgit v1.2.3 From 1a5df408836875a7f867411145a377d9a7bc9b16 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 6 Jun 2011 13:25:52 +0200 Subject: debugger: allow "Attach to Core" on Windows Patch by Orgad Shaneh Task-number: QTCREATORBUG-3813 Change-Id: I7ff88946981ef210bb53e20d7e462055199a30e2x Reviewed-on: http://codereview.qt.nokia.com/388 Reviewed-by: Qt Sanity Bot Reviewed-by: hjk --- src/plugins/debugger/debuggerplugin.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index a7044a4ac98..069a1dd6c46 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1896,11 +1896,7 @@ void DebuggerPluginPrivate::setInitialState() m_startExternalAction->setEnabled(true); m_attachExternalAction->setEnabled(true); -#ifdef Q_OS_WIN - m_attachCoreAction->setEnabled(false); -#else m_attachCoreAction->setEnabled(true); -#endif m_startRemoteAction->setEnabled(true); m_detachAction->setEnabled(false); -- cgit v1.2.3 From 87c515d1a39a886b75fb5a4a0263449b152e830f Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 17 May 2011 16:47:10 +0200 Subject: debugger: show something when editing (cherry picked from commit 752066d0431566447220958945bebd9ba81bed66) Change-Id: If24dfee05b8039b1f091e8f88e8d59155f2bd7dx Reviewed-on: http://codereview.qt.nokia.com/389 Reviewed-by: hjk --- src/plugins/debugger/watchhandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins') diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index ea135f2216f..996cee7ccfb 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -441,7 +441,7 @@ static inline QVariant editValue(const WatchData &d) break; } // Replace newlines, which will cause line edit troubles. - QString stringValue; + QString stringValue = d.value; stringValue.replace(QLatin1String("\n"), QLatin1String("\\n")); return QVariant(stringValue); } -- cgit v1.2.3 From a3137a031aabe376624823083c2d2667e02cd8c0 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 12 May 2011 13:25:03 +0200 Subject: add some mimetype for geometry shaders This gives at least some syntax highlighting. (cherry picked from commit 04c5425de2292c9da66c7c1dd2ae0c646528ca07) Change-Id: I04c5425de2292c9da66c7c1dd2ae0c646528ca07x Reviewed-on: http://codereview.qt.nokia.com/390 Reviewed-by: Qt Sanity Bot Reviewed-by: hjk --- src/plugins/glsleditor/GLSLEditor.mimetypes.xml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/plugins') diff --git a/src/plugins/glsleditor/GLSLEditor.mimetypes.xml b/src/plugins/glsleditor/GLSLEditor.mimetypes.xml index 9d2eb6c7db3..8f4570980a4 100644 --- a/src/plugins/glsleditor/GLSLEditor.mimetypes.xml +++ b/src/plugins/glsleditor/GLSLEditor.mimetypes.xml @@ -33,4 +33,10 @@ + + + GLSL/ES Geometry Shader file + + + -- cgit v1.2.3 From 07c1609c0c58fb4c60c3a6ad2e34ed6010b6ff31 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 11 May 2011 14:41:38 +0200 Subject: cppeditor: fix crash on uninitialized pointer Reviewed-by: Erik Verbruggen (cherry picked from commit 769b21b49d4072e426ac82271ba7797461ef86d3) Change-Id: I769b21b49d4072e426ac82271ba7797461ef86d3x Reviewed-on: http://codereview.qt.nokia.com/391 Reviewed-by: Qt Sanity Bot Reviewed-by: hjk --- src/plugins/cppeditor/cppquickfixes.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins') diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 85ebca29bf0..2bafa42d795 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -138,7 +138,7 @@ private: public: Operation(const CppQuickFixState &state, int priority, BinaryExpressionAST *binary, Kind invertToken) : CppQuickFixOperation(state, priority) - , binary(binary) + , binary(binary), nested(0), negation(0) { Token tok; tok.f.kind = invertToken; -- cgit v1.2.3 From 2cf06b8285152e59f80a55bc99ce3fbe93f494c5 Mon Sep 17 00:00:00 2001 From: Leandro Melo Date: Tue, 31 May 2011 15:49:14 +0200 Subject: CMake editor: Use keywords scheme for functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Link color from inkpot still needs to be changed. This will be done in a following commit. Task-number: QTCREATORBUG-5037 Change-Id: Ia8a5203067761ff6622258fd16f2027667637583x Reviewed-on: http://codereview.qt.nokia.com/273 Reviewed-by: Thorbjørn Lindeijer (cherry picked from commit a3daedc7b70a9e4f4db1db38add119741179dbed) Reviewed-on: http://codereview.qt.nokia.com/392 Reviewed-by: Qt Sanity Bot Reviewed-by: hjk --- src/plugins/cmakeprojectmanager/cmakeeditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins') diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp index 67beed67234..570bfb84ef3 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp @@ -110,7 +110,7 @@ void CMakeEditorWidget::setFontSettings(const TextEditor::FontSettings &fs) static QVector categories; if (categories.isEmpty()) { categories << QLatin1String(TextEditor::Constants::C_LABEL) // variables - << QLatin1String(TextEditor::Constants::C_LINK) // functions + << QLatin1String(TextEditor::Constants::C_KEYWORD) // functions << QLatin1String(TextEditor::Constants::C_COMMENT) << QLatin1String(TextEditor::Constants::C_STRING) << QLatin1String(TextEditor::Constants::C_VISUAL_WHITESPACE); -- cgit v1.2.3 From 3f44219a9ba2d0ef94ebb767eebb7c43a9bdf67f Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 8 Jun 2011 14:57:40 +0200 Subject: AbstractMobileAppWizard: Allow subclasses to control the flow of pages The Symbian components wizard would like to hide e.g. the Orientation page. Re-implementing nextId() will allow to do so. Change-Id: Id748d88bbc28b93aba4ffe8fccebf540d0946686x Reviewed-on: http://codereview.qt.nokia.com/395 Reviewed-by: Qt Sanity Bot Reviewed-by: hjk --- src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h index 276f05a3fe0..dfd67fe9e2b 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h @@ -65,10 +65,9 @@ protected: virtual void initializePage(int id); virtual void cleanupPage(int id); -private: - virtual int nextId() const; +private: int idOfNextGenericPage() const; Utils::WizardProgressItem *itemOfNextGenericPage() const; -- cgit v1.2.3 From 462278b0710316819372571fbcf40c62088302d4 Mon Sep 17 00:00:00 2001 From: Tommi Asp Date: Wed, 4 May 2011 16:37:56 +0300 Subject: Custom targets can set QtVersion to support id and set abis QtVersion targetIds and abis set are forced updateAbiAndMkspec() wont reset them (cherry picked from commit 1c86ab05a73838e8127984f1cc0220d4de90eea5) Change-Id: I1c86ab05a73838e8127984f1cc0220d4de90eea5x Merge-request: 2193 Reviewed-on: http://codereview.qt.nokia.com/396 Reviewed-by: Qt Sanity Bot Reviewed-by: hjk --- src/plugins/qt4projectmanager/qtversionmanager.cpp | 18 ++++++++++++++++++ src/plugins/qt4projectmanager/qtversionmanager.h | 5 +++++ 2 files changed, 23 insertions(+) (limited to 'src/plugins') diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 6bfb61d952f..e92d92d22e8 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -1413,21 +1413,39 @@ QString QtVersion::systemRoot() const bool QtVersion::supportsTargetId(const QString &id) const { updateAbiAndMkspec(); + if (!m_forcedTargetIds.isEmpty()) + return m_forcedTargetIds.contains(id); return m_targetIds.contains(id); } QSet QtVersion::supportedTargetIds() const { updateAbiAndMkspec(); + if (!m_forcedTargetIds.isEmpty()) + return m_forcedTargetIds; return m_targetIds; } QList QtVersion::qtAbis() const { updateAbiAndMkspec(); + if (!m_forcedAbis.isEmpty()) + return m_forcedAbis; return m_abis; } +void QtVersion::setForcedTargetIds(const QSet &ids) +{ + updateAbiAndMkspec(); + m_forcedTargetIds = ids; +} + +void QtVersion::setForcedQtAbis(const QList &abis) +{ + updateAbiAndMkspec(); + m_forcedAbis = abis; +} + // if none, then it's INVALID everywhere this function is called void QtVersion::updateAbiAndMkspec() const { diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h index 901b7cb9b67..f66f208b157 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.h +++ b/src/plugins/qt4projectmanager/qtversionmanager.h @@ -118,6 +118,9 @@ public: QList qtAbis() const; + void setForcedTargetIds(const QSet &ids); + void setForcedQtAbis(const QList &abis); + /// @returns the name of the mkspec, which is generally not enough /// to pass to qmake. QString mkspec() const; @@ -221,6 +224,7 @@ private: mutable QString m_mkspec; // updated lazily mutable QString m_mkspecFullPath; mutable QList m_abis; + mutable QList m_forcedAbis; mutable bool m_versionInfoUpToDate; mutable QHash m_versionInfo; // updated lazily @@ -238,6 +242,7 @@ private: mutable QString m_linguistCommand; mutable QString m_qmlviewerCommand; mutable QSet m_targetIds; + mutable QSet m_forcedTargetIds; mutable bool m_isBuildUsingSbsV2; mutable bool m_qmakeIsExecutable; -- cgit v1.2.3 From 66b415f90387e7edb13a9bc6a1bddd98780e19b5 Mon Sep 17 00:00:00 2001 From: Tommi Asp Date: Wed, 4 May 2011 16:38:58 +0300 Subject: Qt4ProjectManager exports for RemoteCompiler (cherry picked from commit 3112c23c702ee36ba1c25ccb526240ab7dda5b2e) Change-Id: I3112c23c702ee36ba1c25ccb526240ab7dda5b2ex Merge-request: 2193 Reviewed-on: http://codereview.qt.nokia.com/397 Reviewed-by: Qt Sanity Bot Reviewed-by: hjk --- src/plugins/qt4projectmanager/qt4buildconfiguration.h | 5 +++-- src/plugins/qt4projectmanager/qt4project.h | 3 ++- src/plugins/qt4projectmanager/qt4target.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h index fbe88d817c2..fd72d2ca3c2 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h @@ -33,6 +33,7 @@ #ifndef QT4BUILDCONFIGURATION_H #define QT4BUILDCONFIGURATION_H +#include "qt4projectmanager_global.h" #include "qtversionmanager.h" #include @@ -52,7 +53,7 @@ class Qt4ProFileNode; class Qt4BuildConfigurationFactory; } -class Qt4BuildConfiguration : public ProjectExplorer::BuildConfiguration +class QT4PROJECTMANAGER_EXPORT Qt4BuildConfiguration : public ProjectExplorer::BuildConfiguration { Q_OBJECT friend class Internal::Qt4BuildConfigurationFactory; @@ -168,7 +169,7 @@ private: }; namespace Internal { -class Qt4BuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory +class QT4PROJECTMANAGER_EXPORT Qt4BuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory { Q_OBJECT diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h index 1135005a155..70480677613 100644 --- a/src/plugins/qt4projectmanager/qt4project.h +++ b/src/plugins/qt4projectmanager/qt4project.h @@ -35,6 +35,7 @@ #include "qt4nodes.h" #include "qt4target.h" +#include "qt4projectmanager_global.h" #include #include @@ -130,7 +131,7 @@ private: } -class Qt4Project : public ProjectExplorer::Project +class QT4PROJECTMANAGER_EXPORT Qt4Project : public ProjectExplorer::Project { Q_OBJECT diff --git a/src/plugins/qt4projectmanager/qt4target.h b/src/plugins/qt4projectmanager/qt4target.h index 0ce9e20838c..97f75d2f34a 100644 --- a/src/plugins/qt4projectmanager/qt4target.h +++ b/src/plugins/qt4projectmanager/qt4target.h @@ -62,7 +62,7 @@ namespace Internal { class Qt4ProFileNode; } -class Qt4BaseTarget : public ProjectExplorer::Target +class QT4PROJECTMANAGER_EXPORT Qt4BaseTarget : public ProjectExplorer::Target { Q_OBJECT public: -- cgit v1.2.3 From deae00a12e197943a69dd980c401b9cbdb3baba4 Mon Sep 17 00:00:00 2001 From: Tommi Asp Date: Wed, 4 May 2011 16:36:48 +0300 Subject: BuildstepConfigWidgets can be set expanded by default (cherry picked from commit 517aef8b8bc705b055b10ef0b7b0b234fd80b920) Change-Id: I517aef8b8bc705b055b10ef0b7b0b234fd80b920x Merge-request: 2193 Reviewed-on: http://codereview.qt.nokia.com/398 Reviewed-by: hjk --- src/plugins/projectexplorer/buildstep.h | 1 + src/plugins/projectexplorer/buildstepspage.cpp | 2 ++ 2 files changed, 3 insertions(+) (limited to 'src/plugins') diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index b2440c8cc74..ff8774af692 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -167,6 +167,7 @@ public: virtual void init() = 0; virtual QString summaryText() const = 0; virtual QString displayName() const = 0; + virtual bool showExpanded() const { return false; } signals: void updateSummary(); }; diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp index ccd04a68bc0..ece3f8ab318 100644 --- a/src/plugins/projectexplorer/buildstepspage.cpp +++ b/src/plugins/projectexplorer/buildstepspage.cpp @@ -159,6 +159,8 @@ void BuildStepListWidget::addBuildStepWidget(int pos, BuildStep *step) s.detailsWidget = new Utils::DetailsWidget(this); s.detailsWidget->setSummaryText(s.widget->summaryText()); s.detailsWidget->setWidget(s.widget); + if(s.widget->showExpanded()) + s.detailsWidget->setState(Utils::DetailsWidget::Expanded); // layout Utils::FadingPanel *toolWidget = new Utils::FadingPanel(s.detailsWidget); -- cgit v1.2.3 From a2c1ae8a584adb4042cf66e0536dca3dce01b51b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 27 Apr 2011 14:24:15 +0200 Subject: QmlDesigner.itemLibrary: adding plugin for extra components A new extra component plugin. (cherry picked from commit fbcbac5a65b26da281404f63885dff884afaba78) (cherry picked from commit 0e3f13e921f3812f8944a22375131b4e2fd87f87) Change-Id: Ifbcbac5a65b26da281404f63885dff884afaba78q Reviewed-on: http://codereview.qt.nokia.com/467 Reviewed-by: hjk --- .../qmldesigner/extrasplugin/extras.metainfo | 54 ++++++++++++++++++ .../qmldesigner/extrasplugin/extrasplugin.cpp | 58 +++++++++++++++++++ .../qmldesigner/extrasplugin/extrasplugin.h | 62 +++++++++++++++++++++ .../qmldesigner/extrasplugin/extrasplugin.pri | 17 ++++++ .../qmldesigner/extrasplugin/extrasplugin.pro | 4 ++ .../qmldesigner/extrasplugin/extrasplugin.qrc | 31 +++++++++++ .../extrasplugin/images/count-bubble-16.png | Bin 0 -> 3427 bytes .../extrasplugin/images/count-bubble-24.png | Bin 0 -> 985 bytes .../extrasplugin/images/date-picker-16.png | Bin 0 -> 3512 bytes .../extrasplugin/images/date-picker-24.png | Bin 0 -> 606 bytes .../extrasplugin/images/info-banner-16.png | Bin 0 -> 3105 bytes .../extrasplugin/images/info-banner-24.png | Bin 0 -> 323 bytes .../extrasplugin/images/list-button-16.png | Bin 0 -> 3217 bytes .../extrasplugin/images/list-button-24.png | Bin 0 -> 481 bytes .../extrasplugin/images/list-delegate-16.png | Bin 0 -> 3281 bytes .../extrasplugin/images/list-delegate-24.png | Bin 0 -> 425 bytes .../extrasplugin/images/more-indicator-16.png | Bin 0 -> 3333 bytes .../extrasplugin/images/more-indicator-24.png | Bin 0 -> 896 bytes .../extrasplugin/images/page-indicator-16.png | Bin 0 -> 3168 bytes .../extrasplugin/images/page-indicator-24.png | Bin 0 -> 579 bytes .../extrasplugin/images/rating-indicator-16.png | Bin 0 -> 3422 bytes .../extrasplugin/images/rating-indicator-24.png | Bin 0 -> 1144 bytes .../extrasplugin/images/time-picker-16.png | Bin 0 -> 3438 bytes .../extrasplugin/images/time-picker-24.png | Bin 0 -> 875 bytes .../qmldesigner/extrasplugin/images/tumbler-16.png | Bin 0 -> 3467 bytes .../qmldesigner/extrasplugin/images/tumbler-24.png | Bin 0 -> 836 bytes .../extrasplugin/images/tumbler-button-16.png | Bin 0 -> 3481 bytes .../extrasplugin/images/tumbler-button-24.png | Bin 0 -> 880 bytes .../extrasplugin/images/tumbler-column-16.png | Bin 0 -> 3493 bytes .../extrasplugin/images/tumbler-column-24.png | Bin 0 -> 991 bytes .../extrasplugin/images/tumbler-dialog-16.png | Bin 0 -> 3167 bytes .../extrasplugin/images/tumbler-dialog-24.png | Bin 0 -> 414 bytes .../qmldesigner/extrasplugin/plugindestdir.pri | 5 ++ src/plugins/qmldesigner/qmldesigner.pro | 2 +- 34 files changed, 232 insertions(+), 1 deletion(-) create mode 100644 src/plugins/qmldesigner/extrasplugin/extras.metainfo create mode 100644 src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp create mode 100644 src/plugins/qmldesigner/extrasplugin/extrasplugin.h create mode 100644 src/plugins/qmldesigner/extrasplugin/extrasplugin.pri create mode 100644 src/plugins/qmldesigner/extrasplugin/extrasplugin.pro create mode 100644 src/plugins/qmldesigner/extrasplugin/extrasplugin.qrc create mode 100644 src/plugins/qmldesigner/extrasplugin/images/count-bubble-16.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/count-bubble-24.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/date-picker-16.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/date-picker-24.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/info-banner-16.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/info-banner-24.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/list-button-16.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/list-button-24.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/list-delegate-16.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/list-delegate-24.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/more-indicator-16.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/more-indicator-24.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/page-indicator-16.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/page-indicator-24.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/rating-indicator-16.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/rating-indicator-24.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/time-picker-16.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/time-picker-24.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/tumbler-16.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/tumbler-24.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/tumbler-button-16.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/tumbler-button-24.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/tumbler-column-16.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/tumbler-column-24.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-16.png create mode 100644 src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-24.png create mode 100644 src/plugins/qmldesigner/extrasplugin/plugindestdir.pri (limited to 'src/plugins') diff --git a/src/plugins/qmldesigner/extrasplugin/extras.metainfo b/src/plugins/qmldesigner/extrasplugin/extras.metainfo new file mode 100644 index 00000000000..d074cefe05b --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extras.metainfo @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp b/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp new file mode 100644 index 00000000000..f4fd844abbc --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp @@ -0,0 +1,58 @@ +/************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** No Commercial Usage +** +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + +#include "extrasplugin.h" +#include +#include + +namespace QmlDesigner { + + +ExtrasPlugin::ExtrasPlugin() +{ +} + +QString ExtrasPlugin::pluginName() +{ + return ("ExtrasPlugin"); +} + +QString ExtrasPlugin::metaInfo() +{ + return QString(":/extrasplugin/extras.metainfo"); +} + +} + +Q_EXPORT_PLUGIN(QmlDesigner::ExtrasPlugin) + diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.h b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h new file mode 100644 index 00000000000..db069308bc1 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h @@ -0,0 +1,62 @@ +/************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** No Commercial Usage +** +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + +#ifndef EXTRASPLUGIN_H +#define EXTRASPLUGIN_H + +#include +#include + +QT_BEGIN_NAMESPACE +QT_END_NAMESPACE + +namespace QmlDesigner { + +class ExtrasPlugin : public QObject, QmlDesigner::IWidgetPlugin +{ + Q_OBJECT + Q_DISABLE_COPY(ExtrasPlugin) + Q_INTERFACES(QmlDesigner::IWidgetPlugin) +public: + ExtrasPlugin(); + ~ExtrasPlugin() {} + + QString metaInfo(); + QString pluginName(); + +}; + +} // namespace QmlDesigner + + +#endif // EXTRASPLUGIN_H diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri new file mode 100644 index 00000000000..12f923cb1e5 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri @@ -0,0 +1,17 @@ +TARGET = extrasplugin +TEMPLATE = lib +CONFIG += plugin + +QT += script \ + declarative + +include (../designercore/iwidgetplugin.pri) + +DEFINES += SYMBIAN_LIBRARY +SOURCES += $$PWD/extrasplugin.cpp + +HEADERS += $$PWD/extrasplugin.h $$PWD/../designercore/include/iwidgetplugin.h + +RESOURCES += $$PWD/extrasplugin.qrc + +OTHER_FILES += $$PWD/extras.metainfo diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pro b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pro new file mode 100644 index 00000000000..8fffeb67761 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pro @@ -0,0 +1,4 @@ +include(../../../../qtcreator.pri) +include(../../../private_headers.pri) +include(extrasplugin.pri) +include(plugindestdir.pri) diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.qrc b/src/plugins/qmldesigner/extrasplugin/extrasplugin.qrc new file mode 100644 index 00000000000..ae97ba05e9d --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.qrc @@ -0,0 +1,31 @@ + + + extras.metainfo + images/count-bubble-16.png + images/count-bubble-24.png + images/date-picker-16.png + images/date-picker-24.png + images/info-banner-16.png + images/info-banner-24.png + images/list-button-16.png + images/list-button-24.png + images/list-delegate-16.png + images/list-delegate-24.png + images/more-indicator-16.png + images/more-indicator-24.png + images/page-indicator-16.png + images/page-indicator-24.png + images/rating-indicator-16.png + images/rating-indicator-24.png + images/time-picker-16.png + images/time-picker-24.png + images/tumbler-16.png + images/tumbler-24.png + images/tumbler-button-16.png + images/tumbler-button-24.png + images/tumbler-column-16.png + images/tumbler-column-24.png + images/tumbler-dialog-16.png + images/tumbler-dialog-24.png + + diff --git a/src/plugins/qmldesigner/extrasplugin/images/count-bubble-16.png b/src/plugins/qmldesigner/extrasplugin/images/count-bubble-16.png new file mode 100644 index 00000000000..2ac1430602d Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/count-bubble-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/count-bubble-24.png b/src/plugins/qmldesigner/extrasplugin/images/count-bubble-24.png new file mode 100644 index 00000000000..ba444822d51 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/count-bubble-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/date-picker-16.png b/src/plugins/qmldesigner/extrasplugin/images/date-picker-16.png new file mode 100644 index 00000000000..b8eb95b737a Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/date-picker-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/date-picker-24.png b/src/plugins/qmldesigner/extrasplugin/images/date-picker-24.png new file mode 100644 index 00000000000..a8ee7e08473 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/date-picker-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/info-banner-16.png b/src/plugins/qmldesigner/extrasplugin/images/info-banner-16.png new file mode 100644 index 00000000000..379413808bc Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/info-banner-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/info-banner-24.png b/src/plugins/qmldesigner/extrasplugin/images/info-banner-24.png new file mode 100644 index 00000000000..bf8aa614d0a Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/info-banner-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/list-button-16.png b/src/plugins/qmldesigner/extrasplugin/images/list-button-16.png new file mode 100644 index 00000000000..2b1ce900b82 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/list-button-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/list-button-24.png b/src/plugins/qmldesigner/extrasplugin/images/list-button-24.png new file mode 100644 index 00000000000..d432090f9ca Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/list-button-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/list-delegate-16.png b/src/plugins/qmldesigner/extrasplugin/images/list-delegate-16.png new file mode 100644 index 00000000000..3c97433f087 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/list-delegate-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/list-delegate-24.png b/src/plugins/qmldesigner/extrasplugin/images/list-delegate-24.png new file mode 100644 index 00000000000..c4d98869206 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/list-delegate-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/more-indicator-16.png b/src/plugins/qmldesigner/extrasplugin/images/more-indicator-16.png new file mode 100644 index 00000000000..81eff7306c9 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/more-indicator-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/more-indicator-24.png b/src/plugins/qmldesigner/extrasplugin/images/more-indicator-24.png new file mode 100644 index 00000000000..f5d8dedbfba Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/more-indicator-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/page-indicator-16.png b/src/plugins/qmldesigner/extrasplugin/images/page-indicator-16.png new file mode 100644 index 00000000000..29a89337514 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/page-indicator-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/page-indicator-24.png b/src/plugins/qmldesigner/extrasplugin/images/page-indicator-24.png new file mode 100644 index 00000000000..60dda334fc5 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/page-indicator-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-16.png b/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-16.png new file mode 100644 index 00000000000..2df5418a848 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-24.png b/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-24.png new file mode 100644 index 00000000000..393b2ffa695 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/time-picker-16.png b/src/plugins/qmldesigner/extrasplugin/images/time-picker-16.png new file mode 100644 index 00000000000..1ee49cafbd5 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/time-picker-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/time-picker-24.png b/src/plugins/qmldesigner/extrasplugin/images/time-picker-24.png new file mode 100644 index 00000000000..979981bd318 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/time-picker-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-16.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-16.png new file mode 100644 index 00000000000..afcf864744d Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-24.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-24.png new file mode 100644 index 00000000000..43783e6ee23 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-16.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-16.png new file mode 100644 index 00000000000..4368493c3e7 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-24.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-24.png new file mode 100644 index 00000000000..6b0b71a65af Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-16.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-16.png new file mode 100644 index 00000000000..36e2d27608e Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-24.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-24.png new file mode 100644 index 00000000000..8a043798f1c Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-16.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-16.png new file mode 100644 index 00000000000..5a105a76db9 Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-16.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-24.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-24.png new file mode 100644 index 00000000000..a6bbc2d795e Binary files /dev/null and b/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-24.png differ diff --git a/src/plugins/qmldesigner/extrasplugin/plugindestdir.pri b/src/plugins/qmldesigner/extrasplugin/plugindestdir.pri new file mode 100644 index 00000000000..24f0c19b72b --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/plugindestdir.pri @@ -0,0 +1,5 @@ +macx { + DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner +} else { + DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner +} diff --git a/src/plugins/qmldesigner/qmldesigner.pro b/src/plugins/qmldesigner/qmldesigner.pro index 1c1a3735f31..bab7341b1f4 100644 --- a/src/plugins/qmldesigner/qmldesigner.pro +++ b/src/plugins/qmldesigner/qmldesigner.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = qmldesignerplugin.pro qtquickplugin symbianplugin meegoplugin +SUBDIRS = qmldesignerplugin.pro qtquickplugin symbianplugin meegoplugin extrasplugin -- cgit v1.2.3 From b3ef50aeabd8cb62c2ec5f0d283626ef51a24096 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 14 Jun 2011 10:33:23 +0200 Subject: rename ChoiceList into SelectionListItem Reviewed-by: Thomas Hartmann Change-Id: I4116e63da6633bebb21ba08084e2d8edde4aaaaax Reviewed-on: http://codereview.qt.nokia.com/468 Reviewed-by: Qt Sanity Bot Reviewed-by: hjk --- src/plugins/qmldesigner/symbianplugin/symbian.metainfo | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/qmldesigner/symbianplugin/symbian.metainfo b/src/plugins/qmldesigner/symbianplugin/symbian.metainfo index d6e73f27621..71758913c14 100644 --- a/src/plugins/qmldesigner/symbianplugin/symbian.metainfo +++ b/src/plugins/qmldesigner/symbianplugin/symbian.metainfo @@ -33,11 +33,11 @@ - - - - - + + + + + @@ -115,4 +115,4 @@ - \ No newline at end of file + -- cgit v1.2.3 From 0beb721fc882741f2b5e42dfae5cab09d4c6b2a8 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 14 Jun 2011 12:26:08 +0200 Subject: QmlDesigner.nodeInstances: fix for incompatible Qt Version If the Qt Version is incomaptible (e. g. mingw) we have to use the qml file for a component shipped with Creator. Otherwise a import "." statement will break the component. Change-Id: I7e354a15205567407533579f92e65f2be73a614ex Reviewed-on: http://codereview.qt.nokia.com/474 Reviewed-by: Qt Sanity Bot Reviewed-by: hjk --- .../designercore/instances/objectnodeinstance.cpp | 24 +++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'src/plugins') diff --git a/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp index f36261027b0..6f1e9098be6 100644 --- a/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp +++ b/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp @@ -60,6 +60,7 @@ #include #include +#include #include #include @@ -736,10 +737,31 @@ void tweakObjects(QObject *object) } +//The component might also be shipped with Creator. +//To avoid trouble with import "." we use the component shipped with Creator. +static inline QString fixComponentPathForIncompatibleQt(const QString &componentPath) +{ + QString result = componentPath; + const QLatin1String importString("import"); + + if (componentPath.contains(importString)) { + int index = componentPath.indexOf(importString) + 7; + const QString relativeImportPath = componentPath.right(componentPath.length() - index); + QString fixedComponentPath = QLibraryInfo::location(QLibraryInfo::ImportsPath) + relativeImportPath; + fixedComponentPath.replace(QLatin1Char('\\'), QLatin1Char('/')); + if (QFileInfo(fixedComponentPath).exists()) + return fixedComponentPath; + } + + return result; + +} + QObject *createComponent(const QString &componentPath, QDeclarativeContext *context) { - QDeclarativeComponent component(context->engine(), QUrl::fromLocalFile(componentPath)); + QDeclarativeComponent component(context->engine(), QUrl::fromLocalFile(fixComponentPathForIncompatibleQt(componentPath))); QObject *object = component.beginCreate(context); + tweakObjects(object); component.completeCreate(); -- cgit v1.2.3 From 8766b88de6da7926c4106fcc5222f48cf5db6a86 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 22 Jun 2011 12:18:19 +0200 Subject: Revert "Custom targets can set QtVersion to support id and set abis" This reverts commit 462278b0710316819372571fbcf40c62088302d4 for master. --- src/plugins/qt4projectmanager/qtversionmanager.cpp | 18 ------------------ src/plugins/qt4projectmanager/qtversionmanager.h | 5 ----- 2 files changed, 23 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index e92d92d22e8..6bfb61d952f 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -1413,39 +1413,21 @@ QString QtVersion::systemRoot() const bool QtVersion::supportsTargetId(const QString &id) const { updateAbiAndMkspec(); - if (!m_forcedTargetIds.isEmpty()) - return m_forcedTargetIds.contains(id); return m_targetIds.contains(id); } QSet QtVersion::supportedTargetIds() const { updateAbiAndMkspec(); - if (!m_forcedTargetIds.isEmpty()) - return m_forcedTargetIds; return m_targetIds; } QList QtVersion::qtAbis() const { updateAbiAndMkspec(); - if (!m_forcedAbis.isEmpty()) - return m_forcedAbis; return m_abis; } -void QtVersion::setForcedTargetIds(const QSet &ids) -{ - updateAbiAndMkspec(); - m_forcedTargetIds = ids; -} - -void QtVersion::setForcedQtAbis(const QList &abis) -{ - updateAbiAndMkspec(); - m_forcedAbis = abis; -} - // if none, then it's INVALID everywhere this function is called void QtVersion::updateAbiAndMkspec() const { diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h index f66f208b157..901b7cb9b67 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.h +++ b/src/plugins/qt4projectmanager/qtversionmanager.h @@ -118,9 +118,6 @@ public: QList qtAbis() const; - void setForcedTargetIds(const QSet &ids); - void setForcedQtAbis(const QList &abis); - /// @returns the name of the mkspec, which is generally not enough /// to pass to qmake. QString mkspec() const; @@ -224,7 +221,6 @@ private: mutable QString m_mkspec; // updated lazily mutable QString m_mkspecFullPath; mutable QList m_abis; - mutable QList m_forcedAbis; mutable bool m_versionInfoUpToDate; mutable QHash m_versionInfo; // updated lazily @@ -242,7 +238,6 @@ private: mutable QString m_linguistCommand; mutable QString m_qmlviewerCommand; mutable QSet m_targetIds; - mutable QSet m_forcedTargetIds; mutable bool m_isBuildUsingSbsV2; mutable bool m_qmakeIsExecutable; -- cgit v1.2.3 From 5fd1341be0ba362f378fdd593902fe2a5adb8e6f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 22 Jun 2011 12:18:55 +0200 Subject: Revert "Qt4ProjectManager exports for RemoteCompiler" This reverts commit 66b415f90387e7edb13a9bc6a1bddd98780e19b5 for master. --- src/plugins/qt4projectmanager/qt4buildconfiguration.h | 5 ++--- src/plugins/qt4projectmanager/qt4project.h | 3 +-- src/plugins/qt4projectmanager/qt4target.h | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h index fd72d2ca3c2..fbe88d817c2 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h @@ -33,7 +33,6 @@ #ifndef QT4BUILDCONFIGURATION_H #define QT4BUILDCONFIGURATION_H -#include "qt4projectmanager_global.h" #include "qtversionmanager.h" #include @@ -53,7 +52,7 @@ class Qt4ProFileNode; class Qt4BuildConfigurationFactory; } -class QT4PROJECTMANAGER_EXPORT Qt4BuildConfiguration : public ProjectExplorer::BuildConfiguration +class Qt4BuildConfiguration : public ProjectExplorer::BuildConfiguration { Q_OBJECT friend class Internal::Qt4BuildConfigurationFactory; @@ -169,7 +168,7 @@ private: }; namespace Internal { -class QT4PROJECTMANAGER_EXPORT Qt4BuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory +class Qt4BuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory { Q_OBJECT diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h index 70480677613..1135005a155 100644 --- a/src/plugins/qt4projectmanager/qt4project.h +++ b/src/plugins/qt4projectmanager/qt4project.h @@ -35,7 +35,6 @@ #include "qt4nodes.h" #include "qt4target.h" -#include "qt4projectmanager_global.h" #include #include @@ -131,7 +130,7 @@ private: } -class QT4PROJECTMANAGER_EXPORT Qt4Project : public ProjectExplorer::Project +class Qt4Project : public ProjectExplorer::Project { Q_OBJECT diff --git a/src/plugins/qt4projectmanager/qt4target.h b/src/plugins/qt4projectmanager/qt4target.h index 97f75d2f34a..0ce9e20838c 100644 --- a/src/plugins/qt4projectmanager/qt4target.h +++ b/src/plugins/qt4projectmanager/qt4target.h @@ -62,7 +62,7 @@ namespace Internal { class Qt4ProFileNode; } -class QT4PROJECTMANAGER_EXPORT Qt4BaseTarget : public ProjectExplorer::Target +class Qt4BaseTarget : public ProjectExplorer::Target { Q_OBJECT public: -- cgit v1.2.3 From 568985ab0325ae1db633ecf3ca40b9ba6929313a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 22 Jun 2011 12:19:11 +0200 Subject: Revert "BuildstepConfigWidgets can be set expanded by default" This reverts commit deae00a12e197943a69dd980c401b9cbdb3baba4 for master. --- src/plugins/projectexplorer/buildstep.h | 1 - src/plugins/projectexplorer/buildstepspage.cpp | 2 -- 2 files changed, 3 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index ff8774af692..b2440c8cc74 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -167,7 +167,6 @@ public: virtual void init() = 0; virtual QString summaryText() const = 0; virtual QString displayName() const = 0; - virtual bool showExpanded() const { return false; } signals: void updateSummary(); }; diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp index ece3f8ab318..ccd04a68bc0 100644 --- a/src/plugins/projectexplorer/buildstepspage.cpp +++ b/src/plugins/projectexplorer/buildstepspage.cpp @@ -159,8 +159,6 @@ void BuildStepListWidget::addBuildStepWidget(int pos, BuildStep *step) s.detailsWidget = new Utils::DetailsWidget(this); s.detailsWidget->setSummaryText(s.widget->summaryText()); s.detailsWidget->setWidget(s.widget); - if(s.widget->showExpanded()) - s.detailsWidget->setState(Utils::DetailsWidget::Expanded); // layout Utils::FadingPanel *toolWidget = new Utils::FadingPanel(s.detailsWidget); -- cgit v1.2.3