diff options
| author | Tannin <devnull@localhost> | 2014-07-03 17:42:56 +0200 |
|---|---|---|
| committer | Tannin <devnull@localhost> | 2014-07-03 17:42:56 +0200 |
| commit | 9b33e0a9707a0d38f56309b204faa1580d54c36c (patch) | |
| tree | 074d8860603fcb0f98b653287564296aa8434fbc /src | |
| parent | af8973312188c3d90b8e3f8e2f8036d35e3f21ea (diff) | |
| parent | a5b6556d67dc8bdeb6f01947915429cc92f32a42 (diff) | |
Merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/organizer.pro | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/organizer.pro b/src/organizer.pro index de0f70af..75c701b9 100644 --- a/src/organizer.pro +++ b/src/organizer.pro @@ -6,7 +6,7 @@ contains(QT_VERSION, "^5.*") {
- QT += core gui widgets network xml sql xmlpatterns qml quick script webkit
+ QT += core gui widgets network xml sql xmlpatterns qml quick script webkit webkitwidgets
} else {
QT += core gui network xml declarative script sql xmlpatterns webkit
}
@@ -288,11 +288,23 @@ QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\tutorials) $$quote($$DSTDIR) QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\*.qm) $$quote($$DSTDIR)\\translations $$escape_expand(\\n)
CONFIG(debug, debug|release) {
- QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest.debug) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)
- QMAKE_POST_LINK += copy /y $$quote($$DSTDIR)\\dlls\\dlls.manifest.debug $$quote($$DSTDIR)\\dlls\\dlls.manifest $$escape_expand(\\n)
- QMAKE_POST_LINK += del $$quote($$DSTDIR)\\dlls\\dlls.manifest.debug $$escape_expand(\\n)
+ contains(QT_VERSION, "^5.*") {
+ QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest.debug.qt5) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)
+ QMAKE_POST_LINK += copy /y $$quote($$DSTDIR\\dlls\\dlls.manifest.debug.qt5) $$quote($$DSTDIR\\dlls\\dlls.manifest) $$escape_expand(\\n)
+ QMAKE_POST_LINK += del $$quote($$DSTDIR)\\dlls\\dlls.manifest.debug.qt5 $$escape_expand(\\n)
+ } else {
+ QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest.debug) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)
+ QMAKE_POST_LINK += copy /y $$quote($$DSTDIR)\\dlls\\dlls.manifest.debug $$quote($$DSTDIR)\\dlls\\dlls.manifest $$escape_expand(\\n)
+ QMAKE_POST_LINK += del $$quote($$DSTDIR)\\dlls\\dlls.manifest.debug $$escape_expand(\\n)
+ }
} else {
- QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)
+ contains(QT_VERSION, "^5.*") {
+ QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest.qt5) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)
+ QMAKE_POST_LINK += copy /y $$quote($$DSTDIR\\dlls\\dlls.manifest.qt5) $$quote($$DSTDIR\\dlls\\dlls.manifest) $$escape_expand(\\n)
+ QMAKE_POST_LINK += del $$quote($$DSTDIR)\\dlls\\dlls.manifest.qt5 $$escape_expand(\\n)
+ } else {
+ QMAKE_POST_LINK += xcopy /y /s /I $$quote($$SRCDIR\\..\\dlls.*manifest) $$quote($$DSTDIR)\\dlls $$escape_expand(\\n)
+ }
}
RESOURCES += \
|