diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-08-26 09:31:27 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-08-26 09:31:27 (GMT) |
commit | 69354f37173b7bfcf7ea0f37175a34b8766afcbb (patch) | |
tree | d5d35fbb1c5b93470b6b1aa03c359ac09695055f /tools/configure/configure.pro | |
parent | 065610d14fda00057724a46e2649db6bb98aca58 (diff) | |
parent | e5aa5a9d7e97b975316b8cc18554743cccf06474 (diff) | |
download | Qt-69354f37173b7bfcf7ea0f37175a34b8766afcbb.zip Qt-69354f37173b7bfcf7ea0f37175a34b8766afcbb.tar.gz Qt-69354f37173b7bfcf7ea0f37175a34b8766afcbb.tar.bz2 |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
bin/syncqt
src/opengl/qgl.cpp
tools/configure/configureapp.cpp
Diffstat (limited to 'tools/configure/configure.pro')
-rw-r--r-- | tools/configure/configure.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro index 73f3317..a3473af 100644 --- a/tools/configure/configure.pro +++ b/tools/configure/configure.pro @@ -28,7 +28,7 @@ INCLUDEPATH += \ $$QT_SOURCE_TREE/src/corelib/global \ $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtCore \ - $$QT_BUILD_TREE/tools/shared + $$QT_SOURCE_TREE/tools/shared HEADERS = configureapp.h environment.h tools.h\ $$QT_SOURCE_TREE/src/corelib/tools/qbytearray.h \ |