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

Merge remote-tracking branch 'origin/4.10'

Browse Source 
Change-Id: I887fbf79ebfdf2af2719cb0d8aa56ab3dcb08fab
This commit is contained in:
Eike Ziller
2019-09-17 16:20:52 +02:00
parent 12ea33446d 73106f330a
commit 097892cc10
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
doc/src/projects/creator-only/creator-projects-building.qdoc
View File

@@ -79,9 +79,10 @@
subproject. subproject.
To remove all build artifacts, select \uicontrol Build > \uicontrol {Clean All} or To remove all build artifacts, select \uicontrol Build > \uicontrol {Clean All} or
\uicontrol {Clean Project}. To clean the build directory, run qmake, and \uicontrol {Clean Project}. To clean the build directory and then build
then build the project, select \uicontrol Build > \uicontrol {Rebuild All} the project, select \uicontrol Build > \uicontrol {Rebuild All} or
or \uicontrol {Rebuild Project}. \uicontrol {Rebuild Project}. If you use qmake, rebuilding also runs qmake
to generate new Makefiles between cleaning and building.
To build and clean projects without dependencies, select the To build and clean projects without dependencies, select the
\uicontrol {Build Without Dependencies}, \uicontrol {Build Without Dependencies},
@@ -89,6 +90,8 @@
\uicontrol {Clean Without Dependencies} options in the context menu in the \uicontrol {Clean Without Dependencies} options in the context menu in the
\uicontrol Projects view. \uicontrol Projects view.
\section1 Additional qmake Options
To run qmake to generate new Makefiles, select \uicontrol Build > To run qmake to generate new Makefiles, select \uicontrol Build >
\uicontrol qmake. To prevent failures on incremental builds, it might make \uicontrol qmake. To prevent failures on incremental builds, it might make
sense to always run qmake before building, even though it means that sense to always run qmake before building, even though it means that

5
src/plugins/clangformat/clangformatplugin.cpp
View File

@@ -155,8 +155,9 @@ bool ClangFormatPlugin::initialize(const QStringList &arguments, QString *errorS
} }
return true; return true;
#else #else
*errorString = "Disabling ClangFormat plugin as it is not built against a suitable version of " #warning ClangFormat: building dummy plugin due to unmodified Clang, see README.md for more info
"Clang's libFormat. For more information, see the Qt Creator README at " *errorString = "Disabling ClangFormat plugin as it has not been built against a modified Clang's libFormat."
"For more information see the Qt Creator README at "
"https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/README.md"; "https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/README.md";
return false; return false;
#endif #endif

4
src/plugins/qmldesigner/components/timelineeditor/timelineactions.cpp
View File

@@ -104,10 +104,8 @@ void TimelineActions::pasteKeyframesToTarget(const ModelNode &targetNode,
pasteModel->detachView(&view); pasteModel->detachView(&view);
view.executeInTransaction("TimelineActions::pasteKeyframesToTarget", [=, &view](){
targetNode.view()->model()->attachView(&view); targetNode.view()->model()->attachView(&view);
view.executeInTransaction("TimelineActions::pasteKeyframesToTarget", [=, &view](){
ModelNode nonConstTargetNode = targetNode; ModelNode nonConstTargetNode = targetNode;
nonConstTargetNode.validId(); nonConstTargetNode.validId();

2
tests/auto/utils/fileutils/tst_fileutils.cpp
View File

@@ -63,7 +63,7 @@ void tst_fileutils::parentDir_data()
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QTest::newRow("C:/data") << "C:/data" << "C:/" << ""; QTest::newRow("C:/data") << "C:/data" << "C:/" << "";
QTest::newRow("C:/") << "C:/" << "" << ""; QTest::newRow("C:/") << "C:/" << "" << "";
QTest::newRow("//./com1") << "//./com1" << "/" << ""; QTest::newRow("//./com1") << "//./com1" << "//." << "";
QTest::newRow("//?/path") << "//?/path" << "/" << "Qt 4 cannot handle this path."; QTest::newRow("//?/path") << "//?/path" << "/" << "Qt 4 cannot handle this path.";
QTest::newRow("/Global?\?/UNC/host") << "/Global?\?/UNC/host" << "/Global?\?/UNC/host" QTest::newRow("/Global?\?/UNC/host") << "/Global?\?/UNC/host" << "/Global?\?/UNC/host"
<< "Qt 4 cannot handle this path."; << "Qt 4 cannot handle this path.";