diff options
| -rw-r--r-- | doc/images/qtcreator-cmakeexecutable.png | bin | 9854 -> 28996 bytes | |||
| -rw-r--r-- | doc/images/qtcreator-options-build-run-debuggers.png | bin | 26339 -> 91581 bytes | |||
| -rw-r--r-- | doc/images/qtcreator-options-qbs.png | bin | 37688 -> 43851 bytes | |||
| -rw-r--r-- | doc/images/qtcreator-qt4-qtversions-add.png | bin | 16129 -> 42241 bytes | |||
| -rw-r--r-- | doc/images/qtcreator-toolchains.png | bin | 13634 -> 38070 bytes | |||
| -rw-r--r-- | doc/src/cmake/creator-projects-cmake.qdoc | 7 | ||||
| -rw-r--r-- | doc/src/howto/qtcreator-faq.qdoc | 151 | ||||
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsprojectmanager.cpp | 5 | ||||
| m--------- | src/shared/qbs | 0 |
10 files changed, 93 insertions, 72 deletions
diff --git a/doc/images/qtcreator-cmakeexecutable.png b/doc/images/qtcreator-cmakeexecutable.png Binary files differindex d7d1b7fd85..8b328b0fb9 100644 --- a/doc/images/qtcreator-cmakeexecutable.png +++ b/doc/images/qtcreator-cmakeexecutable.png diff --git a/doc/images/qtcreator-options-build-run-debuggers.png b/doc/images/qtcreator-options-build-run-debuggers.png Binary files differindex 6520f53768..b249ddbbee 100644 --- a/doc/images/qtcreator-options-build-run-debuggers.png +++ b/doc/images/qtcreator-options-build-run-debuggers.png diff --git a/doc/images/qtcreator-options-qbs.png b/doc/images/qtcreator-options-qbs.png Binary files differindex 40149a37e0..6641902f1c 100644 --- a/doc/images/qtcreator-options-qbs.png +++ b/doc/images/qtcreator-options-qbs.png diff --git a/doc/images/qtcreator-qt4-qtversions-add.png b/doc/images/qtcreator-qt4-qtversions-add.png Binary files differindex 3b35920b2e..6b292a697d 100644 --- a/doc/images/qtcreator-qt4-qtversions-add.png +++ b/doc/images/qtcreator-qt4-qtversions-add.png diff --git a/doc/images/qtcreator-toolchains.png b/doc/images/qtcreator-toolchains.png Binary files differindex 0b573f034a..91a6dbc7d7 100644 --- a/doc/images/qtcreator-toolchains.png +++ b/doc/images/qtcreator-toolchains.png diff --git a/doc/src/cmake/creator-projects-cmake.qdoc b/doc/src/cmake/creator-projects-cmake.qdoc index 85b28cb095..2a590df8c3 100644 --- a/doc/src/cmake/creator-projects-cmake.qdoc +++ b/doc/src/cmake/creator-projects-cmake.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -72,6 +72,9 @@ \li In the \uicontrol Path field, specify the path to the CMake executable. + \li Select the \uicontrol {Auto-create build directories} check box to + automatically create build directories for CMake projects. + \li Select \uicontrol Apply to save your changes. \endlist @@ -83,7 +86,7 @@ is. Select the \uicontrol Kits tab to add the CMake tool to a build and run kit. - The kit also specifies the CMake Generator that is used for producing + The kit also specifies the CMake generator that is used for producing project files for \QC and the configuration variables that are used: \image qtcreator-kits.png diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/qtcreator-faq.qdoc index 6d04e7a8c3..3bd14807ad 100644 --- a/doc/src/howto/qtcreator-faq.qdoc +++ b/doc/src/howto/qtcreator-faq.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -39,72 +39,6 @@ \section1 General Questions - \b {\QC only shows a blank window, a dialog complaining about missing OpenGL support, or crashes on startup. What's going wrong?} - - Some parts of \QC use Qt Quick 2, which relies on OpenGL API for - drawing. The most prominent use of Qt Quick 2 is in the Welcome mode, but it's - also used for the \QMLD, and the QML Profiler. - - Unfortunately the use of OpenGL can cause problems, especially in remote setups - and with outdated drivers. You can quickly check whether this is your problem by: - - \list - - \li Launching \QC with Welcome mode disabled ( \c{-noload Welcome} on - command line). - - \li Checking the console or the Windows debugger log for OpenGL-related error messages. - - \endlist - - The fixes and workarounds differ, depending on your setup. As a last resort you - can disable the affected plugins. - - \e{Virtual Machines} - - Try to enable \e{3D acceleration} in your virtual machine's settings. For VirtualBox, - also make sure you have installed the Guest Addons, including experimental - \e{Direct3D support}. - - \e{Windows} - - Check whether \QC has been compiled with OpenGL/Desktop, or ANGLE as - a backend. The official binaries are always built with ANGLE (a library that - maps OpenGL ES API to DirectX). - - \list - - \li ANGLE backend: This requires a Windows version newer than Windows XP. If you - have problems, try updating your graphics drivers or update your - DirectX version. Run \c dxdiag.exe to check whether \e{Direct3D Acceleration} - is indeed enabled. - - \li OpenGL backend: Make sure your graphics driver supports OpenGL 2.1 or newer. - Try to update your graphics driver. - - \endlist - - \e{Unix} - - Run \c glxgears for a quick check whether OpenGL works in general. Check output of - \c glxinfo to get more details like the OpenGL driver and renderer (search for 'OpenGL' - in the application's output). - - If you are using the Mesa driver, you can force OpenGL to be rendered in software - by setting the \c LIBGL_ALWAYS_SOFTWARE environment variable. - - \e{Disabling plugins} - - You can disable the \QC plugins, at the expense of losing functionality: - - \list - - \li Launch \QC from command line, with - \c {-noload Welcome -noload QmlProfiler -noload QuickDesigner} arguments. - - \li Disable the plugins permanently by selecting \uicontrol Help > \uicontrol{About Plugins}. - - \endlist \b {How do I reset all \QC settings?} @@ -143,6 +77,89 @@ \include widgets/creator-faq-qtdesigner.qdocinc qt designer faq + \section1 QML and Qt Quick Questions + + \b {Why is there a red line below my QML import, even though I have the module?} + + By default, \QC looks in the QML import path of Qt for QML modules. + Sometimes, it does not get it right and you need to tell it where the + modules are by specifying the \c{QML_IMPORT_PATH} in the \c{.pro} file of + your application. + + This also enables code completion of QML code and removes error messages. + + The following example illustrates how to specify the import path so that + it works when switching between build and run kits for different target + platforms: + + \code + TEMPNAME = $${QMAKE_QMAKE} + MY_QTPATH = $$dirname(TEMPNAME) + QML_IMPORT_PATH += $$MY_QTPATH/../qml + message("my QML Import Path: "$$QML_IMPORT_PATH) + \endcode + + For more information about how to set the import path when using CMake, see + \l {Importing QML Modules}. + + \b {What should I do when \QC complains about missing OpenGL support?} + + Some parts of \QC, such as \QMLD and QML Profiler, use Qt Quick 2, which + relies on OpenGL API for drawing. Unfortunately, the use of OpenGL can cause + problems, especially in remote setups and with outdated drivers. In these + cases, \QC displays OpenGL-related error messages on the console or records + them in the Windows debugger log. + + The fixes and workarounds differ, depending on your setup. As a last resort, + you can disable the affected plugins. + + \e{Virtual Machines} + + Try to enable \e{3D acceleration} in your virtual machine's settings. For + VirtualBox, also make sure you have installed the Guest Addons, including + experimental \e{Direct3D support}. + + \e{Windows} + + Check whether \QC has been compiled with OpenGL/Desktop, or ANGLE as + a backend. The official binaries are always built with ANGLE (a library that + maps OpenGL ES API to DirectX). + + \list + + \li ANGLE backend: This requires a Windows version newer than Windows XP. + If you have problems, try updating your graphics drivers or update + your DirectX version. Run \c dxdiag.exe to check whether + \e{Direct3D Acceleration} is indeed enabled. + + \li OpenGL backend: Make sure your graphics driver supports OpenGL 2.1 or + newer. Try to update your graphics driver. + + \endlist + + \e{Unix} + + Run \c glxgears for a quick check whether OpenGL works in general. Check the + output of \c glxinfo to get more details like the OpenGL driver and renderer + (search for \e OpenGL in the application's output). + + If you are using the Mesa driver, you can force OpenGL to be rendered in + software by setting the \c LIBGL_ALWAYS_SOFTWARE environment variable. + + \e{Disabling plugins} + + You can disable the \QC plugins, at the expense of losing functionality: + + \list + + \li Launch \QC from command line, with the + \c {-noload QmlProfiler -noload QuickDesigner} arguments. + + \li Disable the plugins permanently by selecting \uicontrol Help > + \uicontrol{About Plugins}. + + \endlist + \section1 Help Questions \b {The Qt API Reference Documentation is missing and context help does diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp index c2eb6b45d5..4b7387039f 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp @@ -100,7 +100,7 @@ void QbsProfilesSettingsPage::finish() QbsProfilesSettingsWidget::QbsProfilesSettingsWidget(QWidget *parent) : QWidget(parent) - , m_model(QbsProjectManagerSettings::qbsSettingsBaseDir()) + , m_model(QbsProjectManagerSettings::qbsSettingsBaseDir(), qbs::Settings::UserScope) { m_model.setEditable(false); m_ui.setupUi(this); diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp index bb9bf44ce7..978ca57148 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp @@ -118,7 +118,8 @@ QString QbsManager::profileForKit(const ProjectExplorer::Kit *k) if (!k) return QString(); m_instance->updateProfileIfNecessary(k); - return settings()->value(qtcProfilePrefix() + k->id().toString()).toString(); + return settings()->value(qtcProfilePrefix() + k->id().toString(), qbs::Settings::UserScope) + .toString(); } void QbsManager::setProfileForKit(const QString &name, const ProjectExplorer::Kit *k) @@ -236,7 +237,7 @@ void QbsManager::handleKitRemoval(ProjectExplorer::Kit *kit) { m_kitsToBeSetupForQbs.removeOne(kit); const QString key = qtcProfilePrefix() + kit->id().toString(); - const QString profileName = settings()->value(key).toString(); + const QString profileName = settings()->value(key, qbs::Settings::UserScope).toString(); settings()->remove(key); qbs::Profile(profileName, settings()).removeProfile(); } diff --git a/src/shared/qbs b/src/shared/qbs -Subproject 49aec667b6f91b45a14b35cad42cb3b2dbcfbe3 +Subproject 40746dae36452398649481fecad9cdc5f25cc80 |
