diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp index 01f5b6371d640b37c97e6ae9844a6c0046151d7f..69557b1b3c7a8dd2bdb0366ea0977c361a7d27b3 100644 --- a/src/libs/utils/stylehelper.cpp +++ b/src/libs/utils/stylehelper.cpp @@ -126,16 +126,6 @@ void StyleHelper::setBaseColor(const QColor &color) } } -static QColor mergedColors(const QColor &colorA, const QColor &colorB, int factor = 50) -{ - const int maxFactor = 100; - QColor tmp = colorA; - tmp.setRed((tmp.red() * factor) / maxFactor + (colorB.red() * (maxFactor - factor)) / maxFactor); - tmp.setGreen((tmp.green() * factor) / maxFactor + (colorB.green() * (maxFactor - factor)) / maxFactor); - tmp.setBlue((tmp.blue() * factor) / maxFactor + (colorB.blue() * (maxFactor - factor)) / maxFactor); - return tmp; -} - void StyleHelper::verticalGradient(QPainter *painter, const QRect &spanRect, const QRect &clipRect) { QString key; diff --git a/src/plugins/cvs/checkoutwizard.h b/src/plugins/cvs/checkoutwizard.h index a35eda2c25c418e0b5542eb42981c0dcef2e537e..ca380d1126c7b84486f31cf757987a7f216c43ef 100644 --- a/src/plugins/cvs/checkoutwizard.h +++ b/src/plugins/cvs/checkoutwizard.h @@ -37,6 +37,7 @@ namespace Internal { class CheckoutWizard : public VCSBase::BaseCheckoutWizard { + Q_OBJECT public: explicit CheckoutWizard(QObject *parent = 0); diff --git a/src/plugins/debugger/dumperoptionpage.ui b/src/plugins/debugger/dumperoptionpage.ui index d85f98c370766d46d7ae2784c311c4458b460f4b..ddba465b5fa8a1c805d6cc9fe350737f6a70979a 100644 --- a/src/plugins/debugger/dumperoptionpage.ui +++ b/src/plugins/debugger/dumperoptionpage.ui @@ -98,10 +98,6 @@ </widget> </item> </layout> - <zorder></zorder> - <zorder>checkBoxDebugDebuggingHelpers</zorder> - <zorder>checkBoxUseDebuggingHelpers</zorder> - <zorder></zorder> </widget> </item> <item> diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index 7f3ead4738280276d1cec78c945d05d8d41b3081..68eda119dcd4fdbe4e96e05860fe62d29c18b4c1 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -356,6 +356,7 @@ void GenericProject::setToolChainId(const QString &toolChainId) QString GenericProject::buildParser(const QString &buildConfiguration) const { + Q_UNUSED(buildConfiguration) if (m_toolChain) { switch (m_toolChain->type()) { case ProjectExplorer::ToolChain::GCC: @@ -448,6 +449,7 @@ GenericProjectNode *GenericProject::rootProjectNode() const QStringList GenericProject::files(FilesMode fileMode) const { + Q_UNUSED(fileMode) return m_files; // ### TODO: handle generated files here. } diff --git a/src/plugins/git/clonewizard.h b/src/plugins/git/clonewizard.h index 241be32d75ab723effb18695f2f255dbd0752dd5..d3f7cd0ded2bf2f28204ad5fa32daa0564bdd646 100644 --- a/src/plugins/git/clonewizard.h +++ b/src/plugins/git/clonewizard.h @@ -37,6 +37,7 @@ namespace Internal { class CloneWizard : public VCSBase::BaseCheckoutWizard { + Q_OBJECT public: explicit CloneWizard(QObject *parent = 0); diff --git a/src/plugins/git/gitorious/gitoriousclonewizard.h b/src/plugins/git/gitorious/gitoriousclonewizard.h index 0004463b965d34d985c820dc822cd55ff6123de8..362f6fd914c73f83f154e1d6dda358d529a2ce0e 100644 --- a/src/plugins/git/gitorious/gitoriousclonewizard.h +++ b/src/plugins/git/gitorious/gitoriousclonewizard.h @@ -39,6 +39,7 @@ namespace Internal { // Gitorious-hosted projects. class GitoriousCloneWizard : public VCSBase::BaseCheckoutWizard { + Q_OBJECT public: explicit GitoriousCloneWizard(QObject *parent = 0); diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h b/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h index 2534f7ae0ca19edd6a60adb14f7db98534bc9d2f..77e8b177371ee9e3730e44ec5b64227f756a9650 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepage.h @@ -39,6 +39,7 @@ class GettingStartedWelcomePageWidget; class GettingStartedWelcomePage : public ExtensionSystem::IWelcomePage { + Q_OBJECT public: GettingStartedWelcomePage(); diff --git a/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp b/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp index 40100dd116b2e0acdaa532c1250257f44bcd713f..3bd0071993478ea6b45c9100b22d510ebaf986ce 100644 --- a/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp +++ b/src/plugins/qtscripteditor/qtscriptcodecompletion.cpp @@ -27,6 +27,8 @@ bool QtScriptCodeCompletion::supportsEditor(TextEditor::ITextEditable *editor) #if 0 // ### disable JS Completion. It's pretty buggy and it can crash Creator. if (qobject_cast<ScriptEditor *>(editor->widget())) return true; +#else + Q_UNUSED(editor) #endif return false; diff --git a/src/plugins/subversion/checkoutwizard.h b/src/plugins/subversion/checkoutwizard.h index 6b651c878882023eadaaa9c070446b1709d61f7e..2f2f0a22d4d4f4502adcb6f1e7aa6b6e1a02111b 100644 --- a/src/plugins/subversion/checkoutwizard.h +++ b/src/plugins/subversion/checkoutwizard.h @@ -37,6 +37,7 @@ namespace Internal { class CheckoutWizard : public VCSBase::BaseCheckoutWizard { + Q_OBJECT public: explicit CheckoutWizard(QObject *parent = 0); diff --git a/src/plugins/welcome/communitywelcomepagewidget.cpp b/src/plugins/welcome/communitywelcomepagewidget.cpp index 40c72fed57f3455e47ff4bb8b3eb74cff1f0fb32..e4e713cd193d0408bdc1b58b73f92c9b7d7222fc 100644 --- a/src/plugins/welcome/communitywelcomepagewidget.cpp +++ b/src/plugins/welcome/communitywelcomepagewidget.cpp @@ -39,8 +39,8 @@ namespace Internal { CommunityWelcomePageWidget::CommunityWelcomePageWidget(QWidget *parent) : QWidget(parent), - ui(new Ui::CommunityWelcomePageWidget), - m_rssFetcher(new RSSFetcher(7)) + m_rssFetcher(new RSSFetcher(7)), + ui(new Ui::CommunityWelcomePageWidget) { ui->setupUi(this); ui->labsTitleLabel->setStyledText(tr("News From the Qt Labs")); diff --git a/src/shared/qscripthighlighter/qscripthighlighter.cpp b/src/shared/qscripthighlighter/qscripthighlighter.cpp index 8d8c0c0548e7a5f15f7556f7b1ec8305a5d22316..0f94c1061fe39998ca10f8a04cde07485bddede9 100644 --- a/src/shared/qscripthighlighter/qscripthighlighter.cpp +++ b/src/shared/qscripthighlighter/qscripthighlighter.cpp @@ -454,7 +454,7 @@ void QScriptHighlighter::highlightKeyword(int currentPos, const QString &buffer) if (buffer.isEmpty()) return; - if (m_duiEnabled && buffer.at(0).isUpper() || (! m_duiEnabled && buffer.at(0) == QLatin1Char('Q'))) { + if ((m_duiEnabled && buffer.at(0).isUpper()) || (! m_duiEnabled && buffer.at(0) == QLatin1Char('Q'))) { setFormat(currentPos - buffer.length(), buffer.length(), m_formats[TypeFormat]); } else { if (qscriptKeywords.contains(buffer))