diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2016-09-21 10:46:21 +0200 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2016-09-22 09:45:37 +0000 |
| commit | 5a7f77b6680b27711c21bc1a98d191a69e096005 (patch) | |
| tree | 91e376fb0695bb07c4662923ad7a585c43cdc73e /src | |
| parent | 5e64f5933f8d4fafeac8036e2e0d8aa95e5d3b2d (diff) | |
Doc: Update Qt VS Tools docs to version 2.0
The docs were removed in a previous commit, so this commit
uses the standard doc file structure for Qt tools docs and
updates all screen shots.
Change-Id: I41193c18895ccab22ff66ef090668f161ead16fa
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmakefilereader/qmakefilereader.pro | 2 | ||||
| -rw-r--r-- | src/qrceditor/qrceditor.pro | 2 | ||||
| -rw-r--r-- | src/src.pri | 36 | ||||
| -rw-r--r-- | src/src.pro | 2 |
4 files changed, 3 insertions, 39 deletions
diff --git a/src/qmakefilereader/qmakefilereader.pro b/src/qmakefilereader/qmakefilereader.pro index 951ef874..afadec89 100644 --- a/src/qmakefilereader/qmakefilereader.pro +++ b/src/qmakefilereader/qmakefilereader.pro @@ -3,7 +3,7 @@ CONFIG += console DESTDIR = $$PWD/bin TARGET = QMakeFileReader -include(../src.pri) +include(../../vstools.pri) include(./evaluator/evaluator.pri) SOURCES += main.cpp \ diff --git a/src/qrceditor/qrceditor.pro b/src/qrceditor/qrceditor.pro index 6ae628fe..78329a42 100644 --- a/src/qrceditor/qrceditor.pro +++ b/src/qrceditor/qrceditor.pro @@ -3,7 +3,7 @@ QT += gui widgets TARGET = QrcEditor DESTDIR = $$PWD/bin -include(../src.pri) +include(../../vstools.pri) include(./shared/qrceditor.pri) SOURCES += main.cpp \ diff --git a/src/src.pri b/src/src.pri deleted file mode 100644 index 50881b12..00000000 --- a/src/src.pri +++ /dev/null @@ -1,36 +0,0 @@ -!isEmpty(QT_VS_TOOLS_PRI) { - error("src.pri already included") -} -QT_VS_TOOLS_PRI = 1 - -defineTest(minQtVersion) { - maj = $$1 - min = $$2 - patch = $$3 - isEqual(QT_MAJOR_VERSION, $$maj) { - isEqual(QT_MINOR_VERSION, $$min) { - isEqual(QT_PATCH_VERSION, $$patch) { - return(true) - } - greaterThan(QT_PATCH_VERSION, $$patch) { - return(true) - } - } - greaterThan(QT_MINOR_VERSION, $$min) { - return(true) - } - } - greaterThan(QT_MAJOR_VERSION, $$maj) { - return(true) - } - return(false) -} - -!static { - error("Please use a static Qt to build the tools.") -} - -!minQtVersion(5, 6, 0) { - message("Cannot build Qt VS Tools with Qt version $${QT_VERSION}.") - error("Use at least Qt 5.6.0.") -} diff --git a/src/src.pro b/src/src.pro index 996583e5..7b23b7b6 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,4 +3,4 @@ SUBDIRS = \ qmakefilereader \ qrceditor -include(src.pri) +include(../vstools.pri) |