summaryrefslogtreecommitdiff
path: root/qmake/tools/qconfig.cpp
authorzecke <zecke>2004-07-15 17:36:57 (UTC)
committer zecke <zecke>2004-07-15 17:36:57 (UTC)
commit323e9a7472a110b4befba7320540263147505bae (patch) (side-by-side diff)
tree14c810bdb9c0603a30356b17b4bdf9ccb72741c6 /qmake/tools/qconfig.cpp
parentaa292b322f1ecb43dd8f4e3cd295855730dd9f59 (diff)
downloadopie-323e9a7472a110b4befba7320540263147505bae.zip
opie-323e9a7472a110b4befba7320540263147505bae.tar.gz
opie-323e9a7472a110b4befba7320540263147505bae.tar.bz2
Manually updatet to qmake1.06a which includes support for precompiled
headers. Opies 'PRO' keyword was already reintroduced
Diffstat (limited to 'qmake/tools/qconfig.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--qmake/tools/qconfig.cpp33
1 files changed, 19 insertions, 14 deletions
diff --git a/qmake/tools/qconfig.cpp b/qmake/tools/qconfig.cpp
index 5297a4e..1a1b796 100644
--- a/qmake/tools/qconfig.cpp
+++ b/qmake/tools/qconfig.cpp
@@ -1,17 +1,22 @@
/* Install paths from configure */
-static const char QT_INSTALL_PREFIX [256] = "/opt/qt-x11-free-3.1.2";
-static const char QT_INSTALL_BINS [256] = "/opt/qt-x11-free-3.1.2/bin";
-static const char QT_INSTALL_DOCS [256] = "/opt/qt-x11-free-3.1.2/doc";
-static const char QT_INSTALL_HEADERS[256] = "/opt/qt-x11-free-3.1.2/include";
-static const char QT_INSTALL_LIBS [256] = "/opt/qt-x11-free-3.1.2/lib";
-static const char QT_INSTALL_PLUGINS[256] = "/opt/qt-x11-free-3.1.2/plugins";
-static const char QT_INSTALL_DATA [256] = "/opt/qt-x11-free-3.1.2";
+static const char QT_INSTALL_PREFIX [267] = "qt_nstpath=/home/ich/programming/kde/qt-copy";
+static const char QT_INSTALL_BINS [267] = "qt_binpath=/home/ich/programming/kde/qt-copy/bin";
+static const char QT_INSTALL_DOCS [267] = "qt_docpath=/home/ich/programming/kde/qt-copy/doc";
+static const char QT_INSTALL_HEADERS [267] = "qt_hdrpath=/home/ich/programming/kde/qt-copy/include";
+static const char QT_INSTALL_LIBS [267] = "qt_libpath=/home/ich/programming/kde/qt-copy/lib";
+static const char QT_INSTALL_PLUGINS [267] = "qt_plgpath=/home/ich/programming/kde/qt-copy/plugins";
+static const char QT_INSTALL_DATA [267] = "qt_datpath=/home/ich/programming/kde/qt-copy";
+static const char QT_INSTALL_TRANSLATIONS[267] = "qt_trnpath=/home/ich/programming/kde/qt-copy/translations";
+static const char QT_INSTALL_SYSCONF [267] = "qt_cnfpath=/home/ich/programming/kde/qt-copy/etc/settings";
-const char *qInstallPath() { return QT_INSTALL_PREFIX; }
-const char *qInstallPathDocs() { return QT_INSTALL_DOCS; }
-const char *qInstallPathHeaders() { return QT_INSTALL_HEADERS; }
-const char *qInstallPathLibs() { return QT_INSTALL_LIBS; }
-const char *qInstallPathBins() { return QT_INSTALL_BINS; }
-const char *qInstallPathPlugins() { return QT_INSTALL_PLUGINS; }
-const char *qInstallPathData() { return QT_INSTALL_DATA; }
+/* strlen( "qt_xxxpath=" ) == 11 */
+const char *qInstallPath() { return QT_INSTALL_PREFIX + 11; }
+const char *qInstallPathDocs() { return QT_INSTALL_DOCS + 11; }
+const char *qInstallPathHeaders() { return QT_INSTALL_HEADERS + 11; }
+const char *qInstallPathLibs() { return QT_INSTALL_LIBS + 11; }
+const char *qInstallPathBins() { return QT_INSTALL_BINS + 11; }
+const char *qInstallPathPlugins() { return QT_INSTALL_PLUGINS + 11; }
+const char *qInstallPathData() { return QT_INSTALL_DATA + 11; }
+const char *qInstallPathTranslations() { return QT_INSTALL_TRANSLATIONS + 11; }
+const char *qInstallPathSysconf() { return QT_INSTALL_SYSCONF + 11; }