summaryrefslogtreecommitdiffstats
path: root/win/common.pro
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /win/common.pro
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'win/common.pro')
-rw-r--r--win/common.pro66
1 files changed, 33 insertions, 33 deletions
diff --git a/win/common.pro b/win/common.pro
index e7066abb3..669d22d62 100644
--- a/win/common.pro
+++ b/win/common.pro
@@ -12,7 +12,7 @@ exists( custom_defs.pro ) {
}
# common version info for all libs:
-!tqcontains( CONFIG, kde3lib ) {
+!contains( CONFIG, kde3lib ) {
VER_MAJ = $(KDE_VER_MAJ)
VER_MIN = $(KDE_VER_MIN)
VER_PAT = $(KDE_VER_PAT)
@@ -27,19 +27,19 @@ isEmpty( KW_CONFIG ) {
}
# release switch has priority over debug
-tqcontains(KW_CONFIG,release) {
+contains(KW_CONFIG,release) {
CONFIG -= debug
CONFIG += release
}
-tqcontains(KW_CONFIG,debug) {
+contains(KW_CONFIG,debug) {
CONFIG += debug
CONFIG -= release
}
-tqcontains(KW_CONFIG,windows) {
+contains(KW_CONFIG,windows) {
CONFIG += windows
CONFIG -= console
}
-tqcontains(KW_CONFIG,console) {
+contains(KW_CONFIG,console) {
CONFIG -= windows
CONFIG += console
}
@@ -55,17 +55,17 @@ KDELIBDESTDIR = $$KDEBINDESTDIR\bin #shared with all binaries
# dlls suffixes for given target
isEmpty( KDEBUG ) {
- tqcontains(CONFIG,debug) {
+ contains(CONFIG,debug) {
KDEBUG=_d
KDELIBDEBUG=_d
KDELIBDEBUGLIB=_d.lib
}
- !tqcontains(CONFIG,debug) {
+ !contains(CONFIG,debug) {
KDEBUG=_
- tqcontains(CONFIG,kde3lib) {
+ contains(CONFIG,kde3lib) {
KDELIBDEBUG=
}
- !tqcontains(CONFIG,kde3lib) {
+ !contains(CONFIG,kde3lib) {
KDELIBDEBUG=_
}
KDELIBDEBUGLIB=.lib
@@ -73,21 +73,21 @@ isEmpty( KDEBUG ) {
}
KDELIB_SUFFIX=$$KDEBUG$(KDE_VER).lib
-tqcontains( TEMPLATE, app ) {
+contains( TEMPLATE, app ) {
# default dest dir for "app"
-# tqcontains(CONFIG,debug) {
+# contains(CONFIG,debug) {
DESTDIR = $$KDEBINDESTDIR\bin
# }
-# !tqcontains(CONFIG,debug) {
+# !contains(CONFIG,debug) {
# DESTDIR = $$KDEBINDESTDIR\release-bin
# }
- !tqcontains(CONFIG,nokdecore) {
+ !contains(CONFIG,nokdecore) {
LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
}
- !tqcontains(CONFIG,nokdeui) {
+ !contains(CONFIG,nokdeui) {
LIBS += $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX
}
- !tqcontains(CONFIG,nokdefx) {
+ !contains(CONFIG,nokdefx) {
LIBS += $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX
}
}
@@ -95,25 +95,25 @@ tqcontains( TEMPLATE, app ) {
isEmpty( TEMPLATE ) {
TEMPLATE = lib
}
-tqcontains( TEMPLATE, lib ) {
+contains( TEMPLATE, lib ) {
CONFIG += dll
# indicate that we building a library
QMAKE_CXXFLAGS += -DKDE_MAKE_LIB=1
# lib/kde3 dest dir (for modules)
- tqcontains( CONFIG, kde3lib ) {
+ contains( CONFIG, kde3lib ) {
DESTDIR = $$KDEBINDESTDIR/lib/kde3
TARGET_EXT = .dll #- no ver. in filename
}
- !tqcontains( CONFIG, kde3lib ) {
+ !contains( CONFIG, kde3lib ) {
DESTDIR = $$KDELIBDESTDIR
}
- tqcontains( CONFIG, kstyle ) {
+ contains( CONFIG, kstyle ) {
DESTDIR = $$KDEBINDESTDIR/lib/kde3/plugins/styles
CONFIG += plugin
}
-# !tqcontains(CONFIG,debug) {
+# !contains(CONFIG,debug) {
# DESTDIR = $$KDEBINDESTDIR\release-lib
# }
@@ -124,19 +124,19 @@ tqcontains( TEMPLATE, lib ) {
}
# win32 dependent lib
-!tqcontains( DEFINES, MAKE_KDEWIN32_LIB ) {
+!contains( DEFINES, MAKE_KDEWIN32_LIB ) {
LIBS += $$KDELIBDESTDIR/kdewin32$$KDELIB_SUFFIX
}
# libltdl:
-!tqcontains( DEFINES, MAKE_LTDL_LIB ) {
- !tqcontains( DEFINES, MAKE_KDEWIN32_LIB ) {
+!contains( DEFINES, MAKE_LTDL_LIB ) {
+ !contains( DEFINES, MAKE_KDEWIN32_LIB ) {
LIBS += $$KDELIBDESTDIR/ltdl$$KDELIB_SUFFIX
DEFINES += LIBLTDL_DLL_IMPORT
}
}
-!tqcontains( DEFINES, QT_DLL) {
+!contains( DEFINES, QT_DLL) {
DEFINES += QT_DLL
}
@@ -161,13 +161,13 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EXCEPTIONS_ON # /GX for msvc
# catch Release-Build Errors in Debug Build
#DISABLED for msvc.net
-#tqcontains( CONFIG, debug ) {
-# tqcontains( KW_CONFIG, debug ) {
+#contains( CONFIG, debug ) {
+# contains( KW_CONFIG, debug ) {
# QMAKE_CXXFLAGS += /GZ
# }
#}
-# create an output file whether or not LINK tqfinds an undefined symbol
+# create an output file whether or not LINK finds an undefined symbol
# (warning 4006 will be raised instead of error):
QMAKE_LFLAGS += /FORCE:MULTIPLE
@@ -175,24 +175,24 @@ QMAKE_LFLAGS += /FORCE:MULTIPLE
# a .cpp or .cxx extension, thus .cc files are compiled properly with msvc
QMAKE_CXXFLAGS += /TP
-INCLUDEPATH += tqmoc $(KDELIBS)/win $(KDELIBS)
+INCLUDEPATH += moc $(KDELIBS)/win $(KDELIBS)
-tqcontains(KW_CONFIG,release) {
+contains(KW_CONFIG,release) {
OBJECTS_DIR = obj_rel
}
-!tqcontains(KW_CONFIG,release) {
+!contains(KW_CONFIG,release) {
OBJECTS_DIR = obj
}
-TQMOC_DIR = tqmoc
+MOC_DIR = moc
# enable this to temporary add debug info!
# CONFIG += debug
# CONFIG -= release
-!tqcontains(CONFIG,debug) {
+!contains(CONFIG,debug) {
QMAKE_LFLAGS += /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCR71D /NODEFAULTLIB:MSVCP71D
}
-tqcontains(CONFIG,debug) {
+contains(CONFIG,debug) {
QMAKE_LFLAGS += /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:MSVCR71 /NODEFAULTLIB:MSVCP71 /NODEFAULTLIB:libc
}