diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:19:40 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 21:02:08 +0100 |
| commit | 34b14a8472f44f8517577756e033b92ebd4c5912 (patch) | |
| tree | 66a0575156d0a17a835430137e218e2b3f04cc65 /qmake/doc | |
| parent | d34353a065c443aac20376cbd88323480d769183 (diff) | |
| parent | edd555425a08f9e074f0a4d9333862636ccaae8d (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
examples/xml/htmlinfo/simpleexample.html
examples/xml/rsslisting/rsslisting.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
src/3rdparty/harfbuzz-ng/src/hb-private.hh
src/corelib/global/qlogging.cpp
src/corelib/io/qstorageinfo_unix.cpp
src/corelib/thread/qwaitcondition_unix.cpp
src/gui/kernel/qguiapplication.cpp
src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
src/testlib/doc/src/qt-webpages.qdoc
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff
Diffstat (limited to 'qmake/doc')
| -rw-r--r-- | qmake/doc/snippets/qmake/comments.pro | 2 | ||||
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/qmake/doc/snippets/qmake/comments.pro b/qmake/doc/snippets/qmake/comments.pro index 957052c81d..9fa85aa6f3 100644 --- a/qmake/doc/snippets/qmake/comments.pro +++ b/qmake/doc/snippets/qmake/comments.pro @@ -5,6 +5,6 @@ #! [1] # To include a literal hash character, use the $$LITERAL_HASH variable: -urlPieces = http://qt-project.org/doc/qt-5.0/qtgui/qtextdocument.html pageCount +urlPieces = http://doc.qt.io/qt-5/qtextdocument.html pageCount message($$join(urlPieces, $$LITERAL_HASH)) #! [1] diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index cf7f143450..610bf0cca5 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -769,12 +769,7 @@ \section2 Creating Visual Studio Project Files - Developers using Visual Studio to write Qt applications can use the - Visual Studio integration facilities provided with the - \l{Qt Commercial License} - and do not need to worry about how project dependencies are managed. - - However, some developers may need to import an existing + This section describes how to import an existing qmake project into Visual Studio. qmake is able to take a project file and create a Visual Studio project that contains all the necessary information |